qt: Improved modification checks in GUIUtil::loadStyleSheet

src/Makefile.qt.include

@@ -352,8 +352,27 @@ RES_CSS = \
   qt/res/css/dark.css \
   qt/res/css/general.css \
   qt/res/css/light.css \
-  qt/res/css/scrollbars.css \
-  qt/res/css/trad.css
+  qt/res/css/traditional.css
+
+RES_FONTS = \
+  qt/res/fonts/Montserrat/Montserrat-Black.otf \
+  qt/res/fonts/Montserrat/Montserrat-BlackItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Bold.otf \
+  qt/res/fonts/Montserrat/Montserrat-BoldItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-ExtraBold.otf \
+  qt/res/fonts/Montserrat/Montserrat-ExtraBoldItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-ExtraLight.otf \
+  qt/res/fonts/Montserrat/Montserrat-ExtraLightItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Italic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Light.otf \
+  qt/res/fonts/Montserrat/Montserrat-LightItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Medium.otf \
+  qt/res/fonts/Montserrat/Montserrat-MediumItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Regular.otf \
+  qt/res/fonts/Montserrat/Montserrat-SemiBold.otf \
+  qt/res/fonts/Montserrat/Montserrat-SemiBoldItalic.otf \
+  qt/res/fonts/Montserrat/Montserrat-Thin.otf \
+  qt/res/fonts/Montserrat/Montserrat-ThinItalic.otf
 
 RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
 
@@ -367,7 +386,7 @@ qt_libdashqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 qt_libdashqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
 
 qt_libdashqt_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_FONTS) $(RES_MOVIES)
 
 nodist_qt_libdashqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
   $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
@@ -430,7 +449,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) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES) $(PROTOBUF_H)
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@

src/qt/addressbookpage.cpp

@@ -143,6 +143,8 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
     connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
 
     connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(accept()));
+
+    GUIUtil::updateFonts();
 }
 
 AddressBookPage::~AddressBookPage()

src/qt/askpassphrasedialog.cpp

@@ -11,6 +11,7 @@
 #include <qt/forms/ui_askpassphrasedialog.h>
 
 #include <qt/guiconstants.h>
+#include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 
 #include <support/allocators/secure.h>
@@ -28,6 +29,12 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent) :
 {
     ui->setupUi(this);
 
+    GUIUtil::setFont({ui->capsLabel}, GUIUtil::Weight::Bold);
+
+    GUIUtil::updateFonts();
+
+    GUIUtil::disableMacFocusRect(this);
+
     ui->passEdit1->setMinimumSize(ui->passEdit1->sizeHint());
     ui->passEdit2->setMinimumSize(ui->passEdit2->sizeHint());
     ui->passEdit3->setMinimumSize(ui->passEdit3->sizeHint());