update dark theme; fix fonts; fix console mode build

buggins · Sep 28, 2017 · b6628b7 · b6628b7
1 parent ae58bec
commit b6628b7
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 11 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-v0.8.3
+v0.8.4
diff --git a/views/res/console_ide_theme_dark.xml b/views/res/console_ide_theme_dark.xml
@@ -4,4 +4,11 @@
         fontFamily="SansSerif"
 	textColor="#E0E0E0"
 	>
+    <style id="HOME_SCREEN_TITLE"
+        textColor="#60A0FF"
+    />
+
+    <style id="HOME_SCREEN_TITLE2"
+        textColor="#60A0FF"
+    />
 </theme>
diff --git a/views/res/console_ide_theme_default.xml b/views/res/console_ide_theme_default.xml
@@ -42,5 +42,13 @@
     <drawable id="debug-step-over" value="{'↓' #0000FF}"/>
     <drawable id="debug-step-out" value="{'↑' #0000FF}"/>
 
+    <style id="HOME_SCREEN_TITLE"
+        textColor="#2020FF"
+    />
+
+    <style id="HOME_SCREEN_TITLE2"
+        textColor="#2020FF"
+    />
+
 </theme>
 
diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini
@@ -8,6 +8,7 @@ NO_RECENT=No recent items
 USEFUL_LINKS=Useful Links:
 D_LANG=D Programming Language
 DUB_REP=DUB repository
+DLANG_DOWNLOADS=Download D compiler
 DLANG_UI=DLangUI on GitHub
 DLANG_IDE=DLangIDE on GitHub
 DLANG_IDE_HELP=DLangIDE online documentation

diff --git a/views/res/i18n/ru.ini b/views/res/i18n/ru.ini
@@ -8,6 +8,7 @@ NO_RECENT=Нет недавно открытых файлов/проектов
 USEFUL_LINKS=Полезные ссылки:
 D_LANG=Язык программирования D
 DUB_REP=Хранилище DUB
+DLANG_DOWNLOADS=Скачать компилятор D
 DLANG_UI=DLangUI на GitHub
 DLANG_IDE=DLangIDE на GitHub
 DLANG_IDE_HELP=DLangIDE документация

diff --git a/views/res/ide_theme_dark.xml b/views/res/ide_theme_dark.xml
@@ -22,4 +22,15 @@
     <color id="build_log_deprecation_color" value="#F05080"/>
 
     <drawable id="btn_check" value="btn_check_dark"/>
+
+    <style id="HOME_SCREEN_TITLE"
+        fontSize="160%"
+        textColor="#60A0FF"
+    />
+
+    <style id="HOME_SCREEN_TITLE2"
+        fontSize="120%"
+        textColor="#60A0FF"
+    />
+
 </theme>
diff --git a/views/res/ide_theme_default.xml b/views/res/ide_theme_default.xml
@@ -26,8 +26,17 @@
 
     <style id="TOOLBAR_HOST"
         backgroundImageId="#eceffa"
-        />
+    />
+
+    <style id="HOME_SCREEN_TITLE"
+        textColor="#2040FF"
+        fontSize="160%"
+    />
 
+    <style id="HOME_SCREEN_TITLE2"
+        textColor="#2040FF"
+        fontSize="120%"
+    />
 
 </theme>