From 33f6c146e0f9f5a3963a65453fd53749294ca197 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 16 Jan 2015 15:09:49 +0300
Subject: [PATCH] toolbars and actions

---
 res/i18n/en.ini                              |   1 +
 res/stdres/mdpi/toolbar_background.9.png     | Bin 0 -> 247 bytes
 res/stdres/mdpi/toolbar_button_hover.9.png   | Bin 0 -> 246 bytes
 res/stdres/mdpi/toolbar_button_pressed.9.png | Bin 0 -> 245 bytes
 res/stdres/mdpi/toolbar_separator.png        | Bin 0 -> 224 bytes
 res/stdres/theme_default.xml                 |   8 +++--
 res/stdres/toolbar_button_background.xml     |  23 +++++++++++++
 src/app.d                                    |   1 -
 src/dlangide/ui/commands.d                   |  23 ++++++-------
 src/dlangide/ui/frame.d                      |  32 ++++++++++---------
 10 files changed, 56 insertions(+), 32 deletions(-)
 create mode 100644 res/stdres/mdpi/toolbar_background.9.png
 create mode 100644 res/stdres/mdpi/toolbar_button_hover.9.png
 create mode 100644 res/stdres/mdpi/toolbar_button_pressed.9.png
 create mode 100644 res/stdres/mdpi/toolbar_separator.png
 create mode 100644 res/stdres/toolbar_button_background.xml

diff --git a/res/i18n/en.ini b/res/i18n/en.ini
index 78c46a7..1e35566 100644
--- a/res/i18n/en.ini
+++ b/res/i18n/en.ini
@@ -1,5 +1,6 @@
 EXIT=Exit
 MENU_FILE=&FILE
+MENU_FILE_NEW=&New
 MENU_FILE_OPEN=&Open
 MENU_FILE_OPEN_RECENT=Open recent
 MENU_FILE_SAVE=&Save
diff --git a/res/stdres/mdpi/toolbar_background.9.png b/res/stdres/mdpi/toolbar_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b65deb3067ec07c7ba7cb281565f9511a70884a
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBk#$0d6@xH}>T%K%o{-7sn8f<H>(MJY;4z5)cqbP+<7?
zcru8qY&8Gl;dXu=`Tc+YpLa+tc=@T6ExK6OO>D-2-Te0@G8kt_Wbn+GaQM&3$L&0i
z7ByAeT*AP}*!X|TcgBSwhCd!BTxkmAcGHzm6Eon;ls~ZAC+m8Kznp!_2Gi?FOLp={
jB#4^$Hg`-rE5=acVsc*L&(AQRdl)=j{an^LB{Ts5H;h&F

literal 0
HcmV?d00001

diff --git a/res/stdres/mdpi/toolbar_button_hover.9.png b/res/stdres/mdpi/toolbar_button_hover.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..97bdd49e58fbaf194475d621edc5e366dd2dfc9f
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>FdgVpHYCD+wxQ5k#L|;v!{z=h{fsTKOY`4gFtgb0|T?j
zpL7L&10w?ig9B&4GKa69Uiw6;?Xr*?8yj2O^7i2W-V$zsM~{d<pKj<O;bv%Lc!9$p
zP+*w_qjCS^`dPawt~>~AcITA~V>1rAePMt6x6A8pq%>Yr;L$&)zj)oj4Xaqfnhic%
g{8PXF`$P?ctgXs%*{iGO0iDC(>FVdQ&MBb@0GQEJ#sB~S

literal 0
HcmV?d00001

diff --git a/res/stdres/mdpi/toolbar_button_pressed.9.png b/res/stdres/mdpi/toolbar_button_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e4bd8b73bd8389d300bbdb181f8bf0cfafe83b8
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>FdgVpHYCDPjX9zz%8Iqlc$Sgh{fsTKOY`4gFtgb0|T?j
zpL7L&10w?ig9B&4GKa69Uiw6;?Xr*?8yj2O^7i2W-Y+5ojvf&Y_cQR2a5FSAyue`)
zD6q_e(YXI{{j6OTR~`g5yYtG0u^9*5zOX<3+vRmPQW~!*@aV6bvtZr94Xa!Z8F0l-
foAkOi#g0LHx5_)u+u!_vu3_+W^>bP0l+XkK0xeSC

literal 0
HcmV?d00001

diff --git a/res/stdres/mdpi/toolbar_separator.png b/res/stdres/mdpi/toolbar_separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfa5a1acb77e7c574040a48fffe36cabcce1be96
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^96&6=!3HFc-`pbrq}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfeMSK;OQ!WVgiV1$xt=bLAsXkC|9p7J%xokeAmH$D
zvjGr%`26`W>%ag1`&TwJHa0#y^fjHwU(Wtdeoo4P51+nPyUnl=W@bFllBdpNQ~76t
zV@${d4q-P@9(C3inL=zSDNiNi_SN~{U^&JwZ)YH5SIN7dspg~{gYj%d=^r0OtAQ3X
Nc)I$ztaD0e0svT`NS^=z

literal 0
HcmV?d00001

diff --git a/res/stdres/theme_default.xml b/res/stdres/theme_default.xml
index 5f31a2a..1ace59f 100644
--- a/res/stdres/theme_default.xml
+++ b/res/stdres/theme_default.xml
@@ -101,6 +101,7 @@
         <state state_pressed="true" backgroundColor="#C0404080"/>
         <state state_hovered="true" backgroundColor="#F0404080"/>
     </style>
+
     <style id="TAB_UP"
         backgroundImageId="tab_up_background"
         layoutWidth="FILL_PARENT"
@@ -125,9 +126,9 @@
         backgroundColor="#F0F0F0"
         />
     <style id="TAB_WIDGET"
-        padding="3,3,3,3"
         backgroundColor="#EEEEEE"
         />
+
     <style id="MAIN_MENU"
         layoutWidth="FILL_PARENT"
         backgroundColor="#EFEFF2"
@@ -275,9 +276,10 @@
         margins="2,2,2,2"
         />
     <style id="TOOLBAR_BUTTON"
-        backgroundImageId="btn_background_transparent"
+        backgroundImageId="toolbar_button_background"
         align="Center"
-        margins="2,2,2,2"
+        margins="1,1,1,1"
+        padding="4,4,4,4"
         />
     <style id="TOOLBAR_SEPARATOR"
         align="Center"
diff --git a/res/stdres/toolbar_button_background.xml b/res/stdres/toolbar_button_background.xml
new file mode 100644
index 0000000..f48d7a4
--- /dev/null
+++ b/res/stdres/toolbar_button_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_button_hover"
+    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="@null" />
+</selector>
diff --git a/src/app.d b/src/app.d
index 6a5dfdf..e4f4f8e 100644
--- a/src/app.d
+++ b/src/app.d
@@ -41,7 +41,6 @@ extern (C) int UIAppMain(string[] args) {
     IDEFrame frame = new IDEFrame(window);
 
     // create some widget to show in window
-    window.mainWidget = frame;
     window.windowIcon = drawableCache.getImage("dlangui-logo1");
 
     frame.loadWorkspace(appendPath(exePath, "../workspaces/sample1/sample1.dlangidews"));
diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index e44b424..a0906cd 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -1,6 +1,7 @@
 module dlangide.ui.commands;
 
 import dlangui.core.events;
+import dlangui.widgets.editors;
 
 enum : int {
     ACTION_HELP_ABOUT = 5500,
@@ -14,18 +15,14 @@ enum IDEActions : int {
     FileSave,
     FileClose,
     FileExit,
-    EditCopy = 1011000,
-    EditPaste,
-    EditCut,
-    EditUndo,
-    EditRedo,
 }
 
-__gshared Action ACTION_FILE_OPEN;
-__gshared Action ACTION_FILE_SAVE;
-__gshared Action ACTION_FILE_EXIT;
-__gshared static this() {
-    ACTION_FILE_OPEN = new Action(IDEActions.FileOpen, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag.Control);
-    ACTION_FILE_SAVE = new Action(IDEActions.FileSave, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control);
-    ACTION_FILE_EXIT = new Action(IDEActions.FileExit, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag.Alt);
-}
+__gshared Action ACTION_FILE_NEW = new Action(IDEActions.FileOpen, "MENU_FILE_NEW"c, "document-new", KeyCode.KEY_N, KeyFlag.Control);
+__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_EDIT_COPY = new Action(EditorActions.Copy, "Copy"d, "edit-copy"c, KeyCode.KEY_C, KeyFlag.Control);
+__gshared Action ACTION_EDIT_PASTE = new Action(EditorActions.Copy, "Paste"d, "edit-paste"c, KeyCode.KEY_V, KeyFlag.Control);
+__gshared Action ACTION_EDIT_CUT = new Action(EditorActions.Copy, "Cut"d, "edit-cut"c, KeyCode.KEY_X, KeyFlag.Control);
+__gshared Action ACTION_EDIT_UNDO = new Action(EditorActions.Undo, "Undo"d, "edit-undo"c, KeyCode.KEY_Z, KeyFlag.Control);
+__gshared Action ACTION_EDIT_REDO = new Action(EditorActions.Redo, "Redo"d, "edit-redo"c, KeyCode.KEY_Z, KeyFlag.Control|KeyFlag.Shift);
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 0351c8d..053e910 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -27,6 +27,7 @@ class IDEFrame : AppFrame {
 
     this(Window window) {
         super();
+        window.mainWidget = this;
     }
 
     override protected void init() {
@@ -46,16 +47,20 @@ class IDEFrame : AppFrame {
         tabs.styleId = STYLE_DOCK_HOST_BODY;
         
 		// create Editors test tab
-		VerticalLayout editors = new VerticalLayout("editors");
-        editors.layoutWidth = FILL_PARENT;
-        editors.layoutHeight = FILL_PARENT;
+		//VerticalLayout editors = new VerticalLayout("editors");
+        //editors.layoutWidth = FILL_PARENT;
+        //editors.layoutHeight = FILL_PARENT;
         EditBox editBox = new EditBox("editbox1", "Some text\nSecond line\nYet another line\n\n\tforeach(s;lines);\n\t\twriteln(s);\n"d);
+        editBox.enabled = true;
         editBox.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
         editBox.minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel
-		editors.addChild(editBox);
+        editBox.fontFamily = FontFamily.MonoSpace;
+        editBox.focusable = true;
+		//editors.addChild(editBox);
 		//editBox.popupMenu = editPopupItem;
-        tabs.addTab(editors, "Sample"d);
-		tabs.selectTab("editors");
+        tabs.addTab(editBox, "Sample"d);
+        //tabs.addTab(editors, "Sample"d);
+		tabs.selectTab("editbox1");
 
 
         _dockHost.bodyWidget = tabs;
@@ -73,15 +78,11 @@ class IDEFrame : AppFrame {
 
         mainMenuItems = new MenuItem();
         MenuItem fileItem = new MenuItem(new Action(1, "MENU_FILE"));
-        fileItem.add(ACTION_FILE_OPEN);
-		fileItem.add(ACTION_FILE_SAVE);
-		fileItem.add(ACTION_FILE_EXIT);
+        fileItem.add(ACTION_FILE_NEW, ACTION_FILE_OPEN, ACTION_FILE_SAVE, ACTION_FILE_EXIT);
+
         MenuItem editItem = new MenuItem(new Action(2, "MENU_EDIT"));
-		editItem.add(new Action(EditorActions.Copy, "MENU_EDIT_COPY"c, "edit-copy", KeyCode.KEY_C, KeyFlag.Control));
-		editItem.add(new Action(EditorActions.Paste, "MENU_EDIT_PASTE"c, "edit-paste", KeyCode.KEY_V, KeyFlag.Control));
-		editItem.add(new Action(EditorActions.Cut, "MENU_EDIT_CUT"c, "edit-cut", KeyCode.KEY_X, KeyFlag.Control));
-		editItem.add(new Action(EditorActions.Undo, "MENU_EDIT_UNDO"c, "edit-undo", KeyCode.KEY_Z, KeyFlag.Control));
-		editItem.add(new Action(EditorActions.Redo, "MENU_EDIT_REDO"c, "edit-redo", KeyCode.KEY_Y, KeyFlag.Control));
+		editItem.add(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_EDIT_UNDO, ACTION_EDIT_REDO);
+
 		editItem.add(new Action(20, "MENU_EDIT_PREFERENCES"));
 		MenuItem windowItem = new MenuItem(new Action(3, "MENU_WINDOW"c));
         windowItem.add(new Action(30, "MENU_WINDOW_PREFERENCES"));
@@ -111,7 +112,8 @@ class IDEFrame : AppFrame {
         ToolBarHost res = new ToolBarHost();
         ToolBar tb;
         tb = res.getOrAddToolbar("Standard");
-        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE, ACTION_SEPARATOR, ACTION_FILE_EXIT);
+        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE, ACTION_SEPARATOR, 
+                      ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT);
         return res;
     }