From 251fd6b8f7f6dfd9994afe011c93069e4efeedf3 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Tue, 12 Sep 2017 11:03:19 +0300
Subject: [PATCH] fixes for #251, #258, #274

---
 dub.json                         |  2 +-
 src/dlangide/ui/frame.d          |  1 +
 src/dlangide/ui/newfile.d        | 16 +++++++++++-----
 src/dlangide/ui/outputpanel.d    |  7 ++++++-
 src/dlangide/workspace/project.d |  9 +++++++++
 views/VERSION                    |  2 +-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dub.json b/dub.json
index dea2099..12d6fe6 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
 
     "dependencies": {
-        "dlangui": "==0.9.123",
+        "dlangui": "==0.9.124",
         "dsymbol": "~>0.2.9",
         "dcd": "~>0.9.1"
     },
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 06a9c22..5f14cb7 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -1256,6 +1256,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
         ProjectFolder folder;
         if (cast(Project)obj) {
             project = cast(Project)obj;
+            folder = project.firstSourceFolder;
         } else if (cast(ProjectFolder)obj) {
             folder = cast(ProjectFolder)obj;
             project = folder.project;
diff --git a/src/dlangide/ui/newfile.d b/src/dlangide/ui/newfile.d
index ab47509..c43eb8a 100644
--- a/src/dlangide/ui/newfile.d
+++ b/src/dlangide/ui/newfile.d
@@ -246,12 +246,18 @@ class NewFileDlg : Dialog {
                 return setError("Invalid file name");
             _moduleName = filename;
             char[] buf;
-            foreach(ch; relativePath) {
+            foreach(c; relativePath) {
+                char ch = c;
                 if (ch == '/' || ch == '\\')
-                    buf ~= '.';
-                else
-                    buf ~= ch;
+                    ch = '.';
+                else if (ch == '.')
+                    ch = '_';
+                if (ch == '.' && (buf.length == 0 || buf[$-1] == '.'))
+                    continue; // skip duplicate .
+                buf ~= ch;
             }
+            if (buf.length && buf[$-1] == '.')
+                buf.length--;
             _packageName = buf.dup;
             string m;
             if (_currentTemplate.kind == FileKind.MODULE) {
@@ -281,7 +287,7 @@ class NewFileDlg : Dialog {
                 string txt = "module " ~ _packageName ~ ";\n\n" ~ _currentTemplate.srccode;
                 write(_fullPathName, txt);
             } else if (_currentTemplate.kind == FileKind.PACKAGE) {
-                string txt = "package " ~ _packageName ~ ";\n\n" ~ _currentTemplate.srccode;
+                string txt = "module " ~ _packageName ~ ";\n\n" ~ _currentTemplate.srccode;
                 write(_fullPathName, txt);
             } else {
                 write(_fullPathName, _currentTemplate.srccode);
diff --git a/src/dlangide/ui/outputpanel.d b/src/dlangide/ui/outputpanel.d
index b4486a5..c1191ee 100644
--- a/src/dlangide/ui/outputpanel.d
+++ b/src/dlangide/ui/outputpanel.d
@@ -270,6 +270,10 @@ class OutputPanel : DockWindow {
         return null;
     }
 
+    void onTabClose(string tabId) {
+        Log.d("OutputPanel onTabClose ", tabId);
+    }
+
     override protected Widget createBodyWidget() {
         layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
         _tabs = new TabWidget("OutputPanelTabs", Align.Bottom);
@@ -277,6 +281,7 @@ class OutputPanel : DockWindow {
         _tabs.setStyles(STYLE_DOCK_WINDOW, STYLE_TAB_DOWN_DARK, STYLE_TAB_DOWN_BUTTON_DARK, STYLE_TAB_UP_BUTTON_DARK_TEXT, STYLE_DOCK_HOST_BODY);
         _tabs.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
         _tabs.tabHost.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
+        _tabs.tabClose = &onTabClose;
 
         _logWidget = new CompilerLogWidget("logwidget");
         _logWidget.readOnly = true;
@@ -285,7 +290,7 @@ class OutputPanel : DockWindow {
         _logWidget.styleId = "EDIT_BOX_NO_FRAME";
 
         //_tabs.tabHost.styleId = STYLE_DOCK_WINDOW_BODY;
-        _tabs.addTab(_logWidget, "Compiler Log"d);
+        _tabs.addTab(_logWidget, "Compiler Log"d, null, true);
         _tabs.selectTab("logwidget");
 
         static if (ENABLE_INTERNAL_TERMINAL) {
diff --git a/src/dlangide/workspace/project.d b/src/dlangide/workspace/project.d
index 9e1f71b..36bdbd3 100644
--- a/src/dlangide/workspace/project.d
+++ b/src/dlangide/workspace/project.d
@@ -483,6 +483,15 @@ class Project : WorkspaceItem {
         return _builderSourcePaths; 
     }
 
+    /// returns first source folder for project or null if not found
+    ProjectFolder firstSourceFolder() {
+        for(int i = 0; i < _items.childCount; i++) {
+            if (_items.child(i).isFolder)
+                return cast(ProjectFolder)_items.child(i);
+        }
+        return null;
+    }
+
     ProjectSourceFile findSourceFile(string projectFileName, string fullFileName) {
         return _items ? _items.findSourceFile(projectFileName, fullFileName) : null;
     }
diff --git a/views/VERSION b/views/VERSION
index a6ee58c..0ab1b3d 100644
--- a/views/VERSION
+++ b/views/VERSION
@@ -1 +1 @@
-v0.7.72
\ No newline at end of file
+v0.7.74
\ No newline at end of file