From a56119d0de43835c73418357af95c941ee7d247e Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 21 Feb 2014 22:18:08 +0400 Subject: [PATCH] added command line arguments --- sources/gui/src/CMakeLists.txt | 2 +- sources/gui/src/main.cpp | 50 +++++++++++++++++++++++++++++++++- sources/gui/src/mainwindow.cpp | 5 +++- sources/gui/src/mainwindow.h | 4 ++- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/sources/gui/src/CMakeLists.txt b/sources/gui/src/CMakeLists.txt index 830e5a5..2d7bf02 100644 --- a/sources/gui/src/CMakeLists.txt +++ b/sources/gui/src/CMakeLists.txt @@ -8,7 +8,7 @@ message (STATUS "${SUBPROJECT} Headers: ${HEADERS}") message (STATUS "${SUBPROJECT} Forms: ${FORMS}") # include_path -include_directories (${SUBPROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../) find_package (Qt4 REQUIRED) include (${QT_USE_FILE}) diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp index a5d46b6..e55bb19 100644 --- a/sources/gui/src/main.cpp +++ b/sources/gui/src/main.cpp @@ -18,13 +18,61 @@ #include +#include +#include + #include "mainwindow.h" +#include "version.h" + + +using namespace std; int main(int argc, char *argv[]) { + QString helpMessage = QString(""); + helpMessage += QApplication::translate("MainWindow", " Netctl GUI\n"); + helpMessage += QApplication::translate("MainWindow", "Version : %1 License : GPLv3\n") + .arg(QString(VERSION)); + helpMessage += QApplication::translate("MainWindow", " Evgeniy Alekseev aka arcanis\n"); + helpMessage += QApplication::translate("MainWindow", " E-mail : esalexeev@gmail.com\n\n"); + helpMessage += QApplication::translate("MainWindow", "Usage:\n"); + helpMessage += QApplication::translate("MainWindow", "netctl-gui [ --default ] [ -t NUM | --tab NUM ] [ -h | --help]\n\n"); + helpMessage += QApplication::translate("MainWindow", "Parametrs:\n"); + helpMessage += QApplication::translate("MainWindow", " --default - start with default settings\n"); + helpMessage += QApplication::translate("MainWindow", " -t NUM --tab NUM - open a tab with number NUM\n"); + helpMessage += QApplication::translate("MainWindow", " -h --help - show this help and exit\n"); + bool defaultSettings = false; + int tabNumber = 0; + + for (int i=1; i 3) + tabNumber = 3; + else + tabNumber = atoi(argv[i+1]); + i++; + } + } + QApplication a(argc, argv); - MainWindow w; + MainWindow w(0, defaultSettings, tabNumber); w.show(); return a.exec(); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index b4a29b5..b7b30e7 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -39,15 +39,18 @@ #include -MainWindow::MainWindow(QWidget *parent) +MainWindow::MainWindow(QWidget *parent, bool defaultSettings, int tabNum) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); + ui->tabWidget->setCurrentIndex(tabNum-1); ui->statusBar->showMessage(QApplication::translate("MainWindow", "Ready")); // SettingsWindow *settingsWindow; // settingsWindow = new SettingsWindow(this); + // if (defaultSettings) + // тандартные настройки // delete settingsWindow; // temporary block diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index b063547..45cf13a 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -49,7 +49,9 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = 0, + bool defaultSettings = false, + int tabNum = 0); ~MainWindow(); Netctl *netctlCommand; NetctlProfile *netctlProfile;