From 4e027ec19f4db699c940e3e5b4d8ddfb6ddfd0c4 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 7 Aug 2014 15:46:37 +0400 Subject: [PATCH] rewrite main() --- sources/gui/src/main.cpp | 225 ++++++--------------------- sources/gui/src/mainwindow.cpp | 71 ++++----- sources/gui/src/mainwindow.h | 13 +- sources/gui/src/messages.cpp | 157 +++++++++++++++++++ sources/gui/src/messages.h | 32 ++++ sources/gui/src/netctlguiadaptor.cpp | 2 +- sources/gui/src/netctlguiadaptor.h | 2 +- 7 files changed, 271 insertions(+), 231 deletions(-) create mode 100644 sources/gui/src/messages.cpp create mode 100644 sources/gui/src/messages.h diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index bae2486..f744e56 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -26,6 +26,7 @@ #include "language.h" #include "mainwindow.h" +#include "messages.h" #include "version.h" @@ -38,27 +39,18 @@ bool restoreExistSession() QDBusMessage request = QDBusMessage::createMethodCall(QString(DBUS_SERVICE), QString(DBUS_OBJECT_PATH), QString(DBUS_INTERFACE), - QString("RestoreWindow")); + QString("Restore")); QDBusMessage response = bus.call(request); QList arguments = response.arguments(); return ((arguments.size() == 1) && arguments[0].toBool()); } -QChar isParametrEnable(const bool parametr) -{ - if (parametr) - return QChar('*'); - else - return QChar(' '); -} - - int main(int argc, char *argv[]) { // detach from console for (int i=0; i args = getArgs(); // translation - QString language = Language::defineLanguage(configPath); + QString language = Language::defineLanguage(args[QString("config")].toString()); QTranslator translator; translator.load(QString(":/translations/") + language); a.installTranslator(&translator); - // reading command line flags - bool error = false; - // windows - int startMinimized = 0; - bool showAbout = false; - bool showNetctlAuto = false; - bool showSettings = false; - // main functions - QString selectEssid = QString("ESSID"); - QString openProfile = QString("PROFILE"); - QString selectProfile = QString("PROFILE"); - // additional functions - bool debug = false; - bool defaultSettings = false; - QString options = QString("OPTIONS"); - int tabNumber = 1; - // messages - bool showVersion = false; - bool showInfo = false; - bool showHelp = false; // reading for (int i=1; i 3) - tabNumber = 3; + args[QString("tab")] = (int) 3; else if (atoi(argv[i+1]) < 1) - tabNumber = 1; + args[QString("tab")] = (int) 1; else - tabNumber = atoi(argv[i+1]); + args[QString("tab")] = atoi(argv[i+1]); i++; } // messages - // version message - else if ((QString(argv[i]) == QString("-v")) || (QString(argv[i]) == QString("--version"))) { - showVersion = true; + // help message + else if ((QString(argv[i]) == QString("-h")) || (QString(argv[i]) == QString("--help"))) { + args[QString("help")] = true; } // info message else if ((QString(argv[i]) == QString("-i")) || (QString(argv[i]) == QString("--info"))) { - showInfo = true; + args[QString("info")] = true; } - // help message - else if ((QString(argv[i]) == QString("-h")) || (QString(argv[i]) == QString("--help"))) { - showHelp = true; + // version message + else if ((QString(argv[i]) == QString("-v")) || (QString(argv[i]) == QString("--version"))) { + args[QString("version")] = true; } else { - error = true; + args[QString("error")] = true; } } - if (selectEssid != QString("ESSID")) - tabNumber = 3; - if (openProfile != QString("PROFILE")) - tabNumber = 2; - if (selectProfile != QString("PROFILE")) - tabNumber = 1; - - // messages - QString errorMessage = QApplication::translate("MainWindow", "Unknown flag\n"); - - QString helpMessage = QString(""); - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Usage:")); - helpMessage += QString("netctl-gui [ --daemonized ] [ --maximized ] [ --minimized ]\n"); - helpMessage += QString(" [ --about ] [ --netctl-auto ] [ --settings ]\n"); - helpMessage += QString(" [ -e ESSID | --essid ESSID ] [ -o PROFILE | --open PROFILE ]\n"); - helpMessage += QString(" [ -s PROFILE | --select PROFILE ]\n"); - helpMessage += QString(" [ -c FILE | --config FILE ] [ -d | --debug ] [ --default ]\n"); - helpMessage += QString(" [ --set-opts OPTIONS ] [ -t NUM | --tab NUM ]\n"); - helpMessage += QString(" [ -v | --version ] [ -i | --info ] [ -h | --help]\n\n"); - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Parametrs:")); - // windows - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Open window:")); - helpMessage += QString("%1 --daemonized - %2\n") - .arg(isParametrEnable(startMinimized)) - .arg(QApplication::translate("MainWindow", "start daemonized")); - helpMessage += QString("%1 --maximized - %2\n") - .arg(isParametrEnable(startMinimized)) - .arg(QApplication::translate("MainWindow", "start maximized")); - helpMessage += QString("%1 --minimized - %2\n") - .arg(isParametrEnable(startMinimized)) - .arg(QApplication::translate("MainWindow", "start minimized to tray")); - helpMessage += QString("%1 --about - %2\n") - .arg(isParametrEnable(showAbout)) - .arg(QApplication::translate("MainWindow", "show about window")); - helpMessage += QString("%1 --netctl-auto - %2\n") - .arg(isParametrEnable(showNetctlAuto)) - .arg(QApplication::translate("MainWindow", "show netctl-auto window")); - helpMessage += QString("%1 --settings - %2\n") - .arg(isParametrEnable(showSettings)) - .arg(QApplication::translate("MainWindow", "show settings window")); - // main functions - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Functions:")); - helpMessage += QString(" -e %1 --essid %1 - %2\n") - .arg(selectEssid, -10) - .arg(QApplication::translate("MainWindow", "select ESSID %1").arg(selectEssid)); - helpMessage += QString(" -o %1 --open %1 - %2\n") - .arg(openProfile, -10) - .arg(QApplication::translate("MainWindow", "open profile %1").arg(openProfile)); - helpMessage += QString(" -s %1 --select %1 - %2\n") - .arg(selectProfile, -10) - .arg(QApplication::translate("MainWindow", "select profile %1").arg(selectProfile)); - // additional functions - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Additional flags:")); - helpMessage += QString(" -c %1 --config %1\n") - .arg(configPath, -10); - helpMessage += QString(" - %1\n") - .arg(QApplication::translate("MainWindow", "read configuration from this file")); - helpMessage += QString("%1 -d --debug - %2\n") - .arg(isParametrEnable(debug)) - .arg(QApplication::translate("MainWindow", "print debug information")); - helpMessage += QString("%1 --default - %2\n") - .arg(isParametrEnable(defaultSettings)) - .arg(QApplication::translate("MainWindow", "start with default settings")); - helpMessage += QString(" --set-opts %1\n") - .arg(options, -10); - helpMessage += QString(" - %1\n") - .arg(QApplication::translate("MainWindow", "set options for this run, comma separated")); - helpMessage += QString(" -t %1 --tab %1 - %2\n") - .arg(QString::number(tabNumber), -3) - .arg(QApplication::translate("MainWindow", "open a tab with number %1").arg(QString::number(tabNumber))); - // messages - helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Show messages:")); - helpMessage += QString(" -v --version - %1\n") - .arg(QApplication::translate("MainWindow", "show version and exit")); - helpMessage += QString(" -i --info - %1\n") - .arg(QApplication::translate("MainWindow", "show build information and exit")); - helpMessage += QString(" -h --help - %1\n") - .arg(QApplication::translate("MainWindow", "show this help and exit")); - - QString infoMessage = QString(""); - infoMessage += QApplication::translate("MainWindow", "Build date: %1"). - arg(QString(BUILD_DATE)); - infoMessage += QString("\n%1\n").arg(QApplication::translate("MainWindow", "cmake flags:")); - infoMessage += QString("\t-DCMAKE_BUILD_TYPE=%1 \\\n").arg(QString(CMAKE_BUILD_TYPE)); - infoMessage += QString("\t-DCMAKE_INSTALL_PREFIX=%1 \\\n").arg(QString(CMAKE_INSTALL_PREFIX)); - infoMessage += QString("\t-DBUILD_DOCS=%1 \\\n").arg(QString(PROJECT_BUILD_DOCS)); - infoMessage += QString("\t-DBUILD_LIBRARY=%1 \\\n").arg(QString(PROJECT_BUILD_LIBRARY)); - infoMessage += QString("\t-DBUILD_GUI=%1 \\\n").arg(QString(PROJECT_BUILD_GUI)); - infoMessage += QString("\t-DUSE_QT5=%1 \\\n").arg(QString(PROJECT_USE_QT5)); - infoMessage += QString("\t-DBUILD_DATAENGINE=%1 \\\n").arg(QString(PROJECT_BUILD_DATAENGINE)); - infoMessage += QString("\t-DBUILD_PLASMOID=%1\n").arg(QString(PROJECT_BUILD_PLASMOID)); - - QString versionMessage = QString(""); - versionMessage += QString("%1\n").arg(QString(NAME)); - versionMessage += QString("%1 : %2\n") - .arg(QApplication::translate("MainWindow", "Version")) - .arg(QString(VERSION)); - versionMessage += QString("%1 : %2\n") - .arg(QApplication::translate("MainWindow", "Author")) - .arg(QString(AUTHOR)); - versionMessage += QString("%1 : %2\n") - .arg(QApplication::translate("MainWindow", "License")) - .arg(QString(LICENSE)); + if (args[QString("essid")].toString() != QString("ESSID")) + args[QString("tab")] = (int) 3; + if (args[QString("open")].toString() != QString("PROFILE")) + args[QString("tab")] = (int) 2; + if (args[QString("select")].toString() != QString("PROFILE")) + args[QString("tab")] = (int) 1; // reread translations a.removeTranslator(&translator); - language = Language::defineLanguage(configPath, options); + language = Language::defineLanguage(args[QString("config")].toString(), + args[QString("options")].toString()); translator.load(QString(":/translations/") + language); a.installTranslator(&translator); // running - if (error) { - cout << errorMessage.toUtf8().data() << endl; - cout << helpMessage.toUtf8().data(); + if (args[QString("error")].toBool()) { + cout << errorMessage().toUtf8().data() << endl; + cout << helpMessage().toUtf8().data(); return 127; } - if (showInfo) { - cout << versionMessage.toUtf8().data() << endl; - cout << infoMessage.toUtf8().data(); + if (args[QString("help")].toBool()) { + cout << helpMessage().toUtf8().data(); return 0; } - if (showHelp) { - cout << helpMessage.toUtf8().data(); + if (args[QString("info")].toBool()) { + cout << versionMessage().toUtf8().data() << endl; + cout << infoMessage().toUtf8().data(); return 0; } - if (showVersion) { - cout << versionMessage.toUtf8().data(); + if (args[QString("version")].toBool()) { + cout << versionMessage().toUtf8().data(); return 0; } - MainWindow w(0, startMinimized, - showAbout, showNetctlAuto, showSettings, - selectEssid, openProfile, selectProfile, - configPath, debug, defaultSettings, options, tabNumber); + MainWindow w(0, args); return a.exec(); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index e967335..620e5fe 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -52,41 +52,30 @@ MainWindow::MainWindow(QWidget *parent, - const int startMinimized, - const bool showAbout, - const bool showNetctlAuto, - const bool showSettings, - const QString selectEssid, - const QString openProfile, - const QString selectProfile, - const QString configPath, - const bool debugCmd, - const bool defaultSettings, - const QString options, - const int tabNum) + const QMap args) : QMainWindow(parent), ui(new Ui::MainWindow), - debug(debugCmd) + debug(args[QString("debug")].toBool()) { - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "startMinimized" << startMinimized; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showAbout" << showAbout; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showNetctlAuto" << showNetctlAuto; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showSettings" << showSettings; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectEssid" << selectEssid; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "openProfile" << openProfile; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectProfile" << selectProfile; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "configPath" << configPath; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "debug" << debug; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "defaultSettings" << defaultSettings; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "options" << options; - if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tabNum" << tabNum; + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "startMinimized" << args[QString("minimized")].toInt(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showAbout" << args[QString("about")].toBool(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showNetctlAuto" << args[QString("auto")].toBool(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "showSettings" << args[QString("settings")].toBool(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectEssid" << args[QString("essid")].toString(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "openProfile" << args[QString("open")].toString(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectProfile" << args[QString("select")].toString(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "configPath" << args[QString("config")].toString(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "debug" << args[QString("debug")].toBool(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "defaultSettings" << args[QString("defaults")].toBool(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "options" << args[QString("options")].toString(); + if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tabNum" << args[QString("tab")].toInt(); // reading configuration - settingsWin = new SettingsWindow(this, debug, configPath); - if (defaultSettings) + settingsWin = new SettingsWindow(this, debug, args[QString("config")].toString()); + if (args[QString("defaults")].toBool()) settingsWin->setDefault(); configuration = settingsWin->getSettings(); - QMap optionsDict = parseOptions(options); + QMap optionsDict = parseOptions(args[QString("options")].toString()); for (int i=0; iscrollAreaWidgetContents->layout()->addWidget(wirelessWid); - setTab(tabNum-1); + setTab(args[QString("tab")].toInt()-1); createActions(); setIconsToTabs(); - if (showAbout) + if (args[QString("about")].toBool()) showAboutWindow(); - if (showNetctlAuto) + if (args[QString("auto")].toBool()) showNetctlAutoWindow(); - if (showSettings) + if (args[QString("settings")].toBool()) showSettingsWindow(); - if (selectEssid != QString("ESSID")) { + if (args[QString("essid")].toString() != QString("ESSID")) { for (int i=0; itableWidget_wifi->rowCount(); i++) - if (ui->tableWidget_wifi->item(i, 0)->text() == selectEssid) + if (ui->tableWidget_wifi->item(i, 0)->text() == args[QString("essid")].toString()) ui->tableWidget_wifi->setCurrentCell(i, 0); if (ui->tableWidget_wifi->currentItem() == 0) errorWin->showWindow(18, QString("[MainWindow] : [MainWindow]")); } - else if (openProfile != QString("PROFILE")) { - ui->comboBox_profile->addItem(openProfile); + else if (args[QString("open")].toString() != QString("PROFILE")) { + ui->comboBox_profile->addItem(args[QString("open")].toString()); ui->comboBox_profile->setCurrentIndex(ui->comboBox_profile->count()-1); } - else if (selectProfile != QString("PROFILE")) { + else if (args[QString("select")].toString() != QString("PROFILE")) { for (int i=0; itableWidget_main->rowCount(); i++) - if (ui->tableWidget_main->item(i, 0)->text() == selectProfile) + if (ui->tableWidget_main->item(i, 0)->text() == args[QString("select")].toString()) ui->tableWidget_main->setCurrentCell(i, 0); if (ui->tableWidget_main->currentItem() == 0) errorWin->showWindow(17, QString("[MainWindow] : [MainWindow]")); @@ -163,7 +152,7 @@ MainWindow::MainWindow(QWidget *parent, // tray trayIcon = new TrayIcon(this, debug); - if (startMinimized == 1) + if (args[QString("minimized")].toInt() == 1) return; if ((QSystemTrayIcon::isSystemTrayAvailable()) && (configuration[QString("SYSTRAY")] == QString("true"))) @@ -175,9 +164,9 @@ MainWindow::MainWindow(QWidget *parent, hide(); else show(); - if (startMinimized == 2) + if (args[QString("minimized")].toInt() == 2) show(); - else if (startMinimized == 3) + else if (args[QString("minimized")].toInt() == 3) hide(); } else diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index 2e41b06..3b25898 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -54,18 +54,7 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0, - const int startMinimized = false, - const bool showAbout = false, - const bool showNetctlAuto = false, - const bool showSettings = false, - const QString selectEssid = QString("ESSID"), - const QString openProfile = QString("PROFILE"), - const QString selectProfile = QString("PROFILE"), - const QString configPath = QString(""), - const bool debugCmd = false, - const bool defaultSettings = false, - const QString options = QString("OPTIONS"), - const int tabNum = 1); + const QMap args = QMap()); ~MainWindow(); QString getInformation(); QStringList getSettings(); diff --git a/sources/gui/src/messages.cpp b/sources/gui/src/messages.cpp new file mode 100644 index 0000000..25b61ae --- /dev/null +++ b/sources/gui/src/messages.cpp @@ -0,0 +1,157 @@ +/*************************************************************************** + * This file is part of netctl-gui * + * * + * netctl-gui is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * netctl-gui is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with netctl-gui. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + + +#include +#include + +#include "messages.h" +#include "version.h" + + +QString errorMessage() +{ + QString errorMessage = QApplication::translate("MainWindow", "Unknown flag\n"); + + return errorMessage; +} + + +QMap getArgs() +{ + QMap args; + // windows + args[QString("minimized")] = (int) 0; + args[QString("about")] = false; + args[QString("auto")] = false; + args[QString("settings")] = false; + // main functions + args[QString("essid")] = QString("ESSID"); + args[QString("open")] = QString("PROFILE"); + args[QString("select")] = QString("PROFILE"); + // additional functions + args[QString("config")] = QString(QDir::homePath() + QString("/.config/netctl-gui.conf")); + args[QString("debug")] = false; + args[QString("defaults")] = false; + args[QString("options")] = QString("OPTIONS"); + args[QString("tab")] = (int) 1; + // messages + args[QString("error")] = false; + args[QString("help")] = false; + args[QString("info")] = false; + args[QString("version")] = false; + + return args; +} + + +QString helpMessage() +{ + QString helpMessage = QString(""); + helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Usage:")); + helpMessage += QString("netctl-gui [ options ]\n"); + helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Options:")); + // windows + helpMessage += QString(" %1\n").arg(QApplication::translate("MainWindow", "Open window:")); + helpMessage += QString(" --daemon - %1\n") + .arg(QApplication::translate("MainWindow", "start as daemon")); + helpMessage += QString(" --maximized - %1\n") + .arg(QApplication::translate("MainWindow", "start maximized")); + helpMessage += QString(" --minimized - %1\n") + .arg(QApplication::translate("MainWindow", "start minimized to tray")); + helpMessage += QString(" --about - %1\n") + .arg(QApplication::translate("MainWindow", "show about window")); + helpMessage += QString(" --netctl-auto - %1\n") + .arg(QApplication::translate("MainWindow", "show netctl-auto window")); + helpMessage += QString(" --settings - %1\n") + .arg(QApplication::translate("MainWindow", "show settings window")); + // main functions + helpMessage += QString(" %1\n").arg(QApplication::translate("MainWindow", "Functions:")); + helpMessage += QString(" -e, --essid - %1\n") + .arg(QApplication::translate("MainWindow", "select this ESSID")); + helpMessage += QString(" -o, --open - %1\n") + .arg(QApplication::translate("MainWindow", "open this profile")); + helpMessage += QString(" -s, --select - %1\n") + .arg(QApplication::translate("MainWindow", "select this profile")); + // additional functions + helpMessage += QString(" %1\n").arg(QApplication::translate("MainWindow", "Additional flags:")); + helpMessage += QString(" -c, --config - %1\n") + .arg(QApplication::translate("MainWindow", "read configuration from this file")); + helpMessage += QString(" -d, --debug - %1\n") + .arg(QApplication::translate("MainWindow", "print debug information")); + helpMessage += QString(" --default - %1\n") + .arg(QApplication::translate("MainWindow", "start with default settings")); + helpMessage += QString(" --set-opts - %1\n") + .arg(QApplication::translate("MainWindow", "set options for this run, comma separated")); + helpMessage += QString(" -t, --tab - %1\n") + .arg(QApplication::translate("MainWindow", "open a tab with this number")); + // messages + helpMessage += QString(" %1\n").arg(QApplication::translate("MainWindow", "Show messages:")); + helpMessage += QString(" -v, --version - %1\n") + .arg(QApplication::translate("MainWindow", "show version and exit")); + helpMessage += QString(" -i, --info - %1\n") + .arg(QApplication::translate("MainWindow", "show build information and exit")); + helpMessage += QString(" -h, --help - %1\n") + .arg(QApplication::translate("MainWindow", "show this help and exit")); + + return helpMessage; +} + + +QString infoMessage() +{ + QString infoMessage = QString(""); + // build information + infoMessage += QApplication::translate("MainWindow", "Build date: %1"). + arg(QString(BUILD_DATE)); + infoMessage += QString("\n%1:\n").arg(QApplication::translate("MainWindow", "cmake flags")); + infoMessage += QString("\t-DCMAKE_BUILD_TYPE=%1 \\\n").arg(QString(CMAKE_BUILD_TYPE)); + infoMessage += QString("\t-DCMAKE_INSTALL_PREFIX=%1 \\\n").arg(QString(CMAKE_INSTALL_PREFIX)); + infoMessage += QString("\t-DBUILD_DOCS=%1 \\\n").arg(QString(PROJECT_BUILD_DOCS)); + infoMessage += QString("\t-DBUILD_LIBRARY=%1 \\\n").arg(QString(PROJECT_BUILD_LIBRARY)); + infoMessage += QString("\t-DBUILD_GUI=%1 \\\n").arg(QString(PROJECT_BUILD_GUI)); + infoMessage += QString("\t-DUSE_QT5=%1 \\\n").arg(QString(PROJECT_USE_QT5)); + infoMessage += QString("\t-DBUILD_DATAENGINE=%1 \\\n").arg(QString(PROJECT_BUILD_DATAENGINE)); + infoMessage += QString("\t-DBUILD_PLASMOID=%1\n").arg(QString(PROJECT_BUILD_PLASMOID)); + // transport information + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "DBus configuration")); + infoMessage += QString("\tDBUS_SERVICE=%1\n").arg(QString(DBUS_SERVICE)); + infoMessage += QString("\tDBUS_INTERFACE=%1\n").arg(QString(DBUS_INTERFACE)); + infoMessage += QString("\tDBUS_CONTROL_PATH=%1\n").arg(QString(DBUS_CONTROL_PATH)); + infoMessage += QString("\tDBUS_LIB_PATH=%1\n").arg(QString(DBUS_LIB_PATH)); + infoMessage += QString("\tDBUS_OBJECT_PATH=%1\n").arg(QString(DBUS_OBJECT_PATH)); + + return infoMessage; +} + + +QString versionMessage() +{ + QString versionMessage = QString(""); + versionMessage += QString("%1\n").arg(QString(NAME)); + versionMessage += QString("%1 : %2\n") + .arg(QApplication::translate("MainWindow", "Version")) + .arg(QString(VERSION)); + versionMessage += QString("%1 : %2\n") + .arg(QApplication::translate("MainWindow", "Author")) + .arg(QString(AUTHOR)); + versionMessage += QString("%1 : %2\n") + .arg(QApplication::translate("MainWindow", "License")) + .arg(QString(LICENSE)); + + return versionMessage; +} diff --git a/sources/gui/src/messages.h b/sources/gui/src/messages.h new file mode 100644 index 0000000..fe8b1f3 --- /dev/null +++ b/sources/gui/src/messages.h @@ -0,0 +1,32 @@ +/*************************************************************************** + * This file is part of netctl-gui * + * * + * netctl-gui is free software: you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * netctl-gui is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with netctl-gui. If not, see http://www.gnu.org/licenses/ * + ***************************************************************************/ + +#ifndef MESSAGES_H +#define MESSAGES_H + +#include +#include + + +QString errorMessage(); +QMap getArgs(); +QString helpMessage(); +QString infoMessage(); +QString versionMessage(); + + +#endif /* MESSAGES_H */ diff --git a/sources/gui/src/netctlguiadaptor.cpp b/sources/gui/src/netctlguiadaptor.cpp index 1d48b5b..3d80bcd 100644 --- a/sources/gui/src/netctlguiadaptor.cpp +++ b/sources/gui/src/netctlguiadaptor.cpp @@ -45,7 +45,7 @@ QString NetctlGuiAdaptor::Information() } -bool NetctlGuiAdaptor::RestoreWindow() +bool NetctlGuiAdaptor::Restore() { mainWindow->show(); return true; diff --git a/sources/gui/src/netctlguiadaptor.h b/sources/gui/src/netctlguiadaptor.h index ec5ef78..f2f00c9 100644 --- a/sources/gui/src/netctlguiadaptor.h +++ b/sources/gui/src/netctlguiadaptor.h @@ -36,7 +36,7 @@ public: public slots: bool Close(); QString Information(); - bool RestoreWindow(); + bool Restore(); QStringList Settings(); bool ShowAbout(); bool ShowMain();