forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes for #306

This commit is contained in:
Vadim Lopatin 2017-09-18 11:11:12 +03:00
parent db88a02863
commit 963676b083
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -12,7 +12,7 @@
"stringImportPaths": ["views"], "stringImportPaths": ["views"],
"dependencies": { "dependencies": {
"dlangui": "==0.9.138", "dlangui": "==0.9.139",
"dsymbol": "~>0.2.9", "dsymbol": "~>0.2.9",
"dcd": "~>0.9.1" "dcd": "~>0.9.1"
}, },

9
src/dlangide/ui/frame.d
View File

@ -705,7 +705,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT")); MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT"));
editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE,
ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_FIND_TEXT, ACTION_EDITOR_TOGGLE_BOOKMARK); ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO);
editItem.addSeparator();
editItem.add(ACTION_EDITOR_FIND, ACTION_EDITOR_FIND_NEXT, ACTION_EDITOR_FIND_PREV, ACTION_EDITOR_REPLACE, ACTION_FIND_TEXT, ACTION_EDITOR_TOGGLE_BOOKMARK);
editItem.addSeparator();
MenuItem editItemAdvanced = new MenuItem(new Action(221, "MENU_EDIT_ADVANCED")); 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); editItemAdvanced.add(ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT, ACTION_EDIT_TOGGLE_BLOCK_COMMENT);
editItem.add(editItemAdvanced); editItem.add(editItemAdvanced);
@ -913,6 +916,10 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
case IDEActions.FileSaveAll: case IDEActions.FileSaveAll:
case IDEActions.FileSaveAs: case IDEActions.FileSaveAs:
case IDEActions.GotoLine: case IDEActions.GotoLine:
case EditorActions.Find:
case EditorActions.FindNext:
case EditorActions.FindPrev:
case EditorActions.Replace:
a.state = (currentEditor !is null && !_currentBackgroundOperation) ? ACTION_STATE_ENABLED : ACTION_STATE_DISABLE; a.state = (currentEditor !is null && !_currentBackgroundOperation) ? ACTION_STATE_ENABLED : ACTION_STATE_DISABLE;
return true; return true;
case IDEActions.ViewToggleWhitespaceMarks: case IDEActions.ViewToggleWhitespaceMarks:

2
views/VERSION
View File

@ -1 +1 @@
v0.7.84 v0.7.85

4
views/res/i18n/ru.ini
View File

@ -51,8 +51,8 @@ MENU_EDIT_INDENT=Увеличить отступ
MENU_EDIT_UNINDENT=Уменьшить отступ MENU_EDIT_UNINDENT=Уменьшить отступ
MENU_EDIT_TOGGLE_LINE_COMMENT=Закомментировать строку MENU_EDIT_TOGGLE_LINE_COMMENT=Закомментировать строку
MENU_EDIT_TOGGLE_BLOCK_COMMENT=Закомментировать блок MENU_EDIT_TOGGLE_BLOCK_COMMENT=Закомментировать блок
MENU_EDIT_ADVANCED=Продвинутые... MENU_EDIT_ADVANCED=Дополнительно...
MENU_EDIT_PREFERENCES=&Настройки MENU_EDIT_PREFERENCES=&Настройки...
MENU_VIEW=&Вид MENU_VIEW=&Вид
MENU_VIEW_SHOW_WHITESPACE_MARKS=Видимые пробелы и табы MENU_VIEW_SHOW_WHITESPACE_MARKS=Видимые пробелы и табы