From 5af53ca271273ae14bd5605cf41187a207e4f3da Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 21 Jan 2015 16:51:38 +0300
Subject: [PATCH] fixes

---
 src/dlangide/ui/commands.d    |  6 ++----
 src/dlangide/ui/dsourceedit.d | 14 ++++++++++++++
 src/dlangide/ui/frame.d       | 23 ++++++++---------------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index 6afc58e..8d4b87c 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -3,10 +3,6 @@ module dlangide.ui.commands;
 import dlangui.core.events;
 import dlangui.widgets.editors;
 
-enum : int {
-    ACTION_HELP_ABOUT = 5500,
-}
-
 enum IDEActions : int {
     None = 0,
     ProjectOpen = 1010000,
@@ -15,6 +11,7 @@ enum IDEActions : int {
     FileSave,
     FileClose,
     FileExit,
+    HelpAbout,
 }
 
 __gshared Action ACTION_FILE_NEW = new Action(IDEActions.FileOpen, "MENU_FILE_NEW"c, "document-new", KeyCode.KEY_N, KeyFlag.Control);
@@ -26,3 +23,4 @@ __gshared Action ACTION_EDIT_PASTE = new Action(EditorActions.Paste, "Paste"d, "
 __gshared Action ACTION_EDIT_CUT = new Action(EditorActions.Cut, "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);
+__gshared Action ACTION_HELP_ABOUT = new Action(IDEActions.HelpAbout, "MENU_HELP_ABOUT"c);
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 8c34361..152f258 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -1,5 +1,19 @@
 module dlangide.ui.dsourceedit;
 
+import dlangui.core.logger;
+import dlangui.widgets.editors;
+import dlangui.widgets.srcedit;
+
+import ddc.lexer.textsource;
+import ddc.lexer.exceptions;
+import ddc.lexer.tokenizer;
+
+import dlangide.workspace.workspace;
+import dlangide.workspace.project;
+
+import std.algorithm;
+
+
 /// DIDE source file editor
 class DSourceEdit : SourceEdit {
 	this(string ID) {
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 919001f..a568a17 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -15,13 +15,10 @@ import dlangui.dialogs.filedlg;
 import dlangide.ui.commands;
 import dlangide.ui.wspanel;
 import dlangide.ui.outputpanel;
+import dlangide.ui.dsourceedit;
 import dlangide.workspace.workspace;
 import dlangide.workspace.project;
 
-import ddc.lexer.textsource;
-import ddc.lexer.exceptions;
-import ddc.lexer.tokenizer;
-
 import std.conv;
 import std.utf;
 import std.algorithm;
@@ -141,14 +138,7 @@ class IDEFrame : AppFrame {
         windowItem.add(new Action(30, "MENU_WINDOW_PREFERENCES"));
         MenuItem helpItem = new MenuItem(new Action(4, "MENU_HELP"c));
         helpItem.add(new Action(40, "MENU_HELP_VIEW_HELP"));
-		MenuItem aboutItem = new MenuItem(new Action(ACTION_HELP_ABOUT, "MENU_HELP_ABOUT"));
-        helpItem.add(aboutItem);
-		aboutItem.onMenuItemClick = delegate(MenuItem item) {
-			Window wnd = Platform.instance.createWindow("About...", window, WindowFlag.Modal);
-			wnd.mainWidget = createAboutWidget();
-			wnd.show();
-			return true;
-		};
+        helpItem.add(ACTION_HELP_ABOUT);
         mainMenuItems.add(fileItem);
         mainMenuItems.add(editItem);
 		//mainMenuItems.add(viewItem);
@@ -165,8 +155,10 @@ class IDEFrame : AppFrame {
         ToolBarHost res = new ToolBarHost();
         ToolBar tb;
         tb = res.getOrAddToolbar("Standard");
-        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE, ACTION_SEPARATOR, 
-                      ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT);
+        tb.addButtons(ACTION_FILE_OPEN, ACTION_FILE_SAVE);
+        tb = res.getOrAddToolbar("Edit");
+        tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR,
+                      ACTION_EDIT_UNDO, ACTION_EDIT_REDO);
         return res;
     }
 
@@ -175,8 +167,9 @@ class IDEFrame : AppFrame {
         if (a) {
             switch (a.id) {
                 case IDEActions.FileExit:
+                    window.close();
                     return true;
-                case ACTION_HELP_ABOUT:
+                case IDEActions.HelpAbout:
                     Window wnd = Platform.instance.createWindow("About...", window, WindowFlag.Modal);
                     wnd.mainWidget = createAboutWidget();
                     wnd.show();