From bbdafb4c8e0f38cf1e58ba0eed035a3450b0e7fc Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Thu, 22 Jan 2015 10:07:54 +0300
Subject: [PATCH] fix project

---
 dlangide.visualdproj                          |   2 +-
 dub.json                                      |  16 ------------
 res/mdpi/debug-run.png                        | Bin 0 -> 383 bytes
 .../mdpi/toolbar_control_disabled.9.png       | Bin 0 -> 249 bytes
 res/stdres/mdpi/toolbar_control_normal.9.png  | Bin 0 -> 247 bytes
 res/stdres/theme_default.xml                  |   6 +++++
 res/stdres/toolbar_control_background.xml     |  23 ++++++++++++++++++
 src/{app.d => dlangide.d}                     |   0
 src/dlangide/ui/commands.d                    |   5 +++-
 src/dlangide/ui/dsourceedit.d                 |  20 +++++++++++++++
 src/dlangide/ui/frame.d                       |   8 +++++-
 .../sample1/sampleproject1/source/main.d      | Bin 329 -> 358 bytes
 12 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 res/mdpi/debug-run.png
 create mode 100644 res/stdres/mdpi/toolbar_control_disabled.9.png
 create mode 100644 res/stdres/mdpi/toolbar_control_normal.9.png
 create mode 100644 res/stdres/toolbar_control_background.xml
 rename src/{app.d => dlangide.d} (100%)

diff --git a/dlangide.visualdproj b/dlangide.visualdproj
index 1c16f2c..2f30419 100644
--- a/dlangide.visualdproj
+++ b/dlangide.visualdproj
@@ -211,6 +211,6 @@
     <File path="src\dlangide\workspace\workspace.d" />
    </Folder>
   </Folder>
-  <File path="src\app.d" />
+  <File path="src\dlangide.d" />
  </Folder>
 </DProject>
diff --git a/dub.json b/dub.json
index 54cf70e..8ada80d 100644
--- a/dub.json
+++ b/dub.json
@@ -9,26 +9,10 @@
     "targetPath": "bin",
     "targetType": "executable",
 
-    "sourcePaths": ["src"],
-
-    "sourceFiles": [
-         "src/app.d"
-    ],
-
-    "copyFiles-windows": [
-        "lib/FreeImage.dll"
-    ],
-
     "copyFiles": [
         "res"
     ],
 
-    "versions-posix": [
-        "USE_SDL", "USE_OPENGL"
-    ],
-
-    "mainSourceFile": "src/app.d",
-
     "dependencies": {
         "dlangui:dlanguilib": "~master"
     }
