From 7cf83493fdaca88fd3dbc736d5ca9d86dd7f9e83 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 18 May 2016 17:32:42 +0200 Subject: [shared/server] define preferred styles and enable it if supported --- src/server/main.cpp | 10 +++++++++- src/shared/settings.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/main.cpp b/src/server/main.cpp index d77d77f..8729af5 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -2,6 +2,7 @@ #include #include "mainwindow/mainwindow.h" #include "util/util.h" +#include "../shared/settings.h" int main(int argc, char** argv) { @@ -16,7 +17,14 @@ int main(int argc, char** argv) app.setOrganizationName("openslx"); app.setOrganizationDomain("openslx.org"); app.setApplicationName("pvsmgr"); - + QStringList supportedStyles = QStyleFactory::keys(); + for (QString style : PREFERRED_STYLES) { + if (supportedStyles.contains(style)) { + qDebug() << "Setting style to: " << style; + app.setStyle(style); + break; + } + } qsrand((uint)QDateTime::currentMSecsSinceEpoch()); diff --git a/src/shared/settings.h b/src/shared/settings.h index 2713693..7b1fc3c 100644 --- a/src/shared/settings.h +++ b/src/shared/settings.h @@ -2,11 +2,12 @@ #define _SETTINGS_H_ #include +#include #define CLIENT_PORT 5194 static const QString CLIENT_PORT_STR(QString::number(CLIENT_PORT)); static const QByteArray CLIENT_PORT_ARRAY(QString::number(CLIENT_PORT).toUtf8()); - +static const QStringList PREFERRED_STYLES(QStringList() << "GTK+" << "Motif" << "Plastique" << "Windows"); #define SERVICE_DISCOVERY_PORT 3492 #define PING_TIMEOUT_MS 30000 -- cgit v1.2.3-55-g7522