diff --git a/examples/ircclient/dub.json b/examples/ircclient/dub.json index fb2decd3..bae821b1 100644 --- a/examples/ircclient/dub.json +++ b/examples/ircclient/dub.json @@ -17,5 +17,20 @@ "dependencies": { "dlangui": {"path": "../../"} - } + }, + + "configurations" : [ + { + "name" : "default", + "subConfigurations" : { + "dlangui" : "default" + } + }, + { + "name" : "console", + "subConfigurations" : { + "dlangui" : "console" + } + } + ] } diff --git a/examples/ircclient/ircclient.visualdproj b/examples/ircclient/ircclient.visualdproj index 3a125398..47e5dfbe 100644 --- a/examples/ircclient/ircclient.visualdproj +++ b/examples/ircclient/ircclient.visualdproj @@ -480,7 +480,7 @@ 0 0 - USE_OPENGL EmbedStandardResources ForceLogs + USE_CONSOLE ForceLogs 0 0 0 diff --git a/examples/ircclient/src/ircclient/ui/frame.d b/examples/ircclient/src/ircclient/ui/frame.d index 22dbfd90..4a6105cc 100644 --- a/examples/ircclient/src/ircclient/ui/frame.d +++ b/examples/ircclient/src/ircclient/ui/frame.d @@ -10,7 +10,7 @@ import ircclient.net.client; import ircclient.ui.settingsdlg; import ircclient.ui.settings; -import std.string : startsWith, indexOf; +import std.string : startsWith, indexOf, empty; import std.path; // action codes @@ -317,8 +317,8 @@ public: _listBox = new StringListWidget(); _listBox.layoutHeight = FILL_PARENT; _listBox.layoutWidth = WRAP_CONTENT; - _listBox.minWidth = 100; - _listBox.maxWidth = 200; + _listBox.minWidth = pointsToPixels(100); + _listBox.maxWidth = pointsToPixels(200); _listBox.orientation = Orientation.Vertical; //_listBox.items = ["Nick1"d, "Nick2"d]; hlayout.addChild(new ResizerWidget(null, Orientation.Horizontal)); diff --git a/examples/ircclient/src/ircclient/ui/settingsdlg.d b/examples/ircclient/src/ircclient/ui/settingsdlg.d index 5558fe21..51de6390 100644 --- a/examples/ircclient/src/ircclient/ui/settingsdlg.d +++ b/examples/ircclient/src/ircclient/ui/settingsdlg.d @@ -6,6 +6,8 @@ import dlangui.widgets.widget; import dlangui.dml.parser; import ircclient.ui.frame; import ircclient.ui.settings; +import std.utf; +import std.conv : to; class SettingsDialog : Dialog { IRCFrame _frame; diff --git a/examples/ircclient/src/main.d b/examples/ircclient/src/main.d index 8a1f00f8..605202bf 100644 --- a/examples/ircclient/src/main.d +++ b/examples/ircclient/src/main.d @@ -19,7 +19,7 @@ extern (C) int UIAppMain(string[] args) { Window window = Platform.instance.createWindow("DlangUI IRC Client"d, null, WindowFlag.Resizable, 700, 470); // create some widget to show in window - window.windowIcon = drawableCache.getImage("dlangui-logo1"); + static if (BACKEND_GUI) window.windowIcon = drawableCache.getImage("dlangui-logo1"); // create some widget to show in window diff --git a/examples/ircclient/views/console_resources.list b/examples/ircclient/views/console_resources.list new file mode 100644 index 00000000..c3470a99 --- /dev/null +++ b/examples/ircclient/views/console_resources.list @@ -0,0 +1,7 @@ +res/i18n/en.ini +res/i18n/ru.ini +res/mdpi/configure.tim +res/mdpi/connect.tim +res/mdpi/disconnect.tim +res/mdpi/about.tim + diff --git a/examples/ircclient/views/res/mdpi/about.tim b/examples/ircclient/views/res/mdpi/about.tim new file mode 100644 index 00000000..be4ec1bb --- /dev/null +++ b/examples/ircclient/views/res/mdpi/about.tim @@ -0,0 +1,2 @@ +{' ? ' #FFFF00} + diff --git a/examples/ircclient/views/res/mdpi/configure.tim b/examples/ircclient/views/res/mdpi/configure.tim new file mode 100644 index 00000000..a4f6c358 --- /dev/null +++ b/examples/ircclient/views/res/mdpi/configure.tim @@ -0,0 +1,2 @@ +{' ╬ conf ' #00FFFF #00FFFF #C0C0C0} + diff --git a/examples/ircclient/views/res/mdpi/connect.tim b/examples/ircclient/views/res/mdpi/connect.tim new file mode 100644 index 00000000..6550aa24 --- /dev/null +++ b/examples/ircclient/views/res/mdpi/connect.tim @@ -0,0 +1 @@ +{' ► conn ' #00FF00 #00FF00 #C0C0C0} \ No newline at end of file diff --git a/examples/ircclient/views/res/mdpi/disconnect.tim b/examples/ircclient/views/res/mdpi/disconnect.tim new file mode 100644 index 00000000..7dc19a78 --- /dev/null +++ b/examples/ircclient/views/res/mdpi/disconnect.tim @@ -0,0 +1 @@ +{' X dscn ' #FF0000 #FF0000 #C0C0C0} \ No newline at end of file diff --git a/views/res/console_theme_default.xml b/views/res/console_theme_default.xml index 38603438..9b00d195 100644 --- a/views/res/console_theme_default.xml +++ b/views/res/console_theme_default.xml @@ -188,7 +188,7 @@ > -