improve HDPI support

Update dlangui dependency to version 0.10.2

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "deps/DCD"]
-	path = deps/DCD
-	url = https://github.com/Hackerpilot/DCD.git

deps/DCD

@@ -1 +0,0 @@
-Subproject commit cbcc6faac3f820bb8e06ed132d82d13036e34d58

dub.json

@@ -12,9 +12,8 @@
     "stringImportPaths": ["views"],
 
     "dependencies": {
-        "dlangui": "==0.9.180",
+        "dlangui": "~>0.10.3",
-        "dsymbol": "~>0.4.8",
+        "dcd": "~>0.16.0-beta.1"
-        "dcd": "~>0.9.13"
     },
 
     "copyFiles-windows": [
@@ -30,19 +29,19 @@
     "configurations" : [
         {
             "name" : "default"
-        }, 
+        },
         {
             "name" : "minimal",
             "subConfigurations" : {
                 "dlangui" : "minimal"
             }
-        }, 
+        },
         {
             "name" : "console",
             "subConfigurations" : {
                 "dlangui" : "console"
             }
-        }, 
+        },
         {
             "name" : "x11",
             "subConfigurations" : {

src/ddc/lexer/Lexer.d

@@ -69,7 +69,7 @@ class BasicTypeX : Lexem {
     in {
         assert(isBasicTypeXToken(token));
     }
-    body {
+    do {
         _token = token;
     }
 }
@@ -97,7 +97,7 @@ class TypeCtor : Lexem {
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _token = token;
     }
 }
@@ -112,14 +112,14 @@ class TypeCtors : Lexem {
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _list ~= new TypeCtor(token);
     }
     public void append(Token token)
     in {
         assert(isTypeCtorToken(token));
     }
-    body {
+    do {
         _list ~= new TypeCtor(token);
     }
 }
@@ -134,7 +134,7 @@ class Identifier : Lexem {
     in {
         assert(identifier.type == TokenType.IDENTIFIER);
     }
-    body {
+    do {
         _token = cast(IdentToken)identifier;
     }
 }
@@ -157,14 +157,14 @@ class IdentifierList : Lexem {
     in {
         assert(ident.type == TokenType.IDENTIFIER);
     }
-    body {
+    do {
         _identifier = new Identifier(ident);
         _identifierList = identifierList;
     }
     public this(TemplateInstance templateInstance, IdentifierList identifierList = null)
     in {
     }
-    body {
+    do {
         _templateInstance = templateInstance;
         _identifierList = identifierList;
     }
@@ -181,7 +181,7 @@ class TemplateInstance : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -207,7 +207,7 @@ class BasicType : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -228,7 +228,7 @@ class Typeof : Lexem {
     public this(Expression expression)
     in {
     }
-    body {
+    do {
         _expression = expression;
     }
 }
@@ -245,7 +245,7 @@ class Type : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -259,7 +259,7 @@ class Expression : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 
@@ -273,7 +273,7 @@ class AltDeclarator : Lexem {
     public this()
     in {
     }
-    body {
+    do {
     }
 }
 

src/dlangide.d

@@ -6,7 +6,15 @@ import std.conv;
 import dlangide.ui.frame;
 import dlangide.ui.commands;
 import dlangide.workspace.workspace;
-import std.experimental.logger;
+
+static if(__VERSION__ > 2100)
+{
+    import std.logger;
+}
+else
+{
+    import std.experimental.logger;
+}
 
 mixin APP_ENTRY_POINT;
 
@@ -26,18 +34,20 @@ extern (C) int UIAppMain(string[] args) {
         runParserTests();
     }
 
-    version(Windows) {
+    static if(__VERSION__ > 2100) {
+        debug {
+            sharedLog = cast(shared)new FileLogger("dcd.log");
+        } else {
+            sharedLog = cast(shared)new NullLogger();
+        }
+    }
+    else
+    {
         debug {
             sharedLog = new FileLogger("dcd.log");
         } else {
             sharedLog = new NullLogger();
         }
-    } else {
-        debug {
-            //sharedLog = new FileLogger("dcd.log");
-        } else {
-            sharedLog = new NullLogger();
-        }
     }
 
     //version (Windows) {
@@ -94,12 +104,12 @@ extern (C) int UIAppMain(string[] args) {
             // set window icon
             window.windowIcon = drawableCache.getImage("dlangui-logo1");
         }
-    
+
         //Widget w = new Widget();
         //pragma(msg, w.click.return_t, "", w.click.params_t);
 
         IDEFrame frame = new IDEFrame(window);
-        
+
         // Open project, if it specified in command line
         if (args.length > 1)
         {

src/dlangide/tools/d/dcdinterface.d

@@ -19,11 +19,6 @@ import dcd.server.autocomplete;
 import dcd.common.messages;
 import dsymbol.modulecache;
 
-//alias SharedASTAllocator = CAllocatorImpl!(Mallocator);
-//alias SharedASTAllocator = CAllocatorImpl!(Mallocator);
-//alias SharedASTAllocator = CSharedAllocatorImpl!(Mallocator);
-alias SharedASTAllocator = ASTAllocator;
-
 enum DCDResult : int {
     SUCCESS,
     NO_RESULT,
@@ -92,11 +87,9 @@ class DCDTask {
 }
 
 class ModuleCacheAccessor {
-    import dsymbol.modulecache;
-    //protected ASTAllocator _astAllocator;
     protected ModuleCache _moduleCache;
     this(in string[] importPaths) {
-        _moduleCache = ModuleCache(new SharedASTAllocator);
+        _moduleCache = ModuleCache();
         _moduleCache.addImportPaths(importPaths);
     }
     protected ModuleCache * getModuleCache(in string[] importPaths) {
@@ -109,8 +102,6 @@ class ModuleCacheAccessor {
 class DCDInterface : Thread {
 
     import dsymbol.modulecache;
-    //protected ASTAllocator _astAllocator;
-    //protected ModuleCache * _moduleCache;
     ModuleCacheAccessor _moduleCache;
     protected BlockingQueue!DCDTask _queue;
 
@@ -238,7 +229,7 @@ class DCDInterface : Thread {
         override void performRequest() {
             AutocompleteResponse response = getDoc(request, *getModuleCache(_importPaths));
 
-            result.docComments = response.docComments.dup;
+            //result.docComments = response.docComments.dup; TODO_GRIM: Fix
             result.result = DCDResult.SUCCESS;
 
             debug(DCD) Log.d("DCD doc comments:\n", result.docComments);
@@ -318,11 +309,9 @@ class DCDInterface : Thread {
             result.output.length = response.completions.length;
             int i=0;
             foreach(s;response.completions) {
-                char type = 0;
+                char type = s.kind;
-                if (i < response.completionKinds.length)
-                    type = response.completionKinds[i];
                 result.output[i].kind = type;
-                result.output[i].name = to!dstring(s);
+                result.output[i].name = to!dstring(s.identifier);
                 i++;
             }
             if (response.completionType == "calltips") {
@@ -364,6 +353,7 @@ int completionTypePriority(char t) {
             return 3;
         case 'k': // - keyword, built-in version, scope statement
             return 20;
+        case 'F':
         case 'f': // - function or method
             return 2;
         case 'g': // - enum name

src/dlangide/ui/dmdprofilerview.d

@@ -43,7 +43,7 @@ class DMDProfilerView : WidgetGroupDefaultDrawing {
 
 class TraceFuncionGrid : StringGridWidgetBase {
     protected FunctionNode[] _list;
-    protected dstring[] _colTitles;
+    protected UIString[] _colTitles;
     protected ulong _ticksPerSecond;
     this(string ID, FunctionNode[] list, ulong ticks_per_second) {
         super(ID);
@@ -53,10 +53,10 @@ class TraceFuncionGrid : StringGridWidgetBase {
         fullColumnOnLeft(false);
         fullRowOnTop(false);
         resize(4, cast(int)list.length);
-        setColTitle(0, "Function name"d);
+        setColTitle(0, UIString.fromRaw("Function name"));
-        setColTitle(1, "Called"d);
+        setColTitle(1, UIString.fromRaw("Called"));
-        setColTitle(2, "F us"d);
+        setColTitle(2, UIString.fromRaw("F us"));
-        setColTitle(3, "F+D us"d);
+        setColTitle(3, UIString.fromRaw("F+D us"));
         showRowHeaders = false;
         rowSelect = true;
         minVisibleRows = 10;
@@ -80,54 +80,54 @@ class TraceFuncionGrid : StringGridWidgetBase {
             buffer[i] = buf[k - i - 1];
         return cast(dstring)buffer[0..k];
     }
-    dstring formatDurationTicks(ulong n) {
+    auto formatDurationTicks(ulong n) {
         ulong v = n * 1000000 / _ticksPerSecond;
-        return formatNumber(v, _numberFormatBuf[]);
+        return UIString.fromRaw(formatNumber(v, _numberFormatBuf[]));
     }
 
     /// get cell text
-    override dstring cellText(int col, int row) {
+    override UIString cellText(int col, int row) {
         import std.conv : to;
         if (row < 0 || row >= _list.length)
-            return ""d;
+            return UIString.fromRaw(""d);
         FunctionNode entry = _list[row];
         switch (col) {
             case 0:
                 string fn = entry.name;
                 if (fn.length > 256)
                     fn = fn[0..256] ~ "...";
-                return fn.to!dstring;
+                return UIString.fromRaw(fn.to!dstring);
             case 1:
-                return formatNumber(entry.number_of_calls, _numberFormatBuf);
+                return UIString.fromRaw(formatNumber(entry.number_of_calls, _numberFormatBuf));
             case 2:
                 return formatDurationTicks(entry.function_time);
             case 3:
                 return formatDurationTicks(entry.function_and_descendant_time);
             default:
-                return ""d;
+                return UIString.fromRaw(""d);
         }
     }
     /// set cell text
-    override StringGridWidgetBase setCellText(int col, int row, dstring text) {
+    override StringGridWidgetBase setCellText(int col, int row, UIString text) {
         // do nothing
         return this;
     }
     /// returns row header title
-    override dstring rowTitle(int row) {
+    override UIString rowTitle(int row) {
-        return ""d;
+        return UIString.fromRaw(""d);
     }
     /// set row header title
-    override StringGridWidgetBase setRowTitle(int row, dstring title) {
+    override StringGridWidgetBase setRowTitle(int row, UIString title) {
         return this;
     }
 
     /// returns row header title
-    override dstring colTitle(int col) {
+    override UIString colTitle(int col) {
         return _colTitles[col];
     }
 
     /// set col header title
-    override StringGridWidgetBase setColTitle(int col, dstring title) {
+    override StringGridWidgetBase setColTitle(int col, UIString title) {
         _colTitles[col] = title;
         return this;
     }

src/dlangide/ui/dsourceedit.d

@@ -49,7 +49,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
         onThemeChanged();
         //setTokenHightlightColor(TokenCategory.Identifier, 0x206000);  // no colors
         MenuItem editPopupItem = new MenuItem(null);
-        editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, 
+        editPopupItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO,
                           ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT, ACTION_EDIT_TOGGLE_LINE_COMMENT,
                           ACTION_GET_COMPLETIONS, ACTION_GO_TO_DEFINITION, ACTION_DEBUG_TOGGLE_BREAKPOINT);
         popupMenu = editPopupItem;
@@ -125,12 +125,12 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
 
     protected EditorTool _editorTool;
     @property EditorTool editorTool() { return _editorTool; }
-    @property EditorTool editorTool(EditorTool tool) { 
+    @property EditorTool editorTool(EditorTool tool) {
         if (_editorTool && _editorTool !is tool) {
             destroy(_editorTool);
             _editorTool = null;
         }
-        return _editorTool = tool; 
+        return _editorTool = tool;
     };
 
     protected ProjectSourceFile _projectSourceFile;
@@ -585,7 +585,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
         _docsPopup.popupClosed = delegate(PopupWidget source) {
             Log.d("Closed Docs popup");
             _docsPopup = null;
-            //setFocus(); 
+            //setFocus();
         };
         _docsPopup.flags = PopupFlags.CloseOnClickOutside | PopupFlags.CloseOnMouseMoveOutside;
         invalidate();
@@ -641,7 +641,8 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
             return;
         }
 
-        if (suggestions.length == 1) {
+        // Only insert singular autocompletion if automatic autocomplete is turned off!
+        if (!_settings.autoAutoComplete && suggestions.length == 1) {
             insertCompletion(suggestions[0]);
             return;
         }
@@ -680,7 +681,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
                                              popupPositionX,
                                              popupPositionY + yOffset);
         _completionPopup.setFocus();
-        _completionPopup.popupClosed = delegate(PopupWidget source) { 
+        _completionPopup.popupClosed = delegate(PopupWidget source) {
             setFocus();
             _completionPopup = null;
         };
@@ -721,13 +722,25 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
         super.handleFocusChange(focused, receivedFocusFromKeyboard);
     }
 
+    private bool isAutoCompleteKey(ref KeyEvent event) {
+        if((event.keyCode >= KeyCode.KEY_0 && event.keyCode <= KeyCode.KEY_Z) ||
+            event.keyCode == KeyCode.KEY_PERIOD ||
+            event.keyCode == KeyCode.BACK ||
+            event.text == "_")
+            return true;
+        return false;
+    }
+
     protected uint _lastKeyDownCode;
     protected uint _periodKeyCode;
     /// handle keys: support autocompletion after . press with delay
     override bool onKeyEvent(KeyEvent event) {
         if (event.action == KeyAction.KeyDown)
             _lastKeyDownCode = event.keyCode;
-        if (event.action == KeyAction.Text && event.noModifiers && event.text==".") {
+        if(_settings.autoAutoComplete && isAutoCompleteKey(event) && !_completionPopup) {
+            window.dispatchAction(ACTION_GET_COMPLETIONS, this);
+        }
+        else if (event.action == KeyAction.Text && event.noModifiers && event.text==".") {
             _periodKeyCode = _lastKeyDownCode;
             startCompletionTimer();
         } else {
@@ -775,7 +788,7 @@ class CompletionPopupMenu : PopupMenu {
         //maxHeight(400);
         selectItem(0);
     }
-    
+
     Point fullContentSizeWithBorders() {
         measure(2000.pointsToPixels, 2000.pointsToPixels);
         Point sz;
@@ -790,7 +803,7 @@ class CompletionPopupMenu : PopupMenu {
 
     MenuItem updateItems() {
         MenuItem res = new MenuItem();
-        foreach(int i, dstring suggestion ; _suggestions) {
+        foreach(i, dstring suggestion ; _suggestions) {
             if (_prefix.length && !suggestion.startsWith(_prefix))
                 continue;
             string iconId;
@@ -806,19 +819,12 @@ class CompletionPopupMenu : PopupMenu {
     /// handle keys
     override bool onKeyEvent(KeyEvent event) {
         if (event.action == KeyAction.Text) {
-            _prefix ~= event.text;
+            _editor.onKeyEvent(event);
-            MenuItem newItems = updateItems();
+            _editor.closeCompletionPopup(this);
-            if (newItems.subitemCount == 0) {
+            return true;
-                // no matches anymore
+        } else if (event.keyCode == KeyCode.ESCAPE) {
-                _editor.onKeyEvent(event);
+            _editor.closeCompletionPopup(this);
-                _editor.closeCompletionPopup(this);
+            return true;
-                return true;
-            } else {
-                _editor.onKeyEvent(event);
-                menuItems = newItems;
-                selectItem(0);
-                return true;
-            }
         } else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.BACK && event.noModifiers) {
             if (_prefix.length > _initialPrefix.length) {
                 _prefix.length = _prefix.length - 1;
@@ -831,8 +837,8 @@ class CompletionPopupMenu : PopupMenu {
                 _editor.closeCompletionPopup(this);
             }
             return true;
-        } else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.RETURN) {
+        } else if ((event.action == KeyAction.KeyDown && event.keyCode == KeyCode.RETURN) ||
-        } else if (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.SPACE) {
+            (event.action == KeyAction.KeyDown && event.keyCode == KeyCode.SPACE)) {
         }
         return super.onKeyEvent(event);
     }

src/dlangide/ui/newfile.d

@@ -97,7 +97,7 @@ class NewFileDlg : Dialog {
                             TextWidget { text: OPTION_FILE_PATH }
                             EditLine { id: edFilePath; text: ""; layoutWidth: fill; readOnly: true }
                         }
-                        TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: #FF0000 }
+                        TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: 0xFF0000 }
                     }
                 });
         } catch (Exception e) {
@@ -394,4 +394,4 @@ private bool isSubdirOf(string path, string basePath) {
         return ch == '/' || ch == '\\';
     }
     return false;
-}
+}

src/dlangide/ui/newfolder.d

@@ -61,7 +61,7 @@ class NewFolderDialog : Dialog {
                             CheckBox { id: makePackage }
                             TextWidget { text: OPTION_MAKE_PACKAGE}
                         }
-                        TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: #FF0000 }
+                        TextWidget { id: statusText; text: ""; layoutWidth: fill; textColor: 0xFF0000 }
                     }
                 });
         } catch (Exception e) {
@@ -183,4 +183,4 @@ class NewFolderDialog : Dialog {
         }
         super.close(newaction);
     }
-}
+}

src/dlangide/ui/newproject.d

@@ -38,7 +38,7 @@ class NewProjectDlg : Dialog {
     IDEFrame _ide;
 
     this(IDEFrame parent, bool newWorkspace, Workspace currentWorkspace, string dir) {
-        super(newWorkspace ? UIString.fromId("OPTION_NEW_WORKSPACE"c) : UIString.fromId("OPTION_NEW_PROJECT"c), parent.window, 
+        super(newWorkspace ? UIString.fromId("OPTION_NEW_WORKSPACE"c) : UIString.fromId("OPTION_NEW_PROJECT"c), parent.window,
               DialogFlag.Modal | DialogFlag.Resizable | DialogFlag.Popup, 500, 400);
         _ide = parent;
         _icon = "dlangui-logo1";
@@ -64,8 +64,8 @@ class NewProjectDlg : Dialog {
                                 margins: 5
                                 layoutWidth: 25%; layoutHeight: fill
                                 TextWidget { text: OPTION_PROJECT_TEMPLATE }
-                                StringListWidget { 
+                                StringListWidget {
-                                    id: projectTemplateList 
+                                    id: projectTemplateList
                                     layoutWidth: wrap; layoutHeight: fill
                                 }
                             }
@@ -73,8 +73,8 @@ class NewProjectDlg : Dialog {
                                 margins: 5
                                 layoutWidth: 40%; layoutHeight: fill
                                 TextWidget { text: OPTION_TEMPLATE_DESCR }
-                                EditBox { 
+                                EditBox {
-                                    id: templateDescription; readOnly: true 
+                                    id: templateDescription; readOnly: true
                                     layoutWidth: fill; layoutHeight: fill
                                 }
                             }
@@ -82,7 +82,7 @@ class NewProjectDlg : Dialog {
                                 layoutWidth: 35%; layoutHeight: fill
                                 margins: 5
                                 TextWidget { text: OPTION_DIRECTORY_LAYOUT }
-                                EditBox { 
+                                EditBox {
                                     id: directoryLayout; readOnly: true
                                     layoutWidth: fill; layoutHeight: fill
                                 }
@@ -362,13 +362,13 @@ class NewProjectDlg : Dialog {
         project.name = toUTF32(_projectName);
         if (!project.save())
             return setError("Cannot save project");
-        project.content.setString("targetName", _projectName);
+        project.content.setting.setString("targetName", _projectName);
         if (_currentTemplate.isLibrary) {
-            project.content.setString("targetType", "staticLibrary");
+            project.content.setting.setString("targetType", "staticLibrary");
-            project.content.setString("targetPath", "lib");
+            project.content.setting.setString("targetPath", "lib");
         } else {
-            project.content.setString("targetType", "executable");
+            project.content.setting.setString("targetType", "executable");
-            project.content.setString("targetPath", "bin");
+            project.content.setting.setString("targetPath", "bin");
         }
         if (_currentTemplate.json)
             project.content.merge(_currentTemplate.json);
@@ -500,7 +500,7 @@ extern (C) int UIAppMain(string[] args) {
     };
     // show message box with content of editors
     window.mainWidget.childById!Button("btnOk").click = delegate(Widget w) {
-        window.showMessageBox(UIString.fromId("MSG_OK_BUTTON"c), 
+        window.showMessageBox(UIString.fromId("MSG_OK_BUTTON"c),
                               UIString.fromId("EDITOR_CONTENT"c) ~ "\nEdit1: "d ~ edit1.text ~ "\nEdit2: "d ~ edit2.text);
         return true;
     };

src/dlangide/ui/searchPanel.d

@@ -372,11 +372,11 @@ SearchMatchList findMatches(in string filename, in dstring searchString) {
     SearchMatchList match;
     match.filename = filename;
 
-    foreach(int lineIndex, dstring line; content.lines) {
+    foreach(lineIndex, dstring line; content.lines) {
         auto colIndex = line.indexOf(searchString);
         
         if (colIndex != -1) {
-            match.matches ~= SearchMatch(lineIndex, colIndex, line);
+            match.matches ~= SearchMatch(cast(int)lineIndex, colIndex, line);
         }
     }
     return match;  

src/dlangide/ui/settings.d

@@ -69,36 +69,36 @@ SettingsPage createSettingsPages() {
     // UI settings page
     SettingsPage ui = res.addChild("interface", UIString.fromId("OPTION_INTERFACE"c));
     ui.addStringComboBox("interface/theme", UIString.fromId("OPTION_THEME"c), [
-            StringListValue("ide_theme_default", "OPTION_DEFAULT"c), 
+            StringListValue("ide_theme_default", "OPTION_DEFAULT"c),
             StringListValue("ide_theme_dark", "OPTION_DARK"c)]);
     ui.addStringComboBox("interface/language", UIString.fromId("OPTION_LANGUAGE"c), [
-            StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c), 
+            StringListValue("en", "MENU_VIEW_LANGUAGE_EN"c),
-            StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c), 
+            StringListValue("ru", "MENU_VIEW_LANGUAGE_RU"c),
             StringListValue("es", "MENU_VIEW_LANGUAGE_ES"c),
             StringListValue("de", "MENU_VIEW_LANGUAGE_DE"c),
-	    StringListValue("cs", "MENU_VIEW_LANGUAGE_CS"c)]);
+        StringListValue("cs", "MENU_VIEW_LANGUAGE_CS"c)]);
 
     // UI font faces
-    ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c), 
+    ui.addStringComboBox("interface/uiFontFace", UIString.fromId("OPTION_FONT_FACE"c),
                       createFaceList(false));
-    ui.addIntComboBox("interface/uiFontSize", UIString.fromId("OPTION_FONT_SIZE"c), 
+    ui.addIntComboBox("interface/uiFontSize", UIString.fromId("OPTION_FONT_SIZE"c),
                       createIntValueList([6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,30,32]));
 
 
-    ui.addIntComboBox("interface/hintingMode", UIString.fromId("OPTION_FONT_HINTING"c), [StringListValue(0, "OPTION_FONT_HINTING_NORMAL"c), 
+    ui.addIntComboBox("interface/hintingMode", UIString.fromId("OPTION_FONT_HINTING"c), [StringListValue(0, "OPTION_FONT_HINTING_NORMAL"c),
-                StringListValue(1, "OPTION_FONT_HINTING_FORCE"c), 
+                StringListValue(1, "OPTION_FONT_HINTING_FORCE"c),
                 StringListValue(2, "OPTION_FONT_HINTING_DISABLED"c), StringListValue(3, "OPTION_FONT_HINTING_LIGHT"c)]);
-    ui.addIntComboBox("interface/minAntialiasedFontSize", UIString.fromId("OPTION_FONT_ANTIALIASING"c), 
+    ui.addIntComboBox("interface/minAntialiasedFontSize", UIString.fromId("OPTION_FONT_ANTIALIASING"c),
-                      [StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c), 
+                      [StringListValue(0, "OPTION_FONT_ANTIALIASING_ALWAYS_ON"c),
-                      StringListValue(12, "12"d), 
+                      StringListValue(12, "12"d),
-                      StringListValue(14, "14"d), 
+                      StringListValue(14, "14"d),
-                      StringListValue(16, "16"d), 
+                      StringListValue(16, "16"d),
-                      StringListValue(20, "20"d), 
+                      StringListValue(20, "20"d),
-                      StringListValue(24, "24"d), 
+                      StringListValue(24, "24"d),
-                      StringListValue(32, "32"d), 
+                      StringListValue(32, "32"d),
-                      StringListValue(48, "48"d), 
+                      StringListValue(48, "48"d),
                       StringListValue(255, "OPTION_FONT_ANTIALIASING_ALWAYS_OFF"c)]);
-    ui.addFloatComboBox("interface/fontGamma", UIString.fromId("OPTION_FONT_GAMMA"c), 
+    ui.addFloatComboBox("interface/fontGamma", UIString.fromId("OPTION_FONT_GAMMA"c),
                    [
                     StringListValue(500,  "0.5   "d),
                     StringListValue(600,  "0.6   "d),
@@ -109,25 +109,28 @@ SettingsPage createSettingsPages() {
                     StringListValue(950,  "0.95  "d),
                     StringListValue(1000, "1.0   "d),
                     StringListValue(1050, "1.05  "d),
-                    StringListValue(1100, "1.1   "d), 
+                    StringListValue(1100, "1.1   "d),
-                    StringListValue(1150, "1.15  "d), 
+                    StringListValue(1150, "1.15  "d),
-                    StringListValue(1200, "1.2   "d), 
+                    StringListValue(1200, "1.2   "d),
-                    StringListValue(1250, "1.25  "d), 
+                    StringListValue(1250, "1.25  "d),
-                    StringListValue(1300, "1.3   "d), 
+                    StringListValue(1300, "1.3   "d),
-                    StringListValue(1400, "1.4   "d), 
+                    StringListValue(1400, "1.4   "d),
-                    StringListValue(1500, "1.5   "d), 
+                    StringListValue(1500, "1.5   "d),
-                    StringListValue(1700, "1.7   "d), 
+                    StringListValue(1700, "1.7   "d),
                     StringListValue(2000, "2.0   "d)]);
 
-    ui.addIntComboBox("interface/screenDpiOverride", UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE"c), 
+    ui.addIntComboBox("interface/screenDpiOverride", UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE"c),
-                      [StringListValue(0, UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE_NONE"c).value ~ " ("d ~ to!dstring(systemScreenDPI) ~ ")"d), 
+                      [StringListValue(0, UIString.fromId("OPTION_SCREEN_DPI_OVERRIDE_NONE"c).value ~ " ("d ~ to!dstring(systemScreenDPI) ~ ")"d),
-                      StringListValue(72, "72"d), 
+                      StringListValue(72, "72"d),
-                      StringListValue(96, "96"d), 
+                      StringListValue(96, "96"d),
-                      StringListValue(120, "120"d), 
+                      StringListValue(120, "120"d),
-                      StringListValue(140, "140"d), 
+                      StringListValue(140, "140"d),
-                      StringListValue(150, "150"d), 
+                      StringListValue(150, "150"d),
-                      StringListValue(300, "300"d), 
+                      StringListValue(150, "180"d),
-                      StringListValue(400, "400"d), 
+                      StringListValue(150, "200"d),
+                      StringListValue(150, "250"d),
+                      StringListValue(300, "300"d),
+                      StringListValue(400, "400"d),
                       StringListValue(600, "600"d)]);
 
     SettingsPage ed = res.addChild("editors", UIString.fromId("OPTION_EDITORS"c));
@@ -144,6 +147,7 @@ SettingsPage createSettingsPages() {
     texted.addCheckbox("editors/textEditor/smartIndentsAfterPaste", UIString.fromId("OPTION_SMART_INDENTS_PASTE"c));
     texted.addCheckbox("editors/textEditor/showWhiteSpaceMarks", UIString.fromId("OPTION_SHOW_SPACES"c));
     texted.addCheckbox("editors/textEditor/showTabPositionMarks", UIString.fromId("OPTION_SHOW_TABS"c));
+    texted.addCheckbox("editors/textEditor/autoAutoComplete", UIString.fromId("OPTION_AUTO_AUTOCOMPLETE"c));
 
     // Common page
     SettingsPage common = res.addChild("common", UIString.fromId("OPTION_COMMON"c));
@@ -189,14 +193,14 @@ SettingsPage createProjectSettingsPages() {
 
     SettingsPage build = res.addChild("build", UIString.fromId("OPTION_BUILD"c));
     build.addStringComboBox("build/toolchain", UIString.fromId("OPTION_TOOLCHAIN"c), [
-            StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), 
+            StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)),
-            StringListValue("dmd", "DMD"d), 
+            StringListValue("dmd", "DMD"d),
-            StringListValue("ldc", "LDC"d), 
+            StringListValue("ldc", "LDC"d),
-            StringListValue("ldmd", "LDMD"d), 
+            StringListValue("ldmd", "LDMD"d),
             StringListValue("gdc", "GDC"d)]);
     build.addStringComboBox("build/arch", UIString.fromId("OPTION_ARCHITECTURE"c), [
-            StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)), 
+            StringListValue("default", UIString.fromId("OPTION_DEFAULT"c)),
-            StringListValue("x86", "x86"d), 
+            StringListValue("x86", "x86"d),
             StringListValue("x86_64", "x86_64"d),
             StringListValue("arm", "arm"d),
             StringListValue("arm64", "arm64"d),

src/dlangide/workspace/idesettings.d

@@ -23,6 +23,7 @@ class IDESettings : SettingsFile {
         ed.setBooleanDef("smartIndentsAfterPaste", true);
         ed.setBooleanDef("showWhiteSpaceMarks", true);
         ed.setBooleanDef("showTabPositionMarks", true);
+        ed.setBooleanDef("autoAutoComplete", true);
         ed.setStringDef("fontFace", "Default");
         ed.setIntegerDef("fontSize", 11);
         Setting ui = uiSettings();
@@ -59,7 +60,7 @@ class IDESettings : SettingsFile {
     /// override to do something after loading - e.g. set defaults
     override void afterLoad() {
     }
-    
+
     @property Setting editorSettings() {
         Setting res = _setting.objectByPath("editors/textEditor", true);
         return res;
@@ -171,6 +172,16 @@ class IDESettings : SettingsFile {
         return this;
     }
 
+    /// Text editor setting, true if auto-complete is triggered on each key press
+    @property bool autoAutoComplete() {
+        return editorSettings.getBoolean("autoAutoComplete", true);
+    }
+    ///
+    @property IDESettings autoAutoComplete(bool v) {
+        editorSettings.setBoolean("autoAutoComplete", v);
+        return this;
+    }
+
     /// true if smart indents are enabled
     @property bool smartIndents() { return editorSettings.getBoolean("smartIndents", true); }
     /// set smart indents enabled flag
@@ -317,7 +328,7 @@ class IDESettings : SettingsFile {
         obj["recentWorkspaces"] = list;
         save();
     }
-    
+
     @property bool autoOpenLastProject() {
         Setting obj =_setting.objectByPath("common", true);
         return obj.getBoolean("autoOpenLastProject", false);

src/dlangide/workspace/project.d

@@ -11,6 +11,7 @@ import std.file;
 import std.path;
 import std.process;
 import std.utf;
+import std.ascii : isAlphaNum;
 
 string[] includePath;
 
@@ -311,19 +312,19 @@ struct ProjectConfiguration {
     string name;
     /// type, for libraries one can run tests, for apps - execute them
     Type type;
-    
+
     /// How to display default configuration in ui
     immutable static string DEFAULT_NAME = "default";
     /// Default project configuration
     immutable static ProjectConfiguration DEFAULT = ProjectConfiguration(DEFAULT_NAME, Type.Default);
-    
+
     /// Type of configuration
     enum Type {
         Default,
         Executable,
         Library
     }
-    
+
     private static Type parseType(string s)
     {
         switch(s)
@@ -335,7 +336,7 @@ struct ProjectConfiguration {
             default: return Type.Default;
         }
     }
-    
+
     /// parsing from setting file
     static ProjectConfiguration[] load(Setting s)
     {
@@ -490,7 +491,7 @@ class Project : WorkspaceItem {
     /// name
     override @property void name(dstring s) {
         super.name(s);
-        _projectFile.setString("name", toUTF8(s));
+        _projectFile.setting.setString("name", toUTF8(s));
     }
 
     /// name
@@ -501,7 +502,7 @@ class Project : WorkspaceItem {
     /// name
     override @property void description(dstring s) {
         super.description(s);
-        _projectFile.setString("description", toUTF8(s));
+        _projectFile.setting.setString("description", toUTF8(s));
     }
 
     /// returns project's own source paths
@@ -576,12 +577,12 @@ class Project : WorkspaceItem {
         if (!isExecutable)
             return null;
         string exename = toUTF8(name);
-        exename = _projectFile.getString("targetName", exename);
+        exename = _projectFile.setting.getString("targetName", exename);
         // TODO: use targetName
         version (Windows) {
             exename = exename ~ ".exe";
         }
-        string targetPath = _projectFile.getString("targetPath", null);
+        string targetPath = _projectFile.setting.getString("targetPath", null);
         string exePath;
         if (targetPath.length)
             exePath = buildNormalizedPath(_filename.dirName, targetPath, exename); // int $targetPath directory
@@ -685,10 +686,10 @@ class Project : WorkspaceItem {
     protected string[] findSourcePaths() {
         string[] res;
         res.assumeSafeAppend;
-        string[] srcPaths = _projectFile.getStringArray("sourcePaths");
+        string[] srcPaths = _projectFile.setting.getStringArray("sourcePaths");
         foreach(s; srcPaths)
             addRelativePathIfExists(res, s);
-        Setting configs = _projectFile.objectByPath("configurations");
+        Setting configs = _projectFile.setting.objectByPath("configurations");
         if (configs) {
             for (int i = 0; i < configs.length; i++) {
                 Setting s = configs[i];
@@ -710,7 +711,7 @@ class Project : WorkspaceItem {
     void processSubpackages() {
         import dlangui.core.files;
         _subPackages.length = 0;
-        Setting subPackages = _projectFile.settingByPath("subPackages", SettingType.ARRAY, false);
+        Setting subPackages = _projectFile.setting.settingByPath("subPackages", SettingType.ARRAY, false);
         if (subPackages) {
             string p = _projectFile.filename.dirName;
             for(int i = 0; i < subPackages.length; i++) {
@@ -761,7 +762,7 @@ class Project : WorkspaceItem {
         //
         _mainSourceFile = null;
         try {
-            _name = toUTF32(_projectFile.getString("name"));
+            _name = toUTF32(_projectFile.setting.getString("name"));
             _originalName = _name;
             if (_baseProjectName) {
                 _name = _baseProjectName ~ ":" ~ _name;
@@ -770,7 +771,7 @@ class Project : WorkspaceItem {
                 _name ~= "-"d;
                 _name ~= toUTF32(_dependencyVersion.startsWith("~") ? _dependencyVersion[1..$] : _dependencyVersion);
             }
-            _description = toUTF32(_projectFile.getString("description"));
+            _description = toUTF32(_projectFile.setting.getString("description"));
             Log.d("  project name: ", _name);
             Log.d("  project description: ", _description);
 
@@ -786,7 +787,7 @@ class Project : WorkspaceItem {
             if (!_isDependency)
                 loadSelections();
 
-            _configurations = ProjectConfiguration.load(_projectFile);
+            _configurations = ProjectConfiguration.load(_projectFile.setting);
             Log.i("Project configurations: ", _configurations);
 
 
@@ -842,7 +843,7 @@ class Project : WorkspaceItem {
             _dependencies = newdeps;
             return false;
         }
-        Setting versions = selectionsFile.objectByPath("versions");
+        Setting versions = selectionsFile.setting.objectByPath("versions");
         if (!versions.isObject) {
             _dependencies = newdeps;
             return false;
@@ -934,19 +935,19 @@ class DubPackageFinder {
 bool isValidProjectName(in string s) pure {
     if (s.empty)
         return false;
-    return reduce!q{ a && (b == '_' || b == '-' || std.ascii.isAlphaNum(b)) }(true, s);
+    return reduce!((a, b) => a && (b == '_' || b == '-' || isAlphaNum(b)))(true, s);
 }
 
 bool isValidModuleName(in string s) pure {
     if (s.empty)
         return false;
-    return reduce!q{ a && (b == '_' || std.ascii.isAlphaNum(b)) }(true, s);
+    return reduce!((a, b) => a && (b == '_' || isAlphaNum(b)))(true, s);
 }
 
 bool isValidFileName(in string s) pure {
     if (s.empty)
         return false;
-    return reduce!q{ a && (b == '_' || b == '.' || b == '-' || std.ascii.isAlphaNum(b)) }(true, s);
+    return reduce!((a, b) => a && (b == '_' || b == '.' || b == '-' || isAlphaNum(b)))(true, s);
 }
 
 unittest {

src/dlangide/workspace/workspace.d

@@ -54,9 +54,9 @@ class Workspace : WorkspaceItem {
     protected Project[] _projects;
     protected SettingsFile _workspaceFile;
     protected WorkspaceSettings _settings;
-    
+
     protected IDEFrame _frame;
-    
+
     this(IDEFrame frame, string fname = WORKSPACE_EXTENSION) {
         super(fname);
         _workspaceFile = new SettingsFile(fname);
@@ -74,9 +74,9 @@ class Workspace : WorkspaceItem {
     }
 
     @property Setting includePath(){
-        Setting res = _workspaceFile.objectByPath("includePath", true);
+        Setting res = _workspaceFile.setting.objectByPath("includePath", true);
         return res;
-    }    
+    }
 
     @property Project[] projects() { return _projects; }
 
@@ -91,19 +91,19 @@ class Workspace : WorkspaceItem {
     protected Project _startupProject;
 
     @property Project startupProject() { return _startupProject; }
-    @property void startupProject(Project project) { 
+    @property void startupProject(Project project) {
         if (_startupProject is project)
             return;
         _startupProject = project;
         _settings.startupProjectName = toUTF8(project.name);
         _frame.updateProjectConfigurations();
     }
-    
+
     /// Last opened files in workspace
     @property WorkspaceFile[] files() {
         return _settings.files();
     }
-    
+
     /// Last opened files in workspace
     @property void files(WorkspaceFile[] fs) {
         _settings.files(fs);
@@ -159,7 +159,7 @@ class Workspace : WorkspaceItem {
         updateBreakpointFiles(res);
         return res;
     }
-    
+
     void setSourceFileBreakpoints(ProjectSourceFile file, Breakpoint[] breakpoints) {
         _settings.setProjectBreakpoints(toUTF8(file.project.name), file.projectFilePath, breakpoints);
     }
@@ -169,7 +169,7 @@ class Workspace : WorkspaceItem {
         updateBookmarkFiles(res);
         return res;
     }
-    
+
     void setSourceFileBookmarks(ProjectSourceFile file, EditorBookmark[] bookmarks) {
         _settings.setProjectBookmarks(toUTF8(file.project.name), file.projectFilePath, bookmarks);
     }
@@ -180,7 +180,7 @@ class Workspace : WorkspaceItem {
         updateBreakpointFiles(res);
         return res;
     }
-    
+
     protected void fillStartupProject() {
         string s = _settings.startupProjectName;
         if ((!_startupProject || !_startupProject.name.toUTF8.equal(s)) && _projects.length) {
@@ -312,13 +312,13 @@ class Workspace : WorkspaceItem {
             if (nf && !_name.empty) // cut off last comma
                 _name = _name[ 0 .. $ - 1 ];
             if (df && !_description.empty) // cut off last delimiter
-                _description = _description[ 0 .. $ - 3 ]; 
+                _description = _description[ 0 .. $ - 3 ];
         }
-        _workspaceFile.setString("name", toUTF8(_name));
+        _workspaceFile.setting.setString("name", toUTF8(_name));
-        _workspaceFile.setString("description", toUTF8(_description));
+        _workspaceFile.setting.setString("description", toUTF8(_description));
         Log.d("workspace name: ", _name);
         Log.d("workspace description: ", _description);
-        Setting projects = _workspaceFile.objectByPath("projects", true);
+        Setting projects = _workspaceFile.setting.objectByPath("projects", true);
         projects.clear(SettingType.OBJECT);
         foreach (Project p; _projects) {
             if (p.isDependency)
@@ -346,8 +346,8 @@ class Workspace : WorkspaceItem {
             return false;
         }
         _settings.load(filename ~ WORKSPACE_SETTINGS_EXTENSION);
-        _name = toUTF32(_workspaceFile["name"].str);
+        _name = toUTF32(_workspaceFile.setting["name"].str);
-        _description = toUTF32(_workspaceFile["description"].str);
+        _description = toUTF32(_workspaceFile.setting["description"].str);
         Log.d("workspace name: ", _name);
         Log.d("workspace description: ", _description);
         if (_name.empty()) {
@@ -355,7 +355,7 @@ class Workspace : WorkspaceItem {
             return false;
         }
         auto originalStartupProjectName = _settings.startupProjectName;
-        Setting projects = _workspaceFile.objectByPath("projects", true);
+        Setting projects = _workspaceFile.setting.objectByPath("projects", true);
         foreach(string key, Setting value; projects) {
             string path = value.str;
             Log.d("project: ", key, " path:", path);

views/VERSION

@@ -1 +1 @@
-v0.8.14
+v0.8.17

views/res/i18n/en.ini

@@ -34,7 +34,7 @@ NAME=Name
 MENU_FILE=&File
 MENU_FILE_NEW=&Create
 MENU_FILE_NEW_SOURCE_FILE=New file
-MENU_FILE_NEW_DIRECTORY=New directory 
+MENU_FILE_NEW_DIRECTORY=New directory
 MENU_FILE_NEW_PROJECT=New project
 MENU_FILE_NEW_WORKSPACE=New workspace
 MENU_FILE_OPEN=&Open file...
@@ -227,6 +227,7 @@ OPTION_VERBOSE=Verbose
 OPTION_WORKING_DIR=Working directory
 OPTION_WORKSPACE_NAME=Workspace name
 OPTION_USE_SPACES=Use spaces for tabs
+OPTION_AUTO_AUTOCOMPLETE=Automatically suggest auto completion
 
 ERROR=Error
 ERROR_CANNOT_CREATE_PROJECT=Cannot create project

views/res/i18n/ru.ini

@@ -221,6 +221,7 @@ OPTION_VERBOSE=Показать подробности
 OPTION_WORKING_DIR=Рабочий каталог
 OPTION_WORKSPACE_NAME=Имя рабочего пространства
 OPTION_USE_SPACES=Использовать пробелы вместо табуляции
+OPTION_AUTO_AUTOCOMPLETE=Автоматически предлагать дополнение кода
 
 ERROR=Ошибка
 ERROR_CANNOT_CREATE_PROJECT=Не могу создать проект

views/resources.list

@@ -7,6 +7,12 @@ res/i18n/cs.ini
 res/i18n/de.ini
 res/hdpi/hdpi_configure.png
 res/hdpi/hdpi_debug-run.png
+res/hdpi/hdpi_debug-pause.png
+res/hdpi/hdpi_debug-stop.png
+res/hdpi/hdpi_debug-restart.png
+res/hdpi/hdpi_debug-step-into.png
+res/hdpi/hdpi_debug-step-out.png
+res/hdpi/hdpi_debug-step-over.png
 res/hdpi/hdpi_document-close.png
 res/hdpi/hdpi_document-open-recent.png
 res/hdpi/hdpi_document-open.png