Skip to content

Commit

Permalink
GUI Theme
Browse files Browse the repository at this point in the history 
Set Qt attributes before QCoreApplication is created

New Image Assets

Added new image assets

Update bitcoin.qrc

Added image assets and removed duplicate entries

Update modaloverlay.ui

moved to dedicated stylesheet

Customize Calendar Widget

Set weekend color here as it cannot be done in the stylesheet

Update sigmadialog.ui

Fixed name conflict during compile

Update UI element names

Clearer element names and small tweaks in UI consistency

Update platformstyle.cpp

Colorize icons uniformly across platforms and move text customization to stylesheet

Update UI forms

Remove icons from buttons that already have text

Update lelantusdialog.ui

fixed alignment issue

Update bitcoin.qrc

added stylesheet

Update bitcoingui.cpp

moved styling to stylesheet

Keep certain icons black

Prevent colorization of certain icons

Add logo to main toolbar

Add logo to main toolbar

Load stylesheet

read and load stylesheet

Remove icons

Icons removed from main toolbar and menu

Update signverifymessagedialog.cpp

removed a few more icons from buttons with test

Update chevron.png

changed color

alignment

Create firo.css

stylesheet

Fix testnet splash image and jenkins build error

Update Makefile.qt.include

forgot to add the css

Update firo.css

Better support for HiDPI scaling on windows and possibly other platforms

GUI Style and Colors (firoorg#1080)

* New Image Assets

Added new image assets

* Update bitcoin.qrc

Added image assets and removed duplicate entries

* Update modaloverlay.ui

moved to dedicated stylesheet

* Customize Calendar Widget

Set weekend color here as it cannot be done in the stylesheet

* Update sigmadialog.ui

Fixed name conflict during compile

* Update UI element names

Clearer element names and small tweaks in UI consistency

* Update platformstyle.cpp

Colorize icons uniformly across platforms and move text customization to stylesheet

* Update UI forms

Remove icons from buttons that already have text

* Update lelantusdialog.ui

fixed alignment issue

* Update bitcoin.qrc

added stylesheet

* Update bitcoingui.cpp

moved styling to stylesheet

* Keep certain icons black

Prevent colorization of certain icons

* Add logo to main toolbar

Add logo to main toolbar

* Load stylesheet

read and load stylesheet

* Remove icons

Icons removed from main toolbar and menu

* Update signverifymessagedialog.cpp

removed a few more icons from buttons with test

* Update chevron.png

changed color

* alignment

* Create firo.css

stylesheet

* Fix testnet splash image and jenkins build error

Update Makefile.qt.include

forgot to add the css

* Update firo.css

Better support for HiDPI scaling on windows and possibly other platforms

* Update bitcoin.cpp

Set Qt attributes before QCoreApplication is created

ui fixes

debug alignment
inverted tool/tab bar colors
fixed visibility of toolbar extension button

font size

alternating tableview colors

Update firo.css
  • Loading branch information
@notshillo
notshillo committed Dec 8, 2021
1 parent d5f1e4c commit df68bf3
Show file tree
Hide file tree
Showing 65 changed files with 2,098 additions and 181 deletions.
45 changes: 41 additions & 4 deletions src/Makefile.qt.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,46 @@ RES_ICONS = \
qt/res/icons/verify.png \
qt/res/images/about.png \
qt/res/images/splash.png \
qt/res/images/splash-testnet.png \
qt/res/images/splash_testnet.png \
qt/res/icons/transaction_abandoned.png \
qt/res/icons/lelantus.png
qt/res/icons/lelantus.png \
qt/res/images/arrow_down_dark.png \
qt/res/images/arrow_down_light.png \
qt/res/images/arrow_left_dark.png \
qt/res/images/arrow_left_light.png \
qt/res/images/arrow_right_dark.png \
qt/res/images/arrow_right_light.png \
qt/res/images/arrow_up_dark.png \
qt/res/images/arrow_up_light.png \
qt/res/images/arrow_light_down_normal.png \
qt/res/images/arrow_light_down_hover.png \
qt/res/images/arrow_light_left_normal.png \
qt/res/images/arrow_light_left_hover.png \
qt/res/images/arrow_light_right_normal.png \
qt/res/images/arrow_light_right_hover.png \
qt/res/images/arrow_light_up_normal.png \
qt/res/images/arrow_light_up_hover.png \
qt/res/images/checkbox_normal_light.png \
qt/res/images/checkbox_normal_hover_light.png \
qt/res/images/checkbox_normal_disabled_light.png \
qt/res/images/checkbox_checked_light.png \
qt/res/images/checkbox_checked_hover_light.png \
qt/res/images/checkbox_checked_disabled_light.png \
qt/res/images/checkbox_partly_checked_light.png \
qt/res/images/checkbox_partly_checked_hover_light.png \
qt/res/images/checkbox_partly_checked_disabled_light.png \
qt/res/images/firo_logo_white.png \
qt/res/images/radio_normal_light.png \
qt/res/images/radio_normal_hover_light.png \
qt/res/images/radio_checked_light.png \
qt/res/images/radio_checked_hover_light.png \
qt/res/images/radio_normal_disabled_light.png \
qt/res/images/radio_checked_disabled_light.png \
qt/res/icons/ext_add.png \
qt/res/icons/ext_add_light.png

RES_CSS = \
qt/res/css/firo.css

BITCOIN_QT_BASE_CPP = \
qt/bantablemodel.cpp \
Expand Down Expand Up @@ -487,7 +524,7 @@ qt_libfiroqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUD
qt_libfiroqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)

