arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

fix some bugs

Browse Source
This commit is contained in:
arcan1s 2014-08-07 17:16:35 +04:00
parent 516c4b5a22
commit e8e0c71c05
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,10 @@ MainWindow::MainWindow(QWidget *parent,
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "settings" << args[QString("settings")].toBool(); if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "settings" << args[QString("settings")].toBool();
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tab" << args[QString("tab")].toInt(); if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "tab" << args[QString("tab")].toInt();
if (args[QString("minimized")].toInt() == 1)
isDaemon = true;
else
isDaemon = false;
createDBusSession(); createDBusSession();
updateConfiguration(args); updateConfiguration(args);
@ -156,8 +160,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
{ {
if (debug) qDebug() << "[MainWindow]" << "[closeEvent]"; if (debug) qDebug() << "[MainWindow]" << "[closeEvent]";
if ((configuration[QString("CLOSETOTRAY")] == QString("true")) && if ((QSystemTrayIcon::isSystemTrayAvailable()) &&
(trayIcon->isVisible())) { (configuration[QString("SYSTRAY")] == QString("true"))) {
hide(); hide();
event->ignore(); event->ignore();
} }
@ -305,6 +309,7 @@ void MainWindow::createObjects()
aboutWin = new AboutWindow(this, debug); aboutWin = new AboutWindow(this, debug);
errorWin = new ErrorWindow(this, debug); errorWin = new ErrorWindow(this, debug);
netctlAutoWin = new NetctlAutoWindow(this, debug, configuration); netctlAutoWin = new NetctlAutoWindow(this, debug, configuration);
settingsWin = new SettingsWindow(this, debug, configPath);
// profile widgets // profile widgets
generalWid = new GeneralWidget(this, configuration); generalWid = new GeneralWidget(this, configuration);
ui->scrollAreaWidgetContents->layout()->addWidget(generalWid); ui->scrollAreaWidgetContents->layout()->addWidget(generalWid);
@ -520,6 +525,8 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
args[QString("options")].toString()); args[QString("options")].toString());
translator->load(QString(":/translations/") + language); translator->load(QString(":/translations/") + language);
qApp->installTranslator(translator); qApp->installTranslator(translator);
// update settingsWin
delete settingsWin;
createObjects(); createObjects();
setTab(args[QString("tab")].toInt() - 1); setTab(args[QString("tab")].toInt() - 1);
@ -527,7 +534,7 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
setIconsToTabs(); setIconsToTabs();
// tray // tray
if (args[QString("minimized")].toInt() == 1) if (isDaemon)
return; return;
if ((QSystemTrayIcon::isSystemTrayAvailable()) && if ((QSystemTrayIcon::isSystemTrayAvailable()) &&
(configuration[QString("SYSTRAY")] == QString("true"))) (configuration[QString("SYSTRAY")] == QString("true")))

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

@ -145,6 +145,7 @@ private:
QString configPath; QString configPath;
bool debug; bool debug;
bool hiddenNetwork; bool hiddenNetwork;
bool isDaemon;
QTranslator *translator = nullptr; QTranslator *translator = nullptr;
// configuration // configuration
QMap<QString, QString> configuration; QMap<QString, QString> configuration;