diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttc b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans-large.ttc
similarity index 100%
rename from Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttc
rename to Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans-large.ttc
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans-large.ttf
similarity index 100%
copy from Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf
copy to Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans-large.ttf
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf
index daac0d1f79..f05e2f68af 100644
Binary files a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf and b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf differ
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSans.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSans.ttf
new file mode 100644
index 0000000000..6378d81625
Binary files /dev/null and b/Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSans.ttf differ
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSans.ttc b/Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSanslarge.ttc
similarity index 100%
rename from Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSans.ttc
rename to Plugins/org.blueberry.ui.qt/resources/fonts/LightFiraSans/LightFiraSanslarge.ttc
diff --git a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
index 2829d41e1e..7da4f83a9f 100755
--- a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
+++ b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
@@ -1,72 +1,68 @@
cursor_bottom.xpm
cursor_center.xpm
cursor_left.xpm
cursor_offscreen.xpm
cursor_right.xpm
cursor_top.xpm
dialog-error.svg
icon_missing.png
tab_close_grey.svg
tab_close_grey_active.svg
defaultstyle.qss
defaultstyle-activetab.qss
defaultstyle-tab.qss
dark/up_arrow_disabled.png
dark/Hmovetoolbar.png
dark/stylesheet-branch-end.png
dark/branch_closed-on.png
dark/stylesheet-vline.png
dark/branch_closed.png
dark/branch_open-on.png
dark/transparent.png
dark/right_arrow_disabled.png
dark/sizegrip.png
dark/tab_close_grey.svg
dark/tab_close_grey_active.svg
dark/tab_close_grey_active.svg
dark/down_arrow.png
dark/Vmovetoolbar.png
dark/left_arrow.png
dark/stylesheet-branch-more.png
dark/up_arrow.png
dark/right_arrow.png
dark/left_arrow_disabled.png
dark/Hsepartoolbar.png
dark/branch_open.png
dark/Vsepartoolbar.png
dark/down_arrow_disabled.png
dark/undock.png
dark/checkbox_checked_disabled.png
dark/checkbox_checked_focus.png
dark/checkbox_checked.png
dark/checkbox_indeterminate.png
dark/checkbox_indeterminate_focus.png
dark/checkbox_unchecked_disabled.png
dark/checkbox_unchecked_focus.png
dark/checkbox_unchecked.png
dark/radio_checked_disabled.png
dark/radio_checked_focus.png
dark/radio_checked.png
dark/radio_unchecked_disabled.png
dark/radio_unchecked_focus.png
dark/radio_unchecked.png
darkstyle.qss
darkstyle-tab.qss
darkstyle-activetab.qss
- fonts/FiraSans/FiraSans.ttc
- fonts/LightFiraSans/LightFiraSans.ttc
+ fonts/FiraSans/FiraSans.ttf
+ fonts/LightFiraSans/LightFiraSans.ttf
fonts/Roboto/Roboto.ttf
- fonts/OpenSans/OpenSans-Bold.ttf
- fonts/OpenSans/OpenSans-BoldItalic.ttf
- fonts/OpenSans/OpenSans-Italic.ttf
- fonts/OpenSans/OpenSans-Light.ttf
fonts/OpenSans/OpenSans-Regular.ttf
fonts/xkcd/xkcd.ttf
diff --git a/Plugins/org.blueberry.ui.qt/src/application/berryQtWorkbenchAdvisor.cpp b/Plugins/org.blueberry.ui.qt/src/application/berryQtWorkbenchAdvisor.cpp
index a339e3f4e2..52867618a9 100755
--- a/Plugins/org.blueberry.ui.qt/src/application/berryQtWorkbenchAdvisor.cpp
+++ b/Plugins/org.blueberry.ui.qt/src/application/berryQtWorkbenchAdvisor.cpp
@@ -1,60 +1,63 @@
/*===================================================================
BlueBerry Platform
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#include "berryQtWorkbenchAdvisor.h"
#include "internal/berryQtGlobalEventFilter.h"
#include "internal/berryWorkbenchPlugin.h"
#include "berryQtPreferences.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
namespace berry
{
void QtWorkbenchAdvisor::Initialize(IWorkbenchConfigurer::Pointer configurer)
{
WorkbenchAdvisor::Initialize(configurer);
IPreferencesService* prefService = WorkbenchPlugin::GetDefault()->GetPreferencesService();
IPreferences::Pointer prefs = prefService->GetSystemPreferences()->Node(QtPreferences::QT_STYLES_NODE);
QString styleName = prefs->Get(QtPreferences::QT_STYLE_NAME, "");
QString fontName = prefs->Get(QtPreferences::QT_FONT_NAME, "");
+ QString fontSize = prefs->Get(QtPreferences::QT_FONT_SIZE, "");
ctkServiceReference serviceRef = WorkbenchPlugin::GetDefault()->GetPluginContext()->getServiceReference();
if (serviceRef)
{
IQtStyleManager* styleManager = WorkbenchPlugin::GetDefault()->GetPluginContext()->getService(serviceRef);
styleManager->SetStyle(styleName);
styleManager->SetFont(fontName);
+ styleManager->SetFontSize(fontSize.toInt());
+ styleManager->UpdateWorkbenchFont();
}
QObject* eventFilter = new QtGlobalEventFilter(qApp);
qApp->installEventFilter(eventFilter);
}
}
diff --git a/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h b/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
index 3c011d72a2..8dc2d18882 100644
--- a/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
+++ b/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
@@ -1,113 +1,115 @@
/*===================================================================
BlueBerry Platform
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef BERRYIQTSTYLEMANAGER_H_
#define BERRYIQTSTYLEMANAGER_H_
#include
#include
#include
#include
namespace berry {
struct BERRY_UI_QT IQtStyleManager
{
struct Style {
QString name;
QString fileName;
Style() {}
Style(const QString& name, const QString& fn)
: name(name), fileName(fn) {}
Style& operator=(const Style& s)
{
this->name = s.name;
this->fileName = s.fileName;
return *this;
}
bool operator<(const Style& s) const
{ return name < s.name; }
bool operator==(const Style& s) const
{ return name == s.name; }
};
struct IconTheme {
QString name;
IconTheme() {}
IconTheme(const QString& name)
: name(name) {}
IconTheme& operator=(const IconTheme& s)
{
this->name = s.name;
return *this;
}
bool operator<(const IconTheme& s) const
{ return name < s.name; }
bool operator==(const IconTheme& s) const
{ return name == s.name; }
};
typedef QList