diff --git a/res/mdpi/debug-run.png b/res/mdpi/debug-run.png
new file mode 100644
index 0000000000000000000000000000000000000000..eee3e90552fdba432ad7314fae36137beb627473
GIT binary patch
literal 383
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4w)f((Lt7nXJcMK}vQ
zB8wRqxP?KOkzv*x37{Z*iKnkC`+Y`HK26z(qapPS42(RUE{-7<r;}3>5)v%x-)b_i
zJP_bLs}Te^XR8P+D_>+wl(?`(H~IMO`tQR3jQ^;gZ(x5fx9j>^y?OQT&Yla~!~@is
z@Z;BO>BCoKg_Wnrz1`V-+WY_i|HpF~L^R&n?hjv;8GX#WCN4?ofzvsl)}m``_0HLU
zPkUZf#M4lDGT~KUC!_cJZ*LsF3kho${{Q;jT(rbcEXky3bD^Qj4YzHP-fbbq1_lOy
ze*d4J!F*4f<D|ZS(J4#avkUh!L_WGaeSHh>h6@|#$R!6voIQM^JxQCHnb|qk*EElL
zf#12!(|Bg~yi1XoVNs}5#w^nEBwWSvsm_FF7w&ob{4hv5-RslS6OpTGWiE87hliof
XB6*U><w|W}P%(JA`njxgN@xNA47Zgk

literal 0
HcmV?d00001

diff --git a/res/stdres/mdpi/toolbar_control_disabled.9.png b/res/stdres/mdpi/toolbar_control_disabled.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ecea1bb46c118a2a363532f24cd5ba7d86b2b5e
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd0!20;eFy$ee_fg+p*
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHj@WD4#sL&Tg9mpirBqi(`nz>Eu5j9x{VKb3+3I
zv&f%x1%3k~0|SEtXTUOtr|n&S!jwn5KqUI?i4zA79N3WZcHRHBUsWN7U;Z5R=9&0z
zO^*+c36qaVi>BX!Gmn4FU#2H#T5;t;U~~J_gFRQwzPz9QcZ;@J<N{NU!#}&HugEr7
mqczc>r)m1qCspz@`5A=#)$SB8WpxI+h{4m<&t;ucLK6T^a#r&I

literal 0
HcmV?d00001

diff --git a/res/stdres/mdpi/toolbar_control_normal.9.png b/res/stdres/mdpi/toolbar_control_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e94da9c4082a60b1d962bc228c17235fe9b4070
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd0!20;eFy$ee_fg+p*
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHj@WD4!yi@cHNsK%o{-7sn8b)5(86JY)ue=7t6a
zW|2SX3j78}1_lNP&VXeOUum6v!jwnb!@%myi331z!K(1$fBX7>0j%5oV!r%;Km9L{
z5043xk4THA-+?oaf6QN|Cudr5<w0O``_zLySIoWuRrHt?8~SEV=t_xn6N?B{N|a#L
g_dfa6&PblYsw?l&uKz)KK=&|sy85}Sb4q9e04wcO9RL6T

literal 0
HcmV?d00001

diff --git a/res/stdres/theme_default.xml b/res/stdres/theme_default.xml
index add1b54..0b1b8bb 100644
--- a/res/stdres/theme_default.xml
+++ b/res/stdres/theme_default.xml
@@ -297,6 +297,12 @@
         margins="1,1,1,1"
         padding="4,4,4,4"
         />
+    <style id="TOOLBAR_CONTROL"
+        backgroundImageId="toolbar_control_background"
+        align="Center"
+        margins="1,1,1,1"
+        padding="4,4,4,4"
+        />
     <style id="TOOLBAR_SEPARATOR"
         align="Center"
         />
diff --git a/res/stdres/toolbar_control_background.xml b/res/stdres/toolbar_control_background.xml
new file mode 100644
index 0000000..4b0df5f
--- /dev/null
+++ b/res/stdres/toolbar_control_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item
+    android:drawable="toolbar_control_disabled"
+    android:state_enabled="false"
+    android:state_focused="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_hovered="true"
+    android:state_focused="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_focused="true" 
+  />
+  <item
+    android:drawable="toolbar_button_pressed"
+    android:state_pressed="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_hovered="true" />
+  <item
+    android:drawable="toolbar_control_normal" />
+</selector>
diff --git a/src/app.d b/src/dlangide.d
similarity index 100%
rename from src/app.d
rename to src/dlangide.d
diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index 8d4b87c..a5778fc 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -1,6 +1,6 @@
 module dlangide.ui.commands;
 
-import dlangui.core.events;
+public import dlangui.core.events;
 import dlangui.widgets.editors;
 
 enum IDEActions : int {
@@ -11,6 +11,8 @@ enum IDEActions : int {
     FileSave,
     FileClose,
     FileExit,
+    DebugStart,
+    DebugStartNoDebug,
     HelpAbout,
 }
 
@@ -18,6 +20,7 @@ __gshared Action ACTION_FILE_NEW = new Action(IDEActions.FileOpen, "MENU_FILE_NE
 __gshared Action ACTION_FILE_OPEN = new Action(IDEActions.FileOpen, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag.Control);
 __gshared Action ACTION_FILE_SAVE = new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control);
 __gshared Action ACTION_FILE_EXIT = new Action(IDEActions.FileExit, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag.Alt);
+__gshared Action ACTION_DEBUG_START = new Action(IDEActions.DebugStart, "Start Debugging"d, "debug-run"c, KeyCode.F5, 0);
 __gshared Action ACTION_EDIT_COPY = new Action(EditorActions.Copy, "Copy"d, "edit-copy"c, KeyCode.KEY_C, KeyFlag.Control);
 __gshared Action ACTION_EDIT_PASTE = new Action(EditorActions.Paste, "Paste"d, "edit-paste"c, KeyCode.KEY_V, KeyFlag.Control);
 __gshared Action ACTION_EDIT_CUT = new Action(EditorActions.Cut, "Cut"d, "edit-cut"c, KeyCode.KEY_X, KeyFlag.Control);
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 152f258..29d1215 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -10,6 +10,7 @@ import ddc.lexer.tokenizer;
 
 import dlangide.workspace.workspace;
 import dlangide.workspace.project;
+import dlangide.ui.commands;
 
 import std.algorithm;
 
@@ -59,6 +60,25 @@ class DSourceEdit : SourceEdit {
         setHighlighter();
         return true;
     }
+
+    /// save to the same file
+    bool save() {
+        return _content.save();
+    }
+
+    /// override to handle specific actions
+	override bool handleAction(const Action a) {
+        if (a) {
+            switch (a.id) {
+                case IDEActions.FileSave:
+                    save();
+                    return true;
+                default:
+                    break;
+            }
+        }
+        return super.handleAction(a);
+    }
 }
 
 
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index a568a17..202cc57 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -9,6 +9,7 @@ import dlangui.widgets.controls;
 import dlangui.widgets.appframe;
 import dlangui.widgets.docks;
 import dlangui.widgets.toolbars;
+import dlangui.widgets.combobox;
 import dlangui.dialogs.dialog;
 import dlangui.dialogs.filedlg;
 
@@ -155,7 +156,12 @@ class IDEFrame : AppFrame {
         ToolBarHost res = new ToolBarHost();
         ToolBar tb;
         tb = res.getOrAddToolbar("Standard");
-        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE);
+        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE, ACTION_SEPARATOR);
+
+        tb.addButtons(ACTION_DEBUG_START);
+        ToolBarComboBox cbBuildConfiguration = new ToolBarComboBox("buildConfig", ["Debug"d, "Release"d, "Unittest"d]);
+        tb.addControl(cbBuildConfiguration);
+
         tb = res.getOrAddToolbar("Edit");
         tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR,
                       ACTION_EDIT_UNDO, ACTION_EDIT_REDO);
diff --git a/workspaces/sample1/sampleproject1/source/main.d b/workspaces/sample1/sampleproject1/source/main.d
index d5df88bc7b594691fb42b967c5cadb9c5d1f364f..8f037da5ebf66d27105a5e529720f191582dbe76 100644
GIT binary patch
delta 164
zcmX@f^o&U&iIIUpSy8{VxJW-KGfzJ?uS}sRB{zk4qOgf8FIQ%6L4Hw*LUBoo9uQ~d
zTk~@1>nCR<=B1~m@N$*qXQn9RCT8YoX!3GZ^KvNwL1|8YUb;d~W?pKsf~|sqHSfe)
uDMsFj)0L$l@=#?UrP|tHWk4ktl{g@>wY(F5sxtCUmSfal<>jj7<pKaJ7b}AR

delta 134
zcmaFHbdpI}Sy8{VxJW-KGfzJ?uS}sRB{yZFgoznfW^O@#QHervNs1m2XXaaTah2s~
zrYPhlX69*Va#eFF06}R^eqOplPG(+ev4X9Ff%U|RQWMuGi-YALDnP2VwZST^C%#l-
U154FT7G_kPY{{s>%vH+;01&n&i2wiq