From eb62fe233e90a6e702d52b74cdc737b951048d4e Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 18 Apr 2021 22:49:59 +0000 Subject: [PATCH] ide, CodeEditor: Move line/selection up/down git-svn-id: svn://ultimatepp.org/upp/trunk@15924 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CodeEditor/CodeEditor.cpp | 37 ++++++++++++++++++++++++++++++ uppsrc/CodeEditor/CodeEditor.h | 1 + uppsrc/ide/UppWspc.cpp | 4 ++-- uppsrc/ide/app.tpp/Keys_en-us.tpp | 6 ++++- uppsrc/ide/app.tpp/Keys_en-us.tppi | 20 ++++++++-------- uppsrc/ide/ide.cpp | 4 ++-- 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp index 8c79116be..88c17c9cc 100644 --- a/uppsrc/CodeEditor/CodeEditor.cpp +++ b/uppsrc/CodeEditor/CodeEditor.cpp @@ -1,4 +1,5 @@ #include "CodeEditor.h" +#include "CodeEditor.h" namespace Upp { @@ -558,6 +559,36 @@ bool CodeEditor::GetLineSelection(int& l, int& h) { return true; } +void CodeEditor::SwapUpDown(bool up) +{ + int l, h; + if(GetSelection(l, h)) { + l = GetLine(l); + int hh = h; + h = GetLinePos(hh); + if(hh && h < GetLineCount()) h++; + } + else { + l = GetLine(cursor); + h = l + 1; + } + if(up) { + if(l == 0) + return; + Insert(GetPos(h), GetWLine(l - 1) + "\n"); + Remove(GetPos(l - 1), GetLineLength(l - 1) + 1); + SetSelection(GetPos(l - 1), GetPos(h - 1)); + } + else { + if(h >= GetLineCount() - 1) + return; + WString line = GetWLine(h) + "\n"; + Remove(GetPos(h), GetLineLength(h) + 1); + Insert(GetPos(l), line); + SetSelection(GetPos(l + 1), GetPos(h + 1)); + } +} + void CodeEditor::TabRight() { if(IsReadOnly()) return; int l, h; @@ -878,6 +909,12 @@ bool CodeEditor::Key(dword code, int count) { return true; } switch(code) { + case K_SHIFT_CTRL_UP: + SwapUpDown(true); + return true; + case K_SHIFT_CTRL_DOWN: + SwapUpDown(false); + return true; case K_CTRL_DELETE: DeleteWord(); return true; diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h index 93c01a94d..7528965ea 100644 --- a/uppsrc/CodeEditor/CodeEditor.h +++ b/uppsrc/CodeEditor/CodeEditor.h @@ -441,6 +441,7 @@ public: bool GetLineSelection(int& l, int& h); void TabRight(); void TabLeft(); + void SwapUpDown(bool up); void CheckEdited(bool e = true) { check_edited = e; } bool GetCheckEdited() { return check_edited; } diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp index 364f5aa89..cff3b3ca8 100644 --- a/uppsrc/ide/UppWspc.cpp +++ b/uppsrc/ide/UppWspc.cpp @@ -917,11 +917,11 @@ void WorkspaceWork::FileMenu(Bar& menu) menu.Add("Terminal at File Directory", [=] { LaunchTerminal(GetFileDirectory(GetActiveFilePath())); }); menu.Separator(); menu.Add(filelist.GetCursor() > 0, "Move up", THISBACK1(MoveFile, -1)) - .Key(organizer ? K_CTRL_UP : K_SHIFT_CTRL_UP) + .Key(organizer ? K_CTRL_UP : K_ALT|K_CTRL_UP) .Help("Move current file one position towards package beginning"); menu.Add(filelist.IsCursor() && filelist.GetCursor() < filelist.GetCount() - 1, "Move down", THISBACK1(MoveFile, 1)) - .Key(organizer ? K_CTRL_DOWN : K_SHIFT_CTRL_DOWN) + .Key(organizer ? K_CTRL_DOWN : K_ALT|K_CTRL_DOWN) .Help("Move current file one position towards package end"); if(IsActiveFile()) { menu.Separator(); diff --git a/uppsrc/ide/app.tpp/Keys_en-us.tpp b/uppsrc/ide/app.tpp/Keys_en-us.tpp index 094ef7381..b842e770f 100644 --- a/uppsrc/ide/app.tpp/Keys_en-us.tpp +++ b/uppsrc/ide/app.tpp/Keys_en-us.tpp @@ -74,8 +74,12 @@ topic "Keys"; :: [s0;%- [*@(0.0.255)2 Shift`+Tab]] :: [s0; [2 When selection is defined, indent selection left.]] :: [s0;%- [*@(0.0.255)2 Shift`+Ctrl`+Up]] -:: [s0; [2 Move package file up.]] +:: [s0; [2 Move line/selection up.]] :: [s0;%- [*@(0.0.255)2 Shift`+Ctrl`+Down]] +:: [s0; [2 Move line/selection down.]] +:: [s0;%- [*@(0.0.255)2 Alt`+Ctrl`+Up]] +:: [s0; [2 Move package file up.]] +:: [s0;%- [*@(0.0.255)2 Alt`+Ctrl`+Down]] :: [s0; [2 Move package file down.]] :: [s0;%- [*@(0.0.255)2 Alt`+Delete]] :: [s0; [2 Remove package file.]] diff --git a/uppsrc/ide/app.tpp/Keys_en-us.tppi b/uppsrc/ide/app.tpp/Keys_en-us.tppi index 6dc2fffd4..1792734e0 100644 --- a/uppsrc/ide/app.tpp/Keys_en-us.tppi +++ b/uppsrc/ide/app.tpp/Keys_en-us.tppi @@ -1,13 +1,13 @@ TITLE("Keys") COMPRESSED -120,156,165,89,139,114,211,72,22,253,149,222,50,179,5,193,73,212,47,61,236,221,45,242,36,83,195,107,9,12,187,155,50,99,217,238,216,170,200,146,71,146,9,129,130,111,223,211,146,29,44,89,86,43,12,20,1,36,157,115,111,159,251,232,219,210,85,200,92,183,31,56,150,232,251,212,233,191,246,250,223,191,127,63,240,60,214,39,143,30,209,174,213,161,150,224,148,81,42,44,75,48,135,74,207,242,164,75,93,139,59,130,73,199,146,189,133,159,248,243,193,149,239,242,254,222,91,27,40,6,20,167,156,90,212,102,2,79,89,220,98,130,50,73,93,87,80,71,186,220,179,237,222,216,95,100,65,28,13,174,46,68,127,164,161,2,72,222,149,29,203,113,109,65,129,19,146,113,71,10,224,133,160,20,255,166,210,177,29,167,151,5,89,168,6,87,35,106,59,125,95,176,254,9,128,162,107,119,224,32,115,128,20,76,216,130,187,140,83,151,49,219,227,194,19,240,156,178,94,144,41,248,57,2,68,195,128,146,48,39,164,160,220,194,218,28,201,241,148,131,191,133,229,81,6,155, -174,37,37,204,169,207,217,224,42,87,73,11,4,152,13,99,204,145,250,97,87,184,148,59,46,19,204,102,48,111,57,88,165,182,45,123,19,149,142,1,227,140,246,51,56,212,63,121,38,251,20,96,7,226,48,203,179,152,237,120,176,7,87,177,90,238,121,148,187,176,39,168,180,40,239,141,227,137,94,33,147,22,215,6,93,96,108,16,231,122,72,155,194,93,198,93,88,116,40,231,248,41,133,235,244,82,165,3,145,197,201,224,106,239,217,99,235,192,58,96,82,62,1,218,235,82,171,227,114,193,185,176,61,65,45,14,43,224,16,90,44,219,66,40,169,100,110,111,228,167,48,153,9,173,234,201,83,74,29,29,126,75,67,33,60,119,37,135,121,27,63,16,87,172,145,67,29,230,9,151,115,215,234,141,67,63,77,55,36,218,211,235,164,180,75,105,199,209,202,74,206,132,167,245,225,12,18,51,91,122,20,26,75,91,88,172,151,168,63,151,65,162,230,42,130,200,1,172,247,215,241,89,101,162,190,164,233,88,151,50,228,162,180,109,75,43,38,145,12,140,75,72,110,81,87,192, -33,252,70,136,179,85,50,230,201,161,19,131,242,46,229,29,143,9,14,63,60,33,160,1,240,212,163,148,90,46,126,99,93,80,38,79,13,138,28,94,165,19,21,93,42,58,14,114,23,17,242,132,54,234,113,45,28,131,238,204,182,36,2,192,10,20,211,114,179,71,16,156,50,87,255,209,146,83,217,165,178,195,225,23,149,18,107,229,144,152,185,88,175,132,230,60,207,105,234,184,189,87,234,54,61,245,51,181,202,147,189,147,71,185,234,118,151,218,29,75,163,165,235,33,108,84,104,197,184,16,30,243,56,151,204,147,220,182,160,92,186,12,179,21,84,87,80,94,128,43,10,167,75,29,84,18,86,39,37,214,155,131,176,86,135,106,55,152,235,217,122,221,43,138,225,126,24,68,218,7,100,67,191,72,128,189,251,12,112,187,162,227,186,182,197,61,232,128,229,91,18,201,141,6,224,34,176,136,43,67,230,235,14,48,190,241,167,106,184,191,46,77,237,201,154,1,233,231,117,16,112,251,132,157,156,234,66,62,62,58,182,142,152,125,130,21,157,218,231,148,158,157,194,149,116,57, -90,129,129,177,144,239,150,225,87,239,84,93,251,185,0,95,255,248,246,203,217,171,253,247,151,228,42,69,89,191,155,169,95,79,207,200,111,234,46,253,251,224,42,69,1,189,243,71,161,34,241,53,25,199,81,134,68,203,175,91,125,70,138,191,201,213,199,44,94,4,227,97,111,120,56,60,12,38,106,120,232,47,22,195,67,205,48,252,67,69,195,253,101,58,236,208,143,140,208,3,114,30,124,86,19,114,131,91,131,135,160,25,208,236,128,188,73,212,68,93,67,237,10,5,35,250,215,160,29,213,240,15,154,179,209,213,82,127,150,165,240,137,145,23,254,93,188,204,8,26,86,48,141,84,242,179,116,60,167,227,228,149,159,5,159,20,232,70,203,233,244,158,174,16,155,247,123,180,87,150,177,184,189,42,118,100,160,213,255,209,188,114,16,249,250,85,232,120,227,150,245,15,157,156,255,210,63,62,62,123,140,39,244,83,7,104,153,79,72,225,242,222,38,246,36,75,194,225,83,4,127,48,232,245,214,15,224,242,221,24,217,112,29,132,42,61,184,191,243,203,126,5,124,134,238,93, -130,93,206,226,219,195,25,214,79,70,113,150,197,115,178,240,35,149,19,60,99,245,20,133,253,255,13,52,186,75,6,229,155,71,168,187,167,199,168,155,20,197,163,54,76,49,242,62,154,196,13,158,93,206,130,107,96,27,217,87,207,52,24,121,171,26,141,20,236,255,105,100,63,85,161,202,202,172,39,203,204,72,122,82,79,90,220,252,53,74,85,146,149,57,227,197,29,73,97,107,172,231,5,18,92,147,85,9,117,201,120,153,36,168,103,162,251,23,137,179,153,74,110,131,84,25,61,248,189,113,89,53,46,188,241,211,172,137,182,70,137,226,210,14,191,99,184,59,158,97,167,26,103,42,121,128,227,71,37,19,151,57,55,241,195,208,8,124,191,40,35,199,73,28,134,100,185,48,2,79,227,219,168,14,58,193,117,35,248,13,246,4,88,110,8,247,69,60,47,203,118,172,166,65,164,91,53,52,201,107,180,149,145,220,203,6,51,103,209,164,100,5,255,127,144,141,221,241,69,63,136,178,224,58,64,24,175,19,52,5,100,100,26,39,36,139,137,138,38,70,222,250,210,52,82,143, -180,72,81,16,77,141,6,94,168,235,74,38,39,234,83,16,47,83,114,27,39,102,255,222,6,211,89,25,255,10,195,112,59,236,240,106,27,56,247,179,241,12,126,147,17,82,255,70,153,123,197,112,80,239,253,3,136,202,253,159,145,15,51,21,109,150,101,250,163,44,131,72,75,190,113,51,209,235,55,183,226,191,98,34,68,132,218,54,251,74,21,191,140,177,205,174,70,175,60,143,155,11,186,68,181,85,215,219,100,134,18,207,247,150,154,194,120,171,230,85,42,19,75,101,93,247,81,126,8,199,214,130,242,132,123,8,195,86,173,60,71,165,1,111,194,109,23,9,128,215,113,114,235,55,86,73,142,213,205,139,24,150,223,138,163,113,249,230,125,165,118,253,247,142,228,233,144,249,163,118,60,59,154,70,107,146,106,53,181,155,215,74,217,109,229,155,1,57,56,56,216,177,199,23,143,121,229,173,39,142,111,230,126,114,67,22,113,26,232,218,52,122,186,219,76,29,63,178,66,247,238,149,21,76,191,45,236,228,130,238,54,147,223,174,179,178,33,246,183,111,198,9,91,143,229,172, -87,115,62,209,247,168,135,155,56,114,244,54,78,28,27,35,125,253,116,222,164,218,235,242,86,60,9,138,220,48,137,125,89,30,67,252,79,70,196,240,234,176,178,127,252,152,225,177,133,85,118,222,29,36,175,118,16,132,126,52,93,162,182,82,179,23,195,253,225,160,187,166,91,206,139,11,101,218,69,8,21,20,164,136,147,22,124,195,10,252,181,30,32,91,194,87,5,112,94,34,56,199,182,132,173,105,85,100,198,188,191,216,6,183,137,224,187,237,192,251,41,201,95,175,61,28,185,76,245,246,175,39,184,251,115,171,129,228,191,235,24,188,168,30,89,242,243,131,190,248,177,113,134,46,195,66,229,39,186,196,138,166,244,207,38,228,243,114,55,244,63,5,83,63,51,39,124,17,169,231,53,229,189,246,183,9,94,19,225,67,146,168,69,136,164,111,215,200,107,24,138,185,5,221,65,71,173,129,229,156,111,99,163,198,64,175,243,178,6,184,88,237,67,13,230,88,141,171,89,130,12,49,27,220,9,205,55,127,189,137,55,24,46,116,170,161,208,237,97,184,111,242,33,135,55,56, -178,201,66,70,183,198,144,151,41,46,239,162,241,44,137,163,224,11,246,130,196,143,210,208,207,71,206,188,202,141,92,78,229,16,62,95,4,171,109,216,36,71,25,137,45,101,145,196,99,149,166,6,112,5,119,153,249,73,118,152,102,241,130,140,150,65,56,105,0,138,250,100,35,42,73,154,26,226,90,248,26,248,58,229,76,20,43,173,100,185,63,125,86,227,101,83,125,87,158,127,187,140,200,99,116,223,245,27,179,39,70,123,212,218,34,64,87,88,29,16,91,82,21,177,42,123,114,170,97,4,210,169,36,242,195,240,174,101,230,214,145,228,19,72,27,166,243,242,252,242,46,158,78,129,28,37,202,191,89,196,65,212,208,50,138,21,120,149,60,141,38,249,80,229,135,27,28,230,45,109,189,148,10,91,222,228,225,255,6,151,177,114,142,203,83,101,18,223,166,42,193,190,253,212,4,252,247,46,32,249,115,169,146,6,9,11,248,135,102,120,126,106,55,136,249,174,18,10,253,218,183,133,227,103,101,209,252,112,188,12,245,135,40,253,190,61,141,55,79,94,245,218,111,189,1,57, -74,211,32,205,54,134,215,98,76,93,141,162,249,168,186,245,218,250,47,205,164,167,229,12,94,98,30,27,183,216,162,235,14,228,27,215,218,190,83,203,113,165,171,63,113,90,12,115,57,126,254,172,104,194,55,205,175,23,122,34,190,127,167,209,142,163,250,110,71,143,214,237,57,234,235,245,34,78,130,47,113,148,161,248,199,42,210,239,86,209,11,219,45,172,194,244,187,74,50,164,192,67,120,54,91,226,214,89,186,116,97,231,78,100,88,77,59,219,219,231,239,242,149,70,112,37,187,208,2,90,119,238,138,100,237,236,109,229,226,113,254,113,229,97,77,255,40,68,7,64,124,70,42,52,107,236,86,206,145,115,28,6,131,73,54,51,38,72,13,112,166,154,149,173,195,164,24,199,30,214,202,95,6,81,48,135,174,173,220,188,168,133,154,28,221,152,250,235,122,218,170,213,154,91,91,253,171,184,77,14,99,155,171,68,22,153,148,146,105,18,76,200,72,205,124,221,234,18,114,171,223,175,206,227,79,152,138,15,19,180,255,47,122,60,214,223,226,211,29,59,6,239,213,125,153,252, -201,29,163,126,234,185,212,131,106,193,220,252,98,254,156,210,10,80,45,208,94,178,166,175,113,213,129,47,199,64,212,196,252,66,172,214,92,220,226,51,93,253,144,217,228,228,214,84,107,254,254,161,167,170,45,25,255,102,94,148,93,206,146,101,22,183,120,55,88,57,96,188,136,209,172,218,192,202,69,252,65,127,122,104,124,21,89,222,161,202,232,163,201,132,220,106,134,22,118,203,77,238,236,243,34,140,147,118,33,47,71,238,165,154,199,201,221,198,52,69,6,131,255,3,64,168,134,212, +120,156,165,90,139,114,211,72,22,253,149,222,50,179,5,193,73,212,47,61,236,221,45,242,36,83,195,107,9,12,187,155,50,99,217,238,216,170,200,146,71,146,9,129,130,111,223,211,146,29,44,89,86,43,12,20,97,144,116,206,189,125,238,163,111,75,115,21,50,215,237,7,142,37,250,62,117,250,175,189,254,247,239,223,15,60,143,245,201,163,71,180,107,117,168,37,56,101,148,10,203,18,204,161,210,179,60,233,82,215,226,142,96,210,177,100,111,225,39,254,124,112,229,187,188,191,247,214,6,138,1,197,41,167,22,181,153,192,83,22,183,152,160,76,82,215,21,212,145,46,247,108,187,55,246,23,89,16,71,131,171,11,209,31,105,168,0,146,119,101,199,114,92,91,80,224,132,100,220,145,2,120,33,40,197,127,83,233,216,142,211,203,130,44,84,131,171,17,181,157,190,47,88,255,4,64,209,181,59,112,144,57,64,10,38,108,193,93,198,169,203,152,237,113,225,9,120,78,89,47,200,20,252,28,1,162,97,64,73,152,19,82,80,110,97,109,142,228,120,202,193,223,194,242,40,131, +77,215,146,18,230,212,231,108,112,149,171,164,5,2,204,134,49,230,72,253,176,43,92,202,29,151,9,102,51,152,183,28,172,82,219,150,189,137,74,199,128,113,70,251,25,28,234,159,60,147,125,10,176,3,113,152,229,89,204,118,60,216,131,171,88,45,247,60,202,93,216,19,84,90,148,247,198,241,68,175,144,73,139,107,131,46,48,54,136,115,61,164,77,225,46,227,46,44,58,148,115,252,148,194,117,122,169,210,129,200,226,100,112,181,247,236,177,117,96,29,48,41,159,0,237,117,169,213,113,185,224,92,216,158,160,22,135,21,112,8,45,150,109,33,148,84,50,183,55,242,83,152,204,132,86,245,228,41,165,142,14,191,165,161,16,158,187,146,195,188,141,31,136,43,214,200,161,14,243,132,203,185,107,245,198,161,159,166,27,18,237,233,117,82,218,165,180,227,104,101,37,103,194,211,250,112,6,137,153,45,61,10,141,165,45,44,214,75,212,159,203,32,81,115,21,65,228,0,214,251,235,248,172,50,81,95,210,116,172,75,25,114,81,218,182,165,21,147,72,6,198,37,36,183,168,43, +224,16,126,35,196,217,42,25,243,228,208,137,65,121,151,242,142,199,4,135,31,158,16,208,0,120,234,81,74,45,23,191,177,46,40,147,167,6,69,14,175,210,137,138,46,21,29,7,185,139,8,121,66,27,245,184,22,142,65,119,102,91,18,1,96,5,138,105,185,217,35,8,78,153,171,255,104,201,169,236,82,217,225,240,139,74,137,181,114,72,204,92,172,87,66,115,158,231,52,117,220,222,43,117,155,158,250,153,90,229,201,222,201,163,92,117,187,75,237,142,165,209,210,245,16,54,42,180,98,92,8,143,121,156,75,230,73,110,91,80,46,93,134,217,10,170,43,40,47,192,21,133,211,165,14,42,9,171,147,18,235,205,65,88,171,67,181,27,204,245,108,189,238,21,197,112,63,12,34,237,3,178,161,95,36,192,222,125,6,184,93,209,113,93,219,226,30,116,192,242,45,137,228,70,3,112,17,88,196,149,33,243,117,7,24,223,248,83,53,220,95,151,166,246,100,205,128,244,243,58,8,184,125,194,78,78,117,33,31,31,29,91,71,204,62,193,138,78,237,115,74,207,78,225,74,186, +28,173,192,192,88,200,119,203,240,171,119,170,174,253,92,128,175,127,124,251,229,236,213,254,251,75,114,149,162,172,223,205,212,175,167,103,228,55,117,151,254,125,112,149,162,128,222,249,163,80,145,248,154,140,227,40,67,162,229,215,173,62,35,197,223,228,234,99,22,47,130,241,176,55,60,28,30,6,19,53,60,244,23,139,225,161,102,24,254,161,162,225,254,50,29,118,232,71,70,232,1,57,15,62,171,9,185,193,173,193,67,208,12,104,118,64,222,36,106,162,174,161,118,133,130,17,253,107,208,142,106,248,7,205,217,232,106,169,63,203,82,248,196,200,11,255,46,94,102,4,13,43,152,70,42,249,89,58,158,211,113,242,202,207,130,79,10,116,163,229,116,122,79,87,136,205,251,61,218,43,203,88,220,94,21,59,50,208,234,255,104,94,57,136,124,253,42,116,188,113,203,250,135,78,206,127,233,31,31,159,61,198,19,250,169,3,180,204,39,164,112,121,111,19,123,146,37,225,240,41,130,63,24,244,122,235,7,112,249,110,140,108,184,14,66,149,30,220,223,249,101,191,2,62,67,247, +46,193,46,103,241,237,225,12,235,39,163,56,203,226,57,89,248,145,202,9,158,177,122,138,194,254,255,6,26,221,37,131,242,205,35,212,221,211,99,212,77,138,226,81,27,166,24,121,31,77,226,6,207,46,103,193,53,176,141,236,171,103,26,140,188,85,141,70,10,246,255,52,178,159,170,80,101,101,214,147,101,102,36,61,169,39,45,110,254,26,165,42,201,202,156,241,226,142,164,176,53,214,243,2,9,174,201,170,132,186,100,188,76,18,212,51,209,253,139,196,217,76,37,183,65,170,140,30,252,222,184,172,26,23,222,248,105,214,68,91,163,68,113,105,135,223,49,220,29,207,176,83,141,51,149,60,192,241,163,146,137,203,156,155,248,97,104,4,190,95,148,145,227,36,14,67,178,92,24,129,167,241,109,84,7,157,224,186,17,252,6,123,2,44,55,132,251,34,158,151,101,59,86,211,32,210,173,26,154,228,53,218,202,72,238,101,131,153,179,104,82,178,130,127,63,200,198,238,248,162,31,68,89,112,29,32,140,215,9,154,2,50,50,141,19,146,197,68,69,19,35,111,125,105,26,169, +71,90,164,40,136,166,70,3,47,212,117,37,147,19,245,41,136,151,41,185,141,19,179,127,111,131,233,172,140,127,133,97,184,29,118,120,181,13,156,251,217,120,6,191,201,8,169,127,163,204,189,98,56,168,247,254,1,68,229,254,207,200,135,153,138,54,203,50,253,81,150,65,164,37,223,184,153,232,245,155,91,241,95,49,17,34,66,109,155,125,165,138,95,198,216,102,117,235,59,252,65,215,88,210,37,178,173,202,174,163,51,148,121,190,191,236,246,109,53,22,230,53,214,236,217,6,81,189,95,37,170,54,94,213,148,236,91,53,175,82,153,88,42,171,186,207,191,135,112,108,45,40,47,133,135,48,108,85,241,115,244,0,224,77,184,237,242,5,240,58,78,110,253,198,250,205,177,186,173,18,195,242,91,113,52,46,223,188,227,213,174,255,222,145,60,29,50,127,212,142,103,71,59,107,77,82,173,243,118,147,100,169,234,172,124,155,34,7,7,7,59,166,143,226,49,175,188,41,198,241,205,220,79,110,200,34,78,3,93,151,70,79,119,155,169,227,71,86,232,93,101,101,5,115,121,11, +59,185,160,187,205,228,183,235,172,108,136,253,237,155,113,246,215,7,6,214,171,57,57,233,123,212,195,77,28,134,122,27,103,161,141,195,70,253,185,161,73,181,215,229,33,97,18,20,185,97,18,251,178,60,32,249,159,140,136,225,213,97,101,103,251,113,186,192,230,90,153,9,118,144,188,218,65,16,250,209,116,137,218,74,205,94,12,247,135,131,238,154,110,57,47,46,148,105,23,33,84,80,144,34,78,90,240,13,43,240,215,122,180,109,9,95,21,192,121,137,224,28,27,38,54,205,85,145,25,243,254,98,27,220,38,130,239,182,3,239,167,36,127,241,247,112,228,50,213,131,137,158,45,239,79,212,6,146,255,174,99,240,162,122,152,202,247,99,125,241,99,227,116,95,134,133,202,79,116,137,21,77,233,159,77,200,231,229,110,232,127,10,166,126,102,78,248,34,82,207,107,202,123,237,111,19,188,38,194,135,36,81,139,16,73,223,174,145,215,48,20,51,11,186,131,142,90,3,203,57,223,198,70,141,129,94,231,101,13,112,177,218,135,26,204,177,26,87,179,4,25,98,54,184,19,154, +111,254,122,19,111,48,92,232,84,67,161,219,195,112,223,228,67,14,111,112,100,147,133,140,110,141,33,47,83,92,222,69,227,89,18,71,193,23,236,5,137,31,165,161,159,143,155,121,149,27,185,156,202,235,129,249,34,88,109,195,38,57,202,72,108,41,139,36,30,171,52,53,128,43,184,203,204,79,178,195,52,139,23,100,180,12,194,73,3,80,212,39,27,81,73,210,212,16,215,194,215,192,215,41,103,162,88,105,37,203,253,233,179,26,47,155,234,187,242,252,219,101,68,30,163,251,174,223,229,61,49,218,163,214,22,1,186,194,234,232,218,146,170,136,85,217,147,83,13,35,144,78,37,145,31,134,119,45,51,183,142,36,159,64,218,48,157,151,231,151,119,241,116,10,228,40,81,254,205,34,14,162,134,150,81,172,192,171,228,105,52,201,135,42,63,220,224,48,111,105,235,165,84,216,242,38,15,255,55,184,140,149,115,92,158,42,147,248,54,85,9,246,237,167,38,224,191,119,1,201,159,75,149,52,72,88,192,63,52,195,243,247,9,6,49,223,85,66,161,95,72,183,112,252,172,44, +154,31,142,151,161,254,68,166,191,4,164,241,230,201,171,94,251,173,119,51,71,105,26,164,217,198,240,90,140,169,171,81,52,31,85,183,94,168,255,165,153,244,180,156,193,75,204,99,227,22,91,116,221,113,124,227,90,219,183,125,57,174,116,245,39,78,139,97,46,199,207,159,21,77,248,166,249,245,66,79,196,247,239,51,218,113,84,223,58,233,209,186,61,71,125,189,94,196,73,240,37,142,50,20,255,88,69,250,173,47,122,97,187,133,85,152,126,87,73,134,20,120,8,207,102,75,220,58,75,151,46,236,220,137,12,171,105,103,123,251,252,93,190,210,8,174,100,23,90,64,235,206,93,145,172,157,189,173,92,60,206,63,251,60,172,233,31,133,232,0,136,207,72,133,102,141,221,202,57,114,142,195,96,48,201,102,198,4,169,1,206,84,179,178,117,152,20,227,216,195,90,249,203,32,10,230,208,181,149,155,23,181,80,147,163,27,83,127,93,79,91,181,90,115,107,171,127,21,183,201,97,108,115,149,200,34,147,82,50,77,130,9,25,169,153,175,91,93,66,110,245,155,223,121,252,9, +83,241,97,130,246,255,69,143,199,250,255,18,72,119,236,24,188,87,247,205,244,39,119,140,250,169,231,82,15,170,5,115,243,39,131,115,74,43,64,181,64,123,201,154,190,19,86,7,190,28,3,81,19,243,11,177,90,115,113,139,15,136,245,67,102,147,147,91,83,173,249,203,140,158,170,182,100,252,155,121,81,118,57,75,150,89,220,226,221,96,229,128,241,34,70,179,106,3,43,23,241,7,253,81,164,241,85,100,121,135,42,163,143,38,19,114,171,25,90,216,45,55,185,179,207,139,48,78,218,133,188,28,185,151,106,30,39,119,27,211,20,25,12,254,15,146,245,180,196, diff --git a/uppsrc/ide/ide.cpp b/uppsrc/ide/ide.cpp index b45646e08..f575a6b64 100644 --- a/uppsrc/ide/ide.cpp +++ b/uppsrc/ide/ide.cpp @@ -384,8 +384,8 @@ bool Ide::Key(dword key, int count) return true; } switch(key) { - case K_SHIFT_CTRL_UP: - case K_SHIFT_CTRL_DOWN: + case K_ALT|K_CTRL_UP: + case K_ALT|K_CTRL_DOWN: case K_ALT_DELETE: return filelist.Key(key, count); case K_ALT_UP: