Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split style arguments

This commit is contained in:
Martchus 2019-05-04 23:34:19 +02:00
parent df120f4b73
commit 8c9d834b68
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/qtconfigarguments.cpp
View File

@ -26,7 +26,6 @@ namespace ApplicationUtilities {
/*! /*!
* \brief Constructs new Qt config arguments. * \brief Constructs new Qt config arguments.
* \todo Split style args in v6.
*/ */
QtConfigArguments::QtConfigArguments() QtConfigArguments::QtConfigArguments()
: m_qtWidgetsGuiArg("qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface") : m_qtWidgetsGuiArg("qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface")
@ -36,7 +35,8 @@ QtConfigArguments::QtConfigArguments()
"enables QML debugging (see " "enables QML debugging (see "
"http://doc.qt.io/qt-5/" "http://doc.qt.io/qt-5/"
"qtquick-debugging.html)") "qtquick-debugging.html)")
, m_styleArg("style", '\0', "sets the Qt Widgets or Qt Quick style") , m_widgetsStyleArg("widgets-style", '\0', "sets the Qt Widgets style")
, m_quickControls2StyleArg("qqc2-style", '\0', "sets the Qt Quick Controls 2 style")
, m_iconThemeArg("icon-theme", '\0', , m_iconThemeArg("icon-theme", '\0',
"sets the icon theme and additional " "sets the icon theme and additional "
"theme search paths for the Qt GUI") "theme search paths for the Qt GUI")
@ -57,10 +57,14 @@ QtConfigArguments::QtConfigArguments()
m_qmlDebuggerArg.setRequiredValueCount(1); m_qmlDebuggerArg.setRequiredValueCount(1);
m_qmlDebuggerArg.setCombinable(true); m_qmlDebuggerArg.setCombinable(true);
// appearance // appearance
m_styleArg.setValueNames({ "breeze/cleanlooks/fusion/kvantum/oxygen/adwaita/windows/... or default/material/universal/org.kde.desktop" }); m_widgetsStyleArg.setValueNames({ "breeze/cleanlooks/fusion/kvantum/oxygen/adwaita/windows/..." });
m_styleArg.setRequiredValueCount(1); m_widgetsStyleArg.setRequiredValueCount(1);
m_styleArg.setCombinable(true); m_widgetsStyleArg.setCombinable(true);
m_styleArg.setEnvironmentVariable("QT_STYLE_OVERRIDE for Qt Widgets and QT_QUICK_CONTROLS_STYLE for Qt Quick"); m_widgetsStyleArg.setEnvironmentVariable("QT_STYLE_OVERRIDE");
m_quickControls2StyleArg.setValueNames({ "default/material/universal/org.kde.desktop/..." });
m_quickControls2StyleArg.setRequiredValueCount(1);
m_quickControls2StyleArg.setCombinable(true);
m_quickControls2StyleArg.setEnvironmentVariable("QT_QUICK_CONTROLS_STYLE");
m_iconThemeArg.setValueNames({ "theme name", "search path 1", "search path 2" }); m_iconThemeArg.setValueNames({ "theme name", "search path 1", "search path 2" });
m_iconThemeArg.setRequiredValueCount(Argument::varValueCount); m_iconThemeArg.setRequiredValueCount(Argument::varValueCount);
m_iconThemeArg.setCombinable(true); m_iconThemeArg.setCombinable(true);
@ -82,9 +86,9 @@ QtConfigArguments::QtConfigArguments()
m_sceneGraphRenderLoopArg.setPreDefinedCompletionValues("basic windows threaded"); m_sceneGraphRenderLoopArg.setPreDefinedCompletionValues("basic windows threaded");
m_sceneGraphRenderLoopArg.setEnvironmentVariable("QSG_RENDER_LOOP"); m_sceneGraphRenderLoopArg.setEnvironmentVariable("QSG_RENDER_LOOP");
m_qtWidgetsGuiArg.setSubArguments( m_qtWidgetsGuiArg.setSubArguments(
{ &m_lngArg, &m_qmlDebuggerArg, &m_styleArg, &m_iconThemeArg, &m_fontArg, &m_libraryPathsArg, &m_platformThemeArg }); { &m_lngArg, &m_qmlDebuggerArg, &m_widgetsStyleArg, &m_iconThemeArg, &m_fontArg, &m_libraryPathsArg, &m_platformThemeArg });
m_qtQuickGuiArg.setSubArguments({ &m_lngArg, &m_qmlDebuggerArg, &m_styleArg, &m_iconThemeArg, &m_fontArg, &m_libraryPathsArg, &m_platformThemeArg, m_qtQuickGuiArg.setSubArguments({ &m_lngArg, &m_qmlDebuggerArg, &m_quickControls2StyleArg, &m_iconThemeArg, &m_fontArg, &m_libraryPathsArg,
&m_sceneGraphRenderLoopArg }); &m_platformThemeArg, &m_sceneGraphRenderLoopArg });
m_qtWidgetsGuiArg.setDenotesOperation(true); m_qtWidgetsGuiArg.setDenotesOperation(true);
m_qtQuickGuiArg.setDenotesOperation(true); m_qtQuickGuiArg.setDenotesOperation(true);
#if defined(QT_UTILITIES_GUI_QTWIDGETS) #if defined(QT_UTILITIES_GUI_QTWIDGETS)
@ -106,8 +110,8 @@ void QtConfigArguments::applySettings(bool preventApplyingDefaultFont) const
QLocale::setDefault(QLocale(QString::fromLocal8Bit(m_lngArg.values().front()))); QLocale::setDefault(QLocale(QString::fromLocal8Bit(m_lngArg.values().front())));
} }
#ifdef QT_UTILITIES_GUI_QTWIDGETS #ifdef QT_UTILITIES_GUI_QTWIDGETS
if (m_qtWidgetsGuiArg.isPresent() && m_styleArg.isPresent()) { if (m_widgetsStyleArg.isPresent()) {
if (QStyle *const style = QStyleFactory::create(QString::fromLocal8Bit(m_styleArg.values().front()))) { if (QStyle *const style = QStyleFactory::create(QString::fromLocal8Bit(m_widgetsStyleArg.values().front()))) {
QApplication::setStyle(style); QApplication::setStyle(style);
} else { } else {
cerr << Phrases::Warning << "Can not find the specified Qt Widgets style." << Phrases::EndFlush; cerr << Phrases::Warning << "Can not find the specified Qt Widgets style." << Phrases::EndFlush;

7
resources/qtconfigarguments.h
View File

@ -37,7 +37,8 @@ private:
Argument m_qtQuickGuiArg; Argument m_qtQuickGuiArg;
Argument m_lngArg; Argument m_lngArg;
Argument m_qmlDebuggerArg; Argument m_qmlDebuggerArg;
Argument m_styleArg; Argument m_widgetsStyleArg;
Argument m_quickControls2StyleArg;
Argument m_iconThemeArg; Argument m_iconThemeArg;
Argument m_fontArg; Argument m_fontArg;
Argument m_libraryPathsArg; Argument m_libraryPathsArg;
@ -83,8 +84,8 @@ inline bool QtConfigArguments::areQtGuiArgsPresent() const
*/ */
inline void QtConfigArguments::applySettingsForQuickGui() const inline void QtConfigArguments::applySettingsForQuickGui() const
{ {
if (m_qtQuickGuiArg.isPresent() && m_styleArg.isPresent()) { if (m_quickControls2StyleArg.isPresent()) {
QQuickStyle::setStyle(QString::fromLocal8Bit(m_styleArg.values().front())); QQuickStyle::setStyle(QString::fromLocal8Bit(m_quickControls2StyleArg.values().front()));
} }
#ifdef QT_UTILITIES_DEFAULT_QQC2_STYLE #ifdef QT_UTILITIES_DEFAULT_QQC2_STYLE
else if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) { else if (qEnvironmentVariableIsEmpty("QT_QUICK_CONTROLS_STYLE")) {