arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-09 20:05:53 +00:00
Code Issues Projects Releases Wiki Activity

update main funtions

Browse Source 
Beta release of helper
This commit is contained in:
arcan1s
2014-08-09 21:35:55 +04:00
parent 42194295cc
commit fb430b036e
10 changed files with 133 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/gui/src/main.cpp
View File

@ -49,11 +49,15 @@ bool restoreExistSession()
int main(int argc, char *argv[])
{
// detach from console
bool debugFlag = false;
bool daemonFlag = false;
for (int i=0; i<argc; i++)
if (QString(argv[i]) == QString("--daemon")) {
daemon(0, 0);
break;
}
if (QString(argv[i]) == QString("--daemon"))
daemonFlag = true;
else if ((QString(argv[i]) == QString("-d")) || (QString(argv[i]) == QString("--debug")))
debugFlag = true;
if ((daemonFlag) && (!debugFlag))
daemon(0, 0);
QApplication a(argc, argv);
QApplication::setQuitOnLastWindowClosed(false);
// check if exists
@ -156,6 +160,8 @@ int main(int argc, char *argv[])
args[QString("error")] = true;
}
}
if ((args[QString("debug")].toBool()) && (args[QString("minimized")].toInt() == 1))
args[QString("minimized")] = (int) 0;
if (args[QString("essid")].toString() != QString("ESSID"))
args[QString("tab")] = (int) 3;
if (args[QString("open")].toString() != QString("PROFILE"))

8
sources/gui/src/mainwindow.cpp
View File

@ -116,9 +116,9 @@ MainWindow::~MainWindow()
}
QString MainWindow::getInformation()
QString MainWindow::printInformation()
{
if (debug) qDebug() << "[MainWindow]" << "[getInformation]";
if (debug) qDebug() << "[MainWindow]" << "[printInformation]";
QString profile;
QString status;
@ -146,9 +146,9 @@ QString MainWindow::getInformation()
}
QStringList MainWindow::getSettings()
QStringList MainWindow::printSettings()
{
if (debug) qDebug() << "[MainWindow]" << "[getSettings]";
if (debug) qDebug() << "[MainWindow]" << "[printSettings]";
QStringList settingsList;
for (int i=0; i<configuration.keys().count(); i++)

4
sources/gui/src/mainwindow.h
View File

@ -56,8 +56,8 @@ public:
const QMap<QString, QVariant> args = QMap<QString, QVariant>(),
QTranslator *appTranslator = 0);
~MainWindow();
QString getInformation();
QStringList getSettings();
QString printInformation();
QStringList printSettings();
bool isHelperActive();
protected:

4
sources/gui/src/netctlguiadaptor.cpp
View File

@ -41,7 +41,7 @@ bool NetctlGuiAdaptor::Close()
QString NetctlGuiAdaptor::Information()
{
return mainWindow->getInformation();
return mainWindow->printInformation();
}
@ -54,7 +54,7 @@ bool NetctlGuiAdaptor::Restore()
QStringList NetctlGuiAdaptor::Settings()
{
return mainWindow->getSettings();
return mainWindow->printSettings();
}

4
sources/gui/src/trayicon.cpp
View File

@ -52,7 +52,7 @@ int TrayIcon::showInformation()
if (supportsMessages()) {
QString title = QApplication::translate("TrayIcon", "netctl status");
QString message = mainWindow->getInformation();
QString message = mainWindow->printInformation();
showMessage(title, message, QSystemTrayIcon::Information);
}
else
@ -66,7 +66,7 @@ int TrayIcon::showInformationInWindow()
if (debug) qDebug() << "[TrayIcon]" << "[showInformationInWindow]";
QString title = QApplication::translate("TrayIcon", "netctl status");
QString message = mainWindow->getInformation();
QString message = mainWindow->printInformation();
return QMessageBox::information(0, title, message);
}