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 kde4 build

Browse Source 
fix tray destruction on KF5
This commit is contained in:
arcan1s 2015-03-16 08:52:23 +03:00
parent a2b1d46900
commit e4bcfb1653
6 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/.kdev4/sources.kdev4
View File

@ -8,7 +8,7 @@ ProjectRootRelative=./
[CMake][CMake Build Directory 0]
Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build
Build Type=Release
Build Type=Debug
CMake Binary=file:///usr/bin/cmake
Environment Profile=
Extra Arguments=

18
sources/gui/src/mainwidget.cpp
View File

@ -148,8 +148,7 @@ void MainWidget::updateMainTab()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
mainWindow->setDisabled(true);
@ -299,8 +298,7 @@ void MainWidget::mainTabEnableProfile()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -335,8 +333,7 @@ void MainWidget::mainTabRestartProfile()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -355,8 +352,7 @@ void MainWidget::mainTabStartProfile()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
if (ui->tableWidget_main->currentItem() == nullptr) return;
@ -375,8 +371,7 @@ void MainWidget::mainTabStopAllProfiles()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
mainWindow->setDisabled(true);
@ -393,8 +388,7 @@ void MainWidget::mainTabSwitchToProfile()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("netctl"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
if (ui->tableWidget_main->currentItem() == nullptr) return;

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

@ -121,6 +121,14 @@ Qt::ToolBarArea MainWindow::getToolBarArea()
}
void MainWindow::emitNeedToBeConfigured()
{
if (debug) qDebug() << PDEBUG;
emit(needToBeConfigured());
}
QStringList MainWindow::printSettings()
{
if (debug) qDebug() << PDEBUG;

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

@ -48,6 +48,7 @@ public:
QTranslator *appTranslator = 0);
~MainWindow();
Qt::ToolBarArea getToolBarArea();
void emitNeedToBeConfigured();
QStringList printSettings();
netctlCurrent printTrayInformation();
bool isHelperActive();
@ -86,9 +87,6 @@ public slots:
signals:
void needToBeConfigured();
void needShowAboutWindow();
void needShowNetctlAutoWindow();
void needShowSettingsWindow();
private slots:
void setTabByAction(QAction *action);

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

@ -41,11 +41,10 @@ TrayIcon::~TrayIcon()
{
if (debug) qDebug() << PDEBUG;
setContextMenu(0);
setContextMenu(nullptr);
startProfileMenu->clear();
switchToProfileMenu->clear();
menuActions->clear();
delete menuActions;
}
@ -100,8 +99,6 @@ void TrayIcon::updateMenu()
for (int i=0; i<info.profiles.count(); i++)
startProfileMenu->addAction(info.profiles[i]);
}
// setContextMenu(menuActions);
}

9
sources/gui/src/wifimenuwidget.cpp
View File

@ -184,8 +184,7 @@ void WiFiMenuWidget::updateText(const netctlWifiInfo current)
if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
ui->label_wifi->setText(QApplication::translate("WiFiMenuWidget", "Processing..."));
@ -203,8 +202,7 @@ void WiFiMenuWidget::updateWifiTab()
if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
mainWindow->setDisabled(true);
@ -366,8 +364,7 @@ void WiFiMenuWidget::wifiTabStart()
if (debug) qDebug() << PDEBUG;
if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
ErrorWindow::showWindow(1, QString(PDEBUG), debug);
emit(mainWindow->needToBeConfigured());
return;
return mainWindow->emitNeedToBeConfigured();
}
if (ui->tableWidget_wifi->currentItem() == nullptr) return;