qt_libfiroqt_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_MOVIES)
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES)

nodist_qt_libfiroqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
$(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
Expand Down Expand Up @@ -602,7 +639,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_MOVIES) $(PROTOBUF_H)
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) $(PROTOBUF_H)
@test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
Expand Down
3 changes: 2 additions & 1 deletion src/qt/bitcoin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,6 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(bitcoin);
Q_INIT_RESOURCE(bitcoin_locale);

BitcoinApplication app(argc, argv);
#if QT_VERSION > 0x050100
// Generate high-dpi pixmaps
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
Expand All @@ -670,6 +669,8 @@ int main(int argc, char *argv[])
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
#endif

BitcoinApplication app(argc, argv);

// Register meta types used for QMetaObject::invokeMethod
qRegisterMetaType< bool* >();
// Need to pass name here as CAmount is a typedef (see http://qt-project.org/doc/qt-5/qmetatype.html#qRegisterMetaType)
Expand Down
43 changes: 38 additions & 5 deletions src/qt/bitcoin.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,8 @@
<file alias="elysium_hourglass">res/icons/elysium_hourglass.png</file>
<file alias="lelantus">res/icons/lelantus.png</file>
<file alias="paymentcode">res/icons/paymentcode.png</file>
</qresource>
<qresource prefix="/images">
<file alias="splash">res/images/splash.png</file>
<file alias="splash_testnet">res/images/splash_testnet.png</file>
<file alias="ext_add">res/icons/ext_add.png</file>
<file alias="ext_add_light">res/icons/ext_add_light.png</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
Expand Down Expand Up @@ -119,6 +117,41 @@
<qresource prefix="/images">
<file alias="about">res/images/about.png</file>
<file alias="splash">res/images/splash.png</file>
<file alias="splash_testnet">res/images/splash-testnet.png</file>
<file alias="splash_testnet">res/images/splash_testnet.png</file>
<file alias="arrow_down_dark">res/images/arrow_down_dark.png</file>
<file alias="arrow_down_light">res/images/arrow_down_light.png</file>
<file alias="arrow_left_dark">res/images/arrow_left_dark.png</file>
<file alias="arrow_left_light">res/images/arrow_left_light.png</file>
<file alias="arrow_right_dark">res/images/arrow_right_dark.png</file>
<file alias="arrow_right_light">res/images/arrow_right_light.png</file>
<file alias="arrow_up_dark">res/images/arrow_up_dark.png</file>
<file alias="arrow_up_light">res/images/arrow_up_light.png</file>
<file alias="arrow_light_down_normal">res/images/arrow_light_down_normal.png</file>
<file alias="arrow_light_down_hover">res/images/arrow_light_down_hover.png</file>
<file alias="arrow_light_left_normal">res/images/arrow_light_left_normal.png</file>
<file alias="arrow_light_left_hover">res/images/arrow_light_left_hover.png</file>
<file alias="arrow_light_right_normal">res/images/arrow_light_right_normal.png</file>
<file alias="arrow_light_right_hover">res/images/arrow_light_right_hover.png</file>
<file alias="arrow_light_up_normal">res/images/arrow_light_up_normal.png</file>
<file alias="arrow_light_up_hover">res/images/arrow_light_up_hover.png</file>
<file alias="checkbox_normal_light">res/images/checkbox_normal_light.png</file>
<file alias="checkbox_normal_hover_light">res/images/checkbox_normal_hover_light.png</file>
<file alias="checkbox_normal_disabled_light">res/images/checkbox_normal_disabled_light.png</file>
<file alias="checkbox_checked_light">res/images/checkbox_checked_light.png</file>
<file alias="checkbox_checked_hover_light">res/images/checkbox_checked_hover_light.png</file>
<file alias="checkbox_checked_disabled_light">res/images/checkbox_checked_disabled_light.png</file>
<file alias="checkbox_partly_checked_light">res/images/checkbox_partly_checked_light.png</file>
<file alias="checkbox_partly_checked_hover_light">res/images/checkbox_partly_checked_hover_light.png</file>
<file alias="checkbox_partly_checked_disabled_light">res/images/checkbox_partly_checked_disabled_light.png</file>
<file alias="firo_logo_toolbar">res/images/firo_logo_white.png</file>
<file alias="radio_normal_light">res/images/radio_normal_light.png</file>
<file alias="radio_normal_hover_light">res/images/radio_normal_hover_light.png</file>
<file alias="radio_checked_light">res/images/radio_checked_light.png</file>
<file alias="radio_checked_hover_light">res/images/radio_checked_hover_light.png</file>
<file alias="radio_normal_disabled_light">res/images/radio_normal_disabled_light.png</file>
<file alias="radio_checked_disabled_light">res/images/radio_checked_disabled_light.png</file>
</qresource>
<qresource prefix="/css">
<file alias="firoTheme">res/css/firo.css</file>
</qresource>
</RCC>
Loading

0 comments on commit df68bf3

Please sign in to comment.