diff --git a/README.md b/README.md index cb88617..745d3f6 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,5 @@ Trying to write D language IDE using dlangUI library. Use DUB to build and run it. To develop in VisualD together with DlangUI, put this project on the same level as dlangui repository, and dependencies. + +To run, it needs FreeImage.dll and directory /res in the same directory as executable. diff --git a/commands.d b/commands.d new file mode 100644 index 0000000..804eabb --- /dev/null +++ b/commands.d @@ -0,0 +1,14 @@ +module dlangide.ui.commands; + +enum IDEActions : int { + None = 0, + FileOpen = 10000, + FileClose, + FileExit, + EditCopy = 11000, + EditPaste, + EditCut, + EditUndo, + EditRedo, +} + diff --git a/dlangide.visualdproj b/dlangide.visualdproj index 1f2817c..68c8149 100644 --- a/dlangide.visualdproj +++ b/dlangide.visualdproj @@ -189,6 +189,12 @@ *.obj;*.cmd;*.build;*.json;*.dep + + + + + + diff --git a/frame.d b/frame.d new file mode 100644 index 0000000..2b56535 --- /dev/null +++ b/frame.d @@ -0,0 +1,113 @@ +module dlangide.ui.frame; + +import dlangui.widgets.menu; +import dlangui.widgets.tabs; +import dlangui.widgets.layouts; +import dlangui.widgets.editors; +import dlangui.widgets.controls; + +import std.conv; + +enum : int { + ACTION_FILE_OPEN = 5500, + ACTION_FILE_SAVE, + ACTION_FILE_CLOSE, + ACTION_FILE_EXIT, +} + + +class IDEFrame : VerticalLayout { + + MainMenu mainMenu; + MenuItem mainMenuItems; + + this(Window window) { + super("IDEFrame"); + + + createMenu(); + createTabs(); + + layoutWidth = FILL_PARENT; + layoutHeight = FILL_PARENT; + + //window.mainWidget = this; + } + + void createTabs() { + TabWidget tabs = new TabWidget("TABS"); + tabs.layoutWidth = FILL_PARENT; + tabs.layoutHeight = FILL_PARENT; + + + // create Editors test tab + 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.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); + editBox.minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel + editors.addChild(editBox); + //editBox.popupMenu = editPopupItem; + tabs.addTab(editors, "TAB_EDITORS"c); + + addChild(tabs); + + tabs.selectTab("editors"); + + } + + void createMenu() { + mainMenuItems = new MenuItem(); + MenuItem fileItem = new MenuItem(new Action(1, "MENU_FILE")); + fileItem.add(new Action(ACTION_FILE_OPEN, "MENU_FILE_OPEN"c, "document-open", KeyCode.KEY_O, KeyFlag.Control)); + fileItem.add(new Action(ACTION_FILE_SAVE, "MENU_FILE_SAVE"c, "document-save", KeyCode.KEY_S, KeyFlag.Control)); + fileItem.add(new Action(ACTION_FILE_EXIT, "MENU_FILE_EXIT"c, "document-close"c, KeyCode.KEY_X, KeyFlag.Alt)); + 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(new Action(20, "MENU_EDIT_PREFERENCES")); + MenuItem windowItem = new MenuItem(new Action(3, "MENU_WINDOW"c)); + 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")); + helpItem.add(aboutItem); + aboutItem.onMenuItemClick = delegate(MenuItem item) { + Window wnd = Platform.instance.createWindow("About...", window, WindowFlag.Modal); + wnd.mainWidget = createAboutWidget(); + wnd.show(); + return true; + }; + mainMenuItems.add(fileItem); + mainMenuItems.add(editItem); + //mainMenuItems.add(viewItem); + mainMenuItems.add(windowItem); + mainMenuItems.add(helpItem); + mainMenu = new MainMenu(mainMenuItems); + addChild(mainMenu); + } +} + + +Widget createAboutWidget() +{ + LinearLayout res = new VerticalLayout(); + res.padding(Rect(10,10,10,10)); + res.addChild(new TextWidget(null, "DLangIDE"d)); + res.addChild(new TextWidget(null, "(C) Vadim Lopatin, 2014"d)); + res.addChild(new TextWidget(null, "http://github.com/buggins/dlangide"d)); + res.addChild(new TextWidget(null, "So far, it's just a test for DLangUI library."d)); + res.addChild(new TextWidget(null, "Later I hope to make working IDE :)"d)); + Button closeButton = new Button("close", "Close"d); + closeButton.onClickListener = delegate(Widget src) { + Log.i("Closing window"); + res.window.close(); + return true; + }; + res.addChild(closeButton); + return res; +} diff --git a/res/hdpi/document-close.png b/res/hdpi/document-close.png new file mode 100644 index 0000000..0bcfe98 Binary files /dev/null and b/res/hdpi/document-close.png differ diff --git a/res/hdpi/document-open-recent.png b/res/hdpi/document-open-recent.png new file mode 100644 index 0000000..6a10e6e Binary files /dev/null and b/res/hdpi/document-open-recent.png differ diff --git a/res/hdpi/document-open.png b/res/hdpi/document-open.png new file mode 100644 index 0000000..8ba5441 Binary files /dev/null and b/res/hdpi/document-open.png differ diff --git a/res/hdpi/document-save-as.png b/res/hdpi/document-save-as.png new file mode 100644 index 0000000..9695a56 Binary files /dev/null and b/res/hdpi/document-save-as.png differ diff --git a/res/hdpi/document-save.png b/res/hdpi/document-save.png new file mode 100644 index 0000000..7fa489c Binary files /dev/null and b/res/hdpi/document-save.png differ diff --git a/res/hdpi/edit-clear.png b/res/hdpi/edit-clear.png new file mode 100644 index 0000000..631ed44 Binary files /dev/null and b/res/hdpi/edit-clear.png differ diff --git a/res/hdpi/edit-copy.png b/res/hdpi/edit-copy.png new file mode 100644 index 0000000..477e83a Binary files /dev/null and b/res/hdpi/edit-copy.png differ diff --git a/res/hdpi/edit-cut.png b/res/hdpi/edit-cut.png new file mode 100644 index 0000000..0732328 Binary files /dev/null and b/res/hdpi/edit-cut.png differ diff --git a/res/hdpi/edit-delete.png b/res/hdpi/edit-delete.png new file mode 100644 index 0000000..cc6d2af Binary files /dev/null and b/res/hdpi/edit-delete.png differ diff --git a/res/hdpi/edit-paste.png b/res/hdpi/edit-paste.png new file mode 100644 index 0000000..6788b02 Binary files /dev/null and b/res/hdpi/edit-paste.png differ diff --git a/res/hdpi/edit-redo.png b/res/hdpi/edit-redo.png new file mode 100644 index 0000000..d759f13 Binary files /dev/null and b/res/hdpi/edit-redo.png differ diff --git a/res/hdpi/edit-undo.png b/res/hdpi/edit-undo.png new file mode 100644 index 0000000..c893a1a Binary files /dev/null and b/res/hdpi/edit-undo.png differ diff --git a/res/i18n/en.ini b/res/i18n/en.ini new file mode 100644 index 0000000..f041532 --- /dev/null +++ b/res/i18n/en.ini @@ -0,0 +1,32 @@ +EXIT=Exit +MENU_FILE=&File +MENU_FILE_OPEN=&Open +MENU_FILE_OPEN_RECENT=Open recent +MENU_FILE_SAVE=&Save +MENU_FILE_EXIT=E&xit +MENU_EDIT=&Edit +MENU_EDIT_COPY=&Copy +MENU_EDIT_PASTE=&Paste +MENU_EDIT_CUT=Cu&t +MENU_EDIT_UNDO=&Undo +MENU_EDIT_REDO=&Redo +MENU_EDIT_PREFERENCES=&Preferences +MENU_VIEW=&View +MENU_VIEW_LANGUAGE=Interface &Language +MENU_VIEW_LANGUAGE_EN=English +MENU_VIEW_LANGUAGE_RU=Русский +MENU_VIEW_THEME=&Theme +MENU_VIEW_THEME_DEFAULT=&Default +MENU_VIEW_THEME_CUSTOM1=&Custom 1 +MENU_WINDOW=&Window +MENU_WINDOW_PREFERENCES=&Preferences +MENU_HELP=&Help +MENU_HELP_VIEW_HELP=&View help +MENU_HELP_ABOUT=&About + +TAB_LONG_LIST=Long list +TAB_BUTTONS=Buttons +TAB_ANIMATION=Animation +TAB_TABLE_LAYOUT=Table layout +TAB_EDITORS=Editors + diff --git a/res/i18n/ru.ini b/res/i18n/ru.ini new file mode 100644 index 0000000..82f24a2 --- /dev/null +++ b/res/i18n/ru.ini @@ -0,0 +1,33 @@ +EXIT=Выход +MENU_FILE=&Файл +MENU_FILE_OPEN=&Открыть +MENU_FILE_OPEN_RECENT=Открыть из последних +MENU_FILE_SAVE=&Сохранить +MENU_FILE_EXIT=Вы&ход +MENU_EDIT=&Правка +MENU_EDIT_COPY=&Копировать +MENU_EDIT_PASTE=&Вставить +MENU_EDIT_CUT=Вырезать +MENU_EDIT_UNDO=&Отмена +MENU_EDIT_REDO=&Повторить +MENU_EDIT_PREFERENCES=&Настройки +MENU_VIEW=&Вид +MENU_VIEW_LANGUAGE=&Язык интерфейса +MENU_VIEW_LANGUAGE_EN=English +MENU_VIEW_LANGUAGE_RU=Русский +MENU_VIEW_THEME=&Тема +MENU_VIEW_THEME_DEFAULT=Стандартная +MENU_VIEW_THEME_CUSTOM1=Пример 1 +MENU_WINDOW=&Окно +MENU_WINDOW_PREFERENCES=&Настройки +MENU_HELP=&Справка +MENU_HELP_VIEW_HELP=&Просмотр справки +MENU_HELP_ABOUT=&О программе + +TAB_LONG_LIST=Длинный список +TAB_BUTTONS=Кнопки +TAB_ANIMATION=Анимация +TAB_TABLE_LAYOUT=Табличный layout +TAB_EDITORS=Редакторы + + diff --git a/res/mdpi/cr3_logo.png b/res/mdpi/cr3_logo.png new file mode 100644 index 0000000..6e0d94e Binary files /dev/null and b/res/mdpi/cr3_logo.png differ diff --git a/res/mdpi/dlangui-logo1.png b/res/mdpi/dlangui-logo1.png new file mode 100644 index 0000000..da4f1f5 Binary files /dev/null and b/res/mdpi/dlangui-logo1.png differ diff --git a/res/mdpi/document-close.png b/res/mdpi/document-close.png new file mode 100644 index 0000000..411031e Binary files /dev/null and b/res/mdpi/document-close.png differ diff --git a/res/mdpi/document-open-recent.png b/res/mdpi/document-open-recent.png new file mode 100644 index 0000000..15847ce Binary files /dev/null and b/res/mdpi/document-open-recent.png differ diff --git a/res/mdpi/document-open.png b/res/mdpi/document-open.png new file mode 100644 index 0000000..17076a3 Binary files /dev/null and b/res/mdpi/document-open.png differ diff --git a/res/mdpi/document-properties.png b/res/mdpi/document-properties.png new file mode 100644 index 0000000..12c6b44 Binary files /dev/null and b/res/mdpi/document-properties.png differ diff --git a/res/mdpi/document-save-as.png b/res/mdpi/document-save-as.png new file mode 100644 index 0000000..41c52aa Binary files /dev/null and b/res/mdpi/document-save-as.png differ diff --git a/res/mdpi/document-save.png b/res/mdpi/document-save.png new file mode 100644 index 0000000..3f7fd63 Binary files /dev/null and b/res/mdpi/document-save.png differ diff --git a/res/mdpi/edit-copy.png b/res/mdpi/edit-copy.png new file mode 100644 index 0000000..54eaf77 Binary files /dev/null and b/res/mdpi/edit-copy.png differ diff --git a/res/mdpi/edit-cut.png b/res/mdpi/edit-cut.png new file mode 100644 index 0000000..f4a55e3 Binary files /dev/null and b/res/mdpi/edit-cut.png differ diff --git a/res/mdpi/edit-paste.png b/res/mdpi/edit-paste.png new file mode 100644 index 0000000..3f71b1c Binary files /dev/null and b/res/mdpi/edit-paste.png differ diff --git a/res/mdpi/edit-redo.png b/res/mdpi/edit-redo.png new file mode 100644 index 0000000..c03bba0 Binary files /dev/null and b/res/mdpi/edit-redo.png differ diff --git a/res/mdpi/edit-undo.png b/res/mdpi/edit-undo.png new file mode 100644 index 0000000..f123942 Binary files /dev/null and b/res/mdpi/edit-undo.png differ diff --git a/res/mdpi/tx_fabric.jpg b/res/mdpi/tx_fabric.jpg new file mode 100644 index 0000000..6c33894 Binary files /dev/null and b/res/mdpi/tx_fabric.jpg differ diff --git a/src/app.d b/src/app.d index 91ebfc2..29eb8ab 100644 --- a/src/app.d +++ b/src/app.d @@ -3,6 +3,7 @@ module app; import dlangui.all; import std.stdio; import std.conv; +import dlangide.ui.frame; mixin APP_ENTRY_POINT; @@ -11,10 +12,10 @@ 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/"), // 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 @@ -31,10 +32,10 @@ extern (C) int UIAppMain(string[] args) { Platform.instance.uiTheme = "theme_default"; // create window - Window window = Platform.instance.createWindow("My Window", null); + Window window = Platform.instance.createWindow("Dlang IDE", null); // create some widget to show in window - window.mainWidget = (new Button()).text("Hello world"d).margins(Rect(20,20,20,20)); + window.mainWidget = new IDEFrame(window); // show window window.show();