From b6628b7f4cb031386e9aaa85b9d3057cdf5bca38 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Thu, 28 Sep 2017 13:11:59 +0300 Subject: [PATCH] update dark theme; fix fonts; fix console mode build --- dub.json | 2 +- src/dlangide/ui/homescreen.d | 16 ++++++++-------- views/VERSION | 2 +- views/res/console_ide_theme_dark.xml | 7 +++++++ views/res/console_ide_theme_default.xml | 8 ++++++++ views/res/i18n/en.ini | 1 + views/res/i18n/ru.ini | 1 + views/res/ide_theme_dark.xml | 11 +++++++++++ views/res/ide_theme_default.xml | 11 ++++++++++- 9 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dub.json b/dub.json index 497becb..1772da5 100644 --- a/dub.json +++ b/dub.json @@ -12,7 +12,7 @@ "stringImportPaths": ["views"], "dependencies": { - "dlangui": "==0.9.153", + "dlangui": "==0.9.156", "dsymbol": "~>0.2.9", "dcd": "~>0.9.1" }, diff --git a/src/dlangide/ui/homescreen.d b/src/dlangide/ui/homescreen.d index 7c476fa..c8f2447 100644 --- a/src/dlangide/ui/homescreen.d +++ b/src/dlangide/ui/homescreen.d @@ -25,7 +25,6 @@ class HomeScreen : ScrollWidget { import dlangide.ui.frame; //styleId = STYLE_EDIT_BOX; _frame = frame; - uint linkColor = currentTheme.customColor("link_color", 0x2020FF); _content = new HorizontalLayout("HOME_SCREEN_BODY"); _content.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); VerticalLayout _column1 = new VerticalLayout(); @@ -35,11 +34,11 @@ class HomeScreen : ScrollWidget { _column2.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT).padding(Rect(pad, pad, pad, pad)); _content.addChild(_column1); _content.addChild(_column2); - _column1.addChild((new TextWidget(null, "Dlang IDE "d ~ DLANGIDE_VERSION)).fontSize(32).textColor(linkColor)); - _column1.addChild((new TextWidget(null, UIString.fromId("DESCRIPTION"c))).fontSize(20)); - _column1.addChild((new TextWidget(null, UIString.fromId("COPYRIGHT"c))).fontSize(22).textColor(linkColor)); + _column1.addChild((new TextWidget(null, "Dlang IDE "d ~ DLANGIDE_VERSION)).styleId("HOME_SCREEN_TITLE")); + _column1.addChild((new TextWidget(null, UIString.fromId("DESCRIPTION"c))).styleId("HOME_SCREEN_TITLE2")); + _column1.addChild((new TextWidget(null, UIString.fromId("COPYRIGHT"c))).styleId("HOME_SCREEN_TITLE2")); _column1.addChild(new VSpacer()); - _column1.addChild((new TextWidget(null, UIString.fromId("START_WITH"c))).fontSize(20).textColor(linkColor)); + _column1.addChild((new TextWidget(null, UIString.fromId("START_WITH"c))).styleId("HOME_SCREEN_TITLE")); _startItems = new VerticalLayout(); _recentItems = new VerticalLayout(); _startItems.addChild(new ImageTextButton(ACTION_FILE_OPEN_WORKSPACE)); @@ -49,7 +48,7 @@ class HomeScreen : ScrollWidget { _column1.addChild(new VSpacer()); // Recent workspaces - _column1.addChild((new TextWidget(null, UIString.fromId("RECENT"c))).fontSize(20).textColor(linkColor)); + _column1.addChild((new TextWidget(null, UIString.fromId("RECENT"c))).styleId("HOME_SCREEN_TITLE")); string[] recentWorkspaces = _frame.settings.recentWorkspaces; if (recentWorkspaces.length) { foreach(fn; recentWorkspaces) { @@ -65,8 +64,9 @@ class HomeScreen : ScrollWidget { // Useful links _column1.addChild(new VSpacer()); - _column2.addChild((new TextWidget(null, UIString.fromId("USEFUL_LINKS"c))).fontSize(20).textColor(linkColor)); + _column2.addChild((new TextWidget(null, UIString.fromId("USEFUL_LINKS"c))).styleId("HOME_SCREEN_TITLE")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("D_LANG"c).value, "http://dlang.org/")); + _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_DOWNLOADS"c).value, "https://dlang.org/download.html")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DUB_REP"c).value, "http://code.dlang.org/")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_UI"c).value, "https://github.com/buggins/dlangui")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_IDE"c).value, "https://github.com/buggins/dlangide")); @@ -75,7 +75,7 @@ class HomeScreen : ScrollWidget { _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_VIBED"c).value, "http://vibed.org/")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_FORUM"c).value, "http://forum.dlang.org/")); _column1.addChild(new VSpacer()); - _column2.addChild((new TextWidget(null, UIString.fromId("DLANG_IDE_DONATE"c))).fontSize(20).textColor(linkColor)); + _column2.addChild((new TextWidget(null, UIString.fromId("DLANG_IDE_DONATE"c))).styleId("HOME_SCREEN_TITLE")); _column2.addChild(new UrlImageTextButton(null, UIString.fromId("DLANG_IDE_DONATE_PAYPAL"c).value, HELP_DONATION_URL)); _column2.addChild(new VSpacer()); diff --git a/views/VERSION b/views/VERSION index dff41ab..c58a021 100644 --- a/views/VERSION +++ b/views/VERSION @@ -1 +1 @@ -v0.8.3 \ No newline at end of file +v0.8.4 \ No newline at end of file diff --git a/views/res/console_ide_theme_dark.xml b/views/res/console_ide_theme_dark.xml index 7f2c264..6764a4b 100644 --- a/views/res/console_ide_theme_dark.xml +++ b/views/res/console_ide_theme_dark.xml @@ -4,4 +4,11 @@ fontFamily="SansSerif" textColor="#E0E0E0" > +