diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index a8d7d2164a..985fa2e677 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -86,7 +86,9 @@ namespace GUIUtil { QFont getSubLabelFont() { QFont labelSubFont; +#if !defined(Q_OS_MAC) labelSubFont.setFamily("Open Sans"); +#endif labelSubFont.setWeight(QFont::Weight::ExtraLight); labelSubFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.6); labelSubFont.setPixelSize(14); @@ -96,7 +98,9 @@ QFont getSubLabelFont() QFont getSubLabelFontBolded() { QFont labelSubFont; +#if !defined(Q_OS_MAC) labelSubFont.setFamily("Open Sans"); +#endif labelSubFont.setWeight(QFont::Weight::Bold); labelSubFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.6); labelSubFont.setPixelSize(14); @@ -106,7 +110,9 @@ QFont getSubLabelFontBolded() QFont getTopLabelFontBolded() { QFont labelTopFont; +#if !defined(Q_OS_MAC) labelTopFont.setFamily("Open Sans"); +#endif labelTopFont.setWeight(QFont::Weight::Bold); labelTopFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.6); labelTopFont.setPixelSize(18); @@ -116,7 +122,9 @@ QFont getTopLabelFontBolded() QFont getTopLabelFont(int weight, int pxsize) { QFont labelTopFont; +#if !defined(Q_OS_MAC) labelTopFont.setFamily("Open Sans"); +#endif labelTopFont.setWeight(weight); labelTopFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.6); labelTopFont.setPixelSize(pxsize); @@ -126,7 +134,9 @@ QFont getTopLabelFont(int weight, int pxsize) QFont getTopLabelFont() { QFont labelTopFont; +#if !defined(Q_OS_MAC) labelTopFont.setFamily("Open Sans"); +#endif labelTopFont.setWeight(QFont::Weight::Light); labelTopFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.6); labelTopFont.setPixelSize(18); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 7ddd8a595d..9c7ce3bb16 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -216,14 +216,18 @@ Q_OBJECT /** Create the font that is used for painting the asset name */ QFont nameFont; +#if !defined(Q_OS_MAC) nameFont.setFamily("Open Sans"); +#endif nameFont.setPixelSize(18); nameFont.setWeight(QFont::Weight::Normal); nameFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.4); /** Create the font that is used for painting the asset amount */ QFont amountFont; +#if !defined(Q_OS_MAC) amountFont.setFamily("Open Sans"); +#endif amountFont.setPixelSize(14); amountFont.setWeight(QFont::Weight::Normal); amountFont.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.3); diff --git a/src/qt/ravengui.cpp b/src/qt/ravengui.cpp index ed42dd8c1c..d682aa7211 100644 --- a/src/qt/ravengui.cpp +++ b/src/qt/ravengui.cpp @@ -212,7 +212,9 @@ RavenGUI::RavenGUI(const PlatformStyle *_platformStyle, const NetworkStyle *netw loadFonts(); +#if !defined(Q_OS_MAC) this->setFont(QFont("Open Sans")); +#endif // Create actions for the toolbar, menu bar and tray/dock icon // Needs walletFrame to be initialized @@ -341,7 +343,9 @@ void RavenGUI::createActions() QFont font = QFont(); font.setPixelSize(22); font.setLetterSpacing(QFont::SpacingType::AbsoluteSpacing, -0.43); +#if !defined(Q_OS_MAC) font.setFamily("Open Sans"); +#endif font.setWeight(QFont::Weight::ExtraLight); QActionGroup *tabGroup = new QActionGroup(this); @@ -608,16 +612,26 @@ void RavenGUI::createToolBars() // toolbar->addAction(messagingAction); // toolbar->addAction(votingAction); + QString openSansFontString = "font: normal 22pt \"Open Sans\";"; + QString normalString = "font: normal 22pt \"Arial\";"; + QString stringToUse = ""; + +#if !defined(Q_OS_MAC) + stringToUse = openSansFontString; +#else + stringToUse = normalString; +#endif + /** RVN START */ QString tbStyleSheet = ".QToolBar {background-color : transparent; border-color: transparent; } " ".QToolButton {background-color: transparent; border-color: transparent; width: 249px; color: %1; border: none;} " - ".QToolButton:checked {background: none; background-color: none; selection-background-color: none; color: %2; border: none; font: normal 22pt \"Open Sans\";} " + ".QToolButton:checked {background: none; background-color: none; selection-background-color: none; color: %2; border: none; font: %4} " ".QToolButton:hover {background: none; background-color: none; border: none; color: %3;} " ".QToolButton:disabled {color: gray;}"; toolbar->setStyleSheet(tbStyleSheet.arg(platformStyle->ToolBarNotSelectedTextColor().name(), platformStyle->ToolBarSelectedTextColor().name(), - platformStyle->DarkOrangeColor().name())); + platformStyle->DarkOrangeColor().name(), stringToUse)); toolbar->setOrientation(Qt::Vertical); toolbar->setIconSize(QSize(40, 40));