Fixing Makefile.qt.include for DarkStyle Theme

NewCapital · Feb 26, 2019 · 3c3828a · 3c3828a
1 parent df957f8
commit 3c3828a
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -353,9 +353,53 @@ RES_IMAGES = \
   qt/res/images/walletFrame_bg.png \
   qt/res/images/walletFrame_bg.png
 
+QSS_ICONS = \
+  qt/qdarkstyle/rc/up_arrow_disabled.png \
+  qt/qdarkstyle/rc/Hmovetoolbar.png \
+  qt/qdarkstyle/rc/stylesheet-branch-end.png \
+  qt/qdarkstyle/rc/branch_closed-on.png \
+  qt/qdarkstyle/rc/stylesheet-vline.png \
+  qt/qdarkstyle/rc/branch_closed.png \
+  qt/qdarkstyle/rc/branch_open-on.png \
+  qt/qdarkstyle/rc/transparent.png \
+  qt/qdarkstyle/rc/right_arrow_disabled.png \
+  qt/qdarkstyle/rc/sizegrip.png \
+  qt/qdarkstyle/rc/close.png \
+  qt/qdarkstyle/rc/close-hover.png \
+  qt/qdarkstyle/rc/close-pressed.png \
+  qt/qdarkstyle/rc/down_arrow.png \
+  qt/qdarkstyle/rc/Vmovetoolbar.png \
+  qt/qdarkstyle/rc/left_arrow.png \
+  qt/qdarkstyle/rc/stylesheet-branch-more.png \
+  qt/qdarkstyle/rc/up_arrow.png \
+  qt/qdarkstyle/rc/right_arrow.png \
+  qt/qdarkstyle/rc/left_arrow_disabled.png \
+  qt/qdarkstyle/rc/Hsepartoolbar.png \
+  qt/qdarkstyle/rc/branch_open.png \
+  qt/qdarkstyle/rc/Vsepartoolbar.png \
+  qt/qdarkstyle/rc/down_arrow_disabled.png \
+  qt/qdarkstyle/rc/undock.png \
+  qt/qdarkstyle/rc/checkbox_checked_disabled.png \
+  qt/qdarkstyle/rc/checkbox_checked_focus.png \
+  qt/qdarkstyle/rc/checkbox_checked.png \
+  qt/qdarkstyle/rc/checkbox_indeterminate.png \
+  qt/qdarkstyle/rc/checkbox_indeterminate_focus.png \
+  qt/qdarkstyle/rc/checkbox_unchecked_disabled.png \
+  qt/qdarkstyle/rc/checkbox_unchecked_focus.png \
+  qt/qdarkstyle/rc/checkbox_unchecked.png \
+  qt/qdarkstyle/rc/radio_checked_disabled.png \
+  qt/qdarkstyle/rc/radio_checked_focus.png \
+  qt/qdarkstyle/rc/radio_checked.png \
+  qt/qdarkstyle/rc/radio_unchecked_disabled.png \
+  qt/qdarkstyle/rc/radio_unchecked_focus.png \
+  qt/qdarkstyle/rc/radio_unchecked.png
+
 RES_CSS = \
   qt/res/css/default.css
 
+DARK_QSS = \
+  qt/qdarkstyle/style.qss
+
 RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
 
 BITCOIN_RC = qt/res/twins-qt-res.rc
@@ -369,7 +413,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
 
 qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
-  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES)
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) $(QSS_ICONS) $(DARK_QSS)
 
 nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
   $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
@@ -432,7 +476,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
 	@rm $(@D)/temp_$(<F)
 
-$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) $(PROTOBUF_H)
+$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(QSS_ICONS) $(RES_CSS) $(DARK_QSS) $(RES_MOVIES) $(PROTOBUF_H)
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name twins $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@

diff --git a/src/qt/twins.qrc b/src/qt/twins.qrc
@@ -116,7 +116,7 @@
         <file alias="spinner-033">res/movies/spinner-033.png</file>
         <file alias="spinner-034">res/movies/spinner-034.png</file>
     </qresource>
-        <qresource prefix="qss_icons">
+    <qresource prefix="qss_icons">
      	<file>qdarkstyle/rc/up_arrow_disabled.png</file>
      	<file>qdarkstyle/rc/Hmovetoolbar.png</file>
      	<file>qdarkstyle/rc/stylesheet-branch-end.png</file>