From 11a080915870464ab16d5b65695c50c15d77f9a7 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 5 Dec 2014 19:49:32 +0300
Subject: [PATCH] refactoring

---
 frame.d   | 45 +++++++++++++++++++++++++++++++++++++++++----
 src/app.d | 12 +++++++-----
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/frame.d b/frame.d
index 2b56535..6b0c8ad 100644
--- a/frame.d
+++ b/frame.d
@@ -5,6 +5,8 @@ import dlangui.widgets.tabs;
 import dlangui.widgets.layouts;
 import dlangui.widgets.editors;
 import dlangui.widgets.controls;
+import dlangui.dialogs.dialog;
+import dlangui.dialogs.filedlg;
 
 import std.conv;
 
@@ -13,10 +15,11 @@ enum : int {
     ACTION_FILE_SAVE,
     ACTION_FILE_CLOSE,
     ACTION_FILE_EXIT,
+    ACTION_HELP_ABOUT,
 }
 
 
-class IDEFrame : VerticalLayout {
+class IDEFrame : VerticalLayout, MenuItemClickHandler {
 
     MainMenu mainMenu;
     MenuItem mainMenuItems;
@@ -35,6 +38,7 @@ class IDEFrame : VerticalLayout {
     }
 
     void createTabs() {
+        // editor tabs
         TabWidget tabs = new TabWidget("TABS");
         tabs.layoutWidth = FILL_PARENT;
         tabs.layoutHeight = FILL_PARENT;
@@ -49,7 +53,7 @@ class IDEFrame : VerticalLayout {
         editBox.minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel
 		editors.addChild(editBox);
 		//editBox.popupMenu = editPopupItem;
-        tabs.addTab(editors, "TAB_EDITORS"c);
+        tabs.addTab(editors, "Sample"d);
 
         addChild(tabs);
 
@@ -74,7 +78,7 @@ class IDEFrame : VerticalLayout {
         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(41, "MENU_HELP_ABOUT"));
+		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);
@@ -89,10 +93,43 @@ class IDEFrame : VerticalLayout {
         mainMenuItems.add(helpItem);
         mainMenu = new MainMenu(mainMenuItems);
         addChild(mainMenu);
+
+		mainMenu.onMenuItemClickListener = this;
+
+    }
+	
+    override bool onMenuItemClick(MenuItem item) {
+        Log.d("mainMenu.onMenuItemListener", item.label);
+        const Action a = item.action;
+        if (a) {
+            switch (a.id) {
+                case ACTION_FILE_EXIT:
+                    return true;
+                case ACTION_HELP_ABOUT:
+                    Window wnd = Platform.instance.createWindow("About...", window, WindowFlag.Modal);
+                    wnd.mainWidget = createAboutWidget();
+                    wnd.show();
+                    return true;
+                case ACTION_FILE_OPEN:
+                    UIString caption;
+                    caption = "Open Text File"d;
+                    FileDialog dlg = new FileDialog(caption, window);
+                    dlg.onDialogResult = delegate(Dialog dlg, Action result) {
+                        //
+                    };
+                    dlg.show();
+                    return true;
+                default:
+                    if (window.focusedWidget)
+                        return window.focusedWidget.handleAction(a);
+                    else
+                        return handleAction(a);
+            }
+        }
+        return false;
     }
 }
 
-
 Widget createAboutWidget() 
 {
 	LinearLayout res = new VerticalLayout();
diff --git a/src/app.d b/src/app.d
index 29eb8ab..8b38ff2 100644
--- a/src/app.d
+++ b/src/app.d
@@ -12,16 +12,18 @@ mixin APP_ENTRY_POINT;
 extern (C) int UIAppMain(string[] args) {
     // resource directory search paths
     string[] resourceDirs = [
-        //appendPath(exePath, "../../../res/"),   // for Visual D and DUB builds
-        //appendPath(exePath, "../../../res/mdpi/"),   // for Visual D and DUB builds
-        //appendPath(exePath, "../../../../res/"),// for Mono-D builds
-        //appendPath(exePath, "../../../../res/mdpi/"),// for Mono-D builds
 		appendPath(exePath, "res/"), // when res dir is located at the same directory as executable
 		appendPath(exePath, "../res/"), // when res dir is located at project directory
 		appendPath(exePath, "../../res/"), // when res dir is located at the same directory as executable
 		appendPath(exePath, "res/mdpi/"), // when res dir is located at the same directory as executable
 		appendPath(exePath, "../res/mdpi/"), // when res dir is located at project directory
-		appendPath(exePath, "../../res/mdpi/") // when res dir is located at the same directory as executable
+		appendPath(exePath, "../../res/mdpi/"), // when res dir is located at the same directory as executable
+        appendPath(exePath, "res/stdres/"), // when res dir is located at the same directory as executable
+		appendPath(exePath, "../res/stdres/"), // when res dir is located at project directory
+		appendPath(exePath, "../../res/stdres/"), // when res dir is located at the same directory as executable
+		appendPath(exePath, "res/stdres/mdpi/"), // when res dir is located at the same directory as executable
+		appendPath(exePath, "../res/stdres/mdpi/"), // when res dir is located at project directory
+		appendPath(exePath, "../../res/stdres/mdpi/") // when res dir is located at the same directory as executable
 	];
 
     // setup resource directories - will use only existing directories