From 263f9b8d813b34f9b8a1c2377b713d7cbd3f94d4 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Sun, 8 Feb 2015 21:23:41 +0300 Subject: [PATCH] more editor actions --- src/dlangide/ui/commands.d | 6 ++++++ src/dlangide/ui/frame.d | 7 +++++-- views/res/i18n/en.ini | 5 +++++ views/res/mdpi/edit-indent.png | Bin 0 -> 413 bytes views/res/mdpi/edit-unindent.png | Bin 0 -> 367 bytes views/resources.list | 2 ++ 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 views/res/mdpi/edit-indent.png create mode 100644 views/res/mdpi/edit-unindent.png diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d index 790019a..67b514b 100644 --- a/src/dlangide/ui/commands.d +++ b/src/dlangide/ui/commands.d @@ -16,6 +16,7 @@ enum IDEActions : int { FileSaveAll, FileClose, FileExit, + EditPreferences, BuildWorkspace, RebuildWorkspace, CleanWorkspace, @@ -66,6 +67,11 @@ const Action ACTION_EDIT_PASTE = (new Action(EditorActions.Paste, "MENU_EDIT_PAS const Action ACTION_EDIT_CUT = (new Action(EditorActions.Cut, "MENU_EDIT_CUT"c, "edit-cut"c, KeyCode.KEY_X, KeyFlag.Control)).disableByDefault(); const Action ACTION_EDIT_UNDO = (new Action(EditorActions.Undo, "MENU_EDIT_UNDO"c, "edit-undo"c, KeyCode.KEY_Z, KeyFlag.Control)).disableByDefault(); const Action ACTION_EDIT_REDO = (new Action(EditorActions.Redo, "MENU_EDIT_REDO"c, "edit-redo"c, KeyCode.KEY_Z, KeyFlag.Control|KeyFlag.Shift)).disableByDefault(); +const Action ACTION_EDIT_INDENT = (new Action(EditorActions.Tab, "MENU_EDIT_INDENT"c, "edit-indent"c, KeyCode.TAB, 0)).disableByDefault(); +const Action ACTION_EDIT_UNINDENT = (new Action(EditorActions.BackTab, "MENU_EDIT_UNINDENT"c, "edit-unindent", KeyCode.TAB, KeyFlag.Shift)).disableByDefault(); +const Action ACTION_EDIT_TOGGLE_LINE_COMMENT = (new Action(EditorActions.Redo, "MENU_EDIT_TOGGLE_LINE_COMMENT"c, null, KeyCode.KEY_DIVIDE, KeyFlag.Control)).disableByDefault(); +const Action ACTION_EDIT_TOGGLE_BLOCK_COMMENT = (new Action(EditorActions.Redo, "MENU_EDIT_TOGGLE_BLOCK_COMMENT"c, null, KeyCode.KEY_DIVIDE, KeyFlag.Control|KeyFlag.Shift)).disableByDefault(); +const Action ACTION_EDIT_PREFERENCES = (new Action(EditorActions.Redo, "MENU_EDIT_PREFERENCES"c, null)); const Action ACTION_HELP_ABOUT = new Action(IDEActions.HelpAbout, "MENU_HELP_ABOUT"c); const Action ACTION_WINDOW_CLOSE_ALL_DOCUMENTS = new Action(IDEActions.WindowCloseAllDocuments, "MENU_WINDOW_CLOSE_ALL_DOCUMENTS"c); const Action ACTION_CREATE_NEW_WORKSPACE = new Action(IDEActions.CreateNewWorkspace, "Create new workspace"d); diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index 7a31c70..4638847 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -300,8 +300,11 @@ class IDEFrame : AppFrame { MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT")); editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO); + MenuItem editItemAdvanced = new MenuItem(new Action(221, "MENU_EDIT_ADVANCED")); + editItemAdvanced.add(ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_EDIT_TOGGLE_BLOCK_COMMENT); + editItem.add(editItemAdvanced); - editItem.add(new Action(20, "MENU_EDIT_PREFERENCES")); + editItem.add(ACTION_EDIT_PREFERENCES); MenuItem projectItem = new MenuItem(new Action(21, "MENU_PROJECT")); projectItem.add(ACTION_PROJECT_SET_STARTUP, ACTION_PROJECT_REFRESH, ACTION_PROJECT_UPDATE_DEPENDENCIES, ACTION_PROJECT_SETTINGS); @@ -356,7 +359,7 @@ class IDEFrame : AppFrame { tb = res.getOrAddToolbar("Edit"); tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR, - ACTION_EDIT_UNDO, ACTION_EDIT_REDO); + ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT); return res; } diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini index f49e621..7f27a32 100644 --- a/views/res/i18n/en.ini +++ b/views/res/i18n/en.ini @@ -17,6 +17,11 @@ MENU_EDIT_PASTE=&Paste MENU_EDIT_CUT=Cu&t MENU_EDIT_UNDO=&Undo MENU_EDIT_REDO=&Redo +MENU_EDIT_INDENT=Indent block +MENU_EDIT_UNINDENT=Unindent block +MENU_EDIT_TOGGLE_LINE_COMMENT=Toggle line comment +MENU_EDIT_TOGGLE_BLOCK_COMMENT=Toggle block comment +MENU_EDIT_ADVANCED=Advanced... MENU_EDIT_PREFERENCES=&Preferences MENU_BUILD=&BUILD MENU_BUILD_WORKSPACE_BUILD=Build Workspace diff --git a/views/res/mdpi/edit-indent.png b/views/res/mdpi/edit-indent.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd0730d8fb289098ee222778cf7d986a89cb79b GIT binary patch literal 413 zcmV;O0b>4%P)Px#24YJ`L;zd>SO8c9zdw5b000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2n+ z5)%~kU!5cX00A9IL_t(I%f*vTO2beP$A2@ELa5{f^#Gou9w6I-?iH8zB<|{7q1zll zkC3$oP=tO!Xt2;EWL&iN1KU_};lLl><30W}^Lz6I;Ih|qj*N%lP`3BVA434#o$+LX zs-hx@Dk8Gf>S7c{h{!jC;A>%Ks4DqvMw+H8`=vn~$KF%`?oO6v%<`NhNpSZa0e(Om z24;q-a&!0Y0F&u--Nq`@K5YzC6*B|i^!(mU^>~P#?qF|^FUf_d87J-bK?aR!&f>=( zD``A^d%l)13>z7&U!f=ps;Z*X9eAfZ@Q?ZYCi`h}2ZGU}nfkI58?1n4i9~h6^V&8EnY(qzHrDXQT9hderyr0NE!9&Pn=%AB1NIc>o29afEqmS47?XN(wnvM} za|d}