From fd4b00bfb4a53f6cc05dd3c12a1d8f6b01fc17c9 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 16 Jan 2015 13:58:38 +0300
Subject: [PATCH] toolbars support

---
 dlanguilib.visualdproj            |   1 +
 res/mdpi/toolbar_background.9.png | Bin 0 -> 251 bytes
 res/mdpi/toolbar_separator.png    | Bin 0 -> 224 bytes
 res/theme_default.xml             |  22 ++++++++++++++++++++++
 src/dlangui/core/events.d         |   9 +++++++++
 src/dlangui/widgets/appframe.d    |  25 ++++++++++++++++++++++---
 src/dlangui/widgets/docks.d       |  23 +++++++++++++++++++++++
 src/dlangui/widgets/menu.d        |  21 ++++++++++++++++-----
 src/dlangui/widgets/styles.d      |  10 ++++++++++
 9 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 res/mdpi/toolbar_background.9.png
 create mode 100644 res/mdpi/toolbar_separator.png

diff --git a/dlanguilib.visualdproj b/dlanguilib.visualdproj
index 3de7f3f8..ba1bdec5 100644
--- a/dlanguilib.visualdproj
+++ b/dlanguilib.visualdproj
@@ -392,6 +392,7 @@
      <File path="src\dlangui\widgets\statusline.d" />
      <File path="src\dlangui\widgets\styles.d" />
      <File path="src\dlangui\widgets\tabs.d" />
+     <File path="src\dlangui\widgets\toolbars.d" />
      <File path="src\dlangui\widgets\tree.d" />
      <File path="src\dlangui\widgets\widget.d" />
     </Folder>
diff --git a/res/mdpi/toolbar_background.9.png b/res/mdpi/toolbar_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9fe6f76818ed83f58e7e5e0e58d3f746a62891f
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBk#$0WKwp-#v;~fkGXgE{-7{$CLkjc*x9bBp@J=puq6&
z@njHJc^AXsdZ~u9*8P9~gJikSEaJXC-|zyHf#C%S1I6~AlaKRD9&u&;xXF`|iHYfd
z=6hzRl}R6tA6&t@Sga??z(*%R=8|0k*kpVA|MgkdGyLW3Q#P1hPg=5*KSBZsw!N|P
gyREP&bu%l&uVc+`H@)?k1auRFr>mdKI;Vst0JKtAx&QzG

literal 0
HcmV?d00001

diff --git a/res/mdpi/toolbar_separator.png b/res/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/theme_default.xml b/res/theme_default.xml
index ae346f2e..5f31a2a6 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -261,6 +261,28 @@
         layoutHeight="FILL_PARENT"
         padding="1,1,1,1"
         />
+
+    <style id="TOOLBAR_HOST"
+        backgroundColor="#d6dbe9"
+        layoutWidth="FILL_PARENT"
+        layoutHeight="WRAP_CONTENT"
+        padding="1,1,1,1"
+        />
+    <style id="TOOLBAR"
+        backgroundImageId="toolbar_background"
+        layoutWidth="WRAP_CONTENT"
+        layoutHeight="WRAP_CONTENT"
+        margins="2,2,2,2"
+        />
+    <style id="TOOLBAR_BUTTON"
+        backgroundImageId="btn_background_transparent"
+        align="Center"
+        margins="2,2,2,2"
+        />
+    <style id="TOOLBAR_SEPARATOR"
+        align="Center"
+        />
+
     <style id="TREE_ITEM"
         padding="2,2,2,2"
         margins="0,0,0,0"
diff --git a/src/dlangui/core/events.d b/src/dlangui/core/events.d
index 9a5aee5e..98718fe9 100644
--- a/src/dlangui/core/events.d
+++ b/src/dlangui/core/events.d
@@ -198,12 +198,21 @@ class Action {
         _iconId = id;
         return this;
     }
+    /// returns true if it's dummy action to specify separator
+    @property bool isSeparator() const {
+        return _id == SEPARATOR_ACTION_ID;
+    }
 
     override string toString() const {
         return "Action(" ~ to!string(_id) ~ ")";
     }
 }
 
+/// use this ID for menu and toolbar separators
+const int SEPARATOR_ACTION_ID = -1;
+__gshared Action ACTION_SEPARATOR = new Action(SEPARATOR_ACTION_ID);
+
+
 /// Map of Accelerator to Action
 struct ActionMap {
 	protected Action[Accelerator] _map;
diff --git a/src/dlangui/widgets/appframe.d b/src/dlangui/widgets/appframe.d
index 6025bd7c..2c15e1a2 100644
--- a/src/dlangui/widgets/appframe.d
+++ b/src/dlangui/widgets/appframe.d
@@ -22,15 +22,19 @@ import dlangui.widgets.widget;
 import dlangui.widgets.menu;
 import dlangui.widgets.layouts;
 import dlangui.widgets.statusline;
+import dlangui.widgets.toolbars;
 
 class AppFrame : VerticalLayout, MenuItemClickHandler {
     protected MainMenu _mainMenu;
     protected StatusLine _statusLine;
+    protected ToolBarHost _toolbarHost;
     protected Widget _body;
     /// main menu widget
     @property MainMenu mainMenu() { return _mainMenu; }
     /// status line widget
     @property StatusLine statusLine() { return _statusLine; }
+    /// tool bar host
+    @property ToolBarHost toolbars() { return _toolbarHost; }
     /// body widget
     @property Widget frameBody() { return _body; }
 
@@ -43,12 +47,19 @@ class AppFrame : VerticalLayout, MenuItemClickHandler {
 
     protected void init() {
         _mainMenu = createMainMenu();
-		_mainMenu.onMenuItemClickListener = &onMenuItemClick;
+        _toolbarHost = createToolbars();
         _statusLine = createStatusLine();
         _body = createBody();
-        addChild(_mainMenu);
+        _body.focusGroup = true;
+        if (_mainMenu) {
+            _mainMenu.onMenuItemClickListener = &onMenuItemClick;
+            addChild(_mainMenu);
+        }
+        if (_toolbarHost)
+            addChild(_toolbarHost);
         addChild(_body);
-        addChild(_statusLine);
+        if (_statusLine)
+            addChild(_statusLine);
     }
 
     /// override to handle main menu commands
@@ -61,6 +72,14 @@ class AppFrame : VerticalLayout, MenuItemClickHandler {
         return new MainMenu(new MenuItem());
     }
 
+
+    /// create app toolbars
+    protected ToolBarHost createToolbars() {
+        ToolBarHost res = new ToolBarHost();
+        return res;
+    }
+
+
     /// create app status line widget
     protected StatusLine createStatusLine() {
         return new StatusLine();
diff --git a/src/dlangui/widgets/docks.d b/src/dlangui/widgets/docks.d
index bf480450..cf1b8055 100644
--- a/src/dlangui/widgets/docks.d
+++ b/src/dlangui/widgets/docks.d
@@ -1,8 +1,30 @@
+// Written in the D programming language.
+
+/**
+
+This module implements dockable windows UI support.
+
+DockHost is main layout for docking support - contains body widget and optional docked windows.
+
+DockWindow is window to use with DockHost - can be docked on top, left, right or bottom side of DockHost.
+
+Synopsis:
+
+----
+import dlangui.widgets.docks;
+----
+
+
+Copyright: Vadim Lopatin, 2015
+License:   Boost License 1.0
+Authors:   Vadim Lopatin, coolreader.org@gmail.com
+*/
 module dlangui.widgets.docks;
 
 import dlangui.widgets.layouts;
 import dlangui.widgets.controls;
 
+/// Layout for docking support - contains body widget and optional docked windows
 class DockHost : WidgetGroupDefaultDrawing {
 
     protected int _topSpace;
@@ -127,6 +149,7 @@ enum DockAlignment {
     Bottom
 }
 
+/// docked window
 class DockWindow : VerticalLayout {
 
     protected Widget _bodyWidget;
diff --git a/src/dlangui/widgets/menu.d b/src/dlangui/widgets/menu.d
index ccca9662..474d32ff 100644
--- a/src/dlangui/widgets/menu.d
+++ b/src/dlangui/widgets/menu.d
@@ -67,7 +67,7 @@ class MenuItem {
 	/// handle menu item click action (parameter is Action)
 	Signal!MenuItemActionHandler onMenuItemAction;
 	/// item action id, 0 if no action
-    @property int id() { return _action is null ? 0 : _action.id; }
+    @property int id() const { return _action is null ? 0 : _action.id; }
     /// returns count of submenu items
     @property int subitemCount() {
         return cast(int)_subitems.length;
@@ -84,7 +84,9 @@ class MenuItem {
         return _subitems[index];
     }
 
-	@property MenuItemType type() const { 
+	@property MenuItemType type() const {
+        if (id == SEPARATOR_ACTION_ID)
+            return MenuItemType.Separator;
 		if (_subitems.length > 0) // if there are children, force type to Submenu
 			return MenuItemType.Submenu;
 		return _type; 
@@ -154,15 +156,24 @@ class MenuItem {
 		return -1;
 	}
 
+    /// Add separator item
+    MenuItem addSeparator() {
+        return add(new Action(SEPARATOR_ACTION_ID));
+    }
+
 	/// adds submenu item
     MenuItem add(MenuItem subitem) {
         _subitems ~= subitem;
 		subitem._parent = this;
         return this;
     }
-    /// adds submenu item from action
-    MenuItem add(Action subitemAction) {
-        return add(new MenuItem(subitemAction));
+    /// adds submenu item(s) from one or more actions (will return item for last action)
+    MenuItem add(Action[] subitemActions...) {
+        MenuItem res = null;
+        foreach(subitemAction; subitemActions) {
+            res = add(new MenuItem(subitemAction));
+        }
+        return res;
     }
 	/// returns text description for first accelerator of action; null if no accelerators
 	@property dstring acceleratorText() {
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 4e8e4dee..b08a54df 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -132,6 +132,16 @@ immutable string STYLE_DOCK_WINDOW_CAPTION_LABEL = "DOCK_WINDOW_CAPTION_LABEL";
 /// standard style id for dock window body
 immutable string STYLE_DOCK_WINDOW_BODY = "DOCK_WINDOW_BODY";
 
+/// standard style id for toolbars layout
+immutable string STYLE_TOOLBAR_HOST = "TOOLBAR_HOST";
+/// standard style id for toolbars
+immutable string STYLE_TOOLBAR = "TOOLBAR";
+/// standard style id for toolbar button
+immutable string STYLE_TOOLBAR_BUTTON = "TOOLBAR_BUTTON";
+/// standard style id for toolbar separator
+immutable string STYLE_TOOLBAR_SEPARATOR = "TOOLBAR_SEPARATOR";
+
+
 // Layout size constants
 /// layout option, to occupy all available place
 immutable int FILL_PARENT = int.max - 1;