From 6dab355d87edf0b68e0af9b6a54baea8c9cb3646 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 10 Jul 2014 14:33:04 +0400 Subject: [PATCH] added all icons --- README.md | 2 ++ sources/gui/src/mainwindow.cpp | 37 ++++++++++++++++++++++------------ sources/plasmoid/netctl.cpp | 7 +++---- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 1c38519..c7ebb6d 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,8 @@ Additional information TODO (wish list) ---------------- +* netctl-auto frontend + Links ----- diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 76519c3..1d131cd 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -196,9 +196,7 @@ void MainWindow::setIconsToButtons() // main tab ui->pushButton_mainRefresh->setIcon(QIcon::fromTheme("stock-refresh")); ui->pushButton_mainRemove->setIcon(QIcon::fromTheme("edit-delete")); -// ui->pushButton_mainEnable->setIcon(QIcon("")); -// ui->pushButton_mainRestart->setIcon(QIcon("")); -// ui->pushButton_mainStart->setIcon(QIcon("")); + ui->pushButton_mainRestart->setIcon(QIcon::fromTheme("stock-refresh")); // profile tab ui->pushButton_profileClear->setIcon(QIcon::fromTheme("edit-clear")); @@ -347,11 +345,9 @@ void MainWindow::mainTabContextualMenu(const QPoint &pos) refreshTable->setIcon(QIcon::fromTheme("stock-refresh")); menu.addSeparator(); QAction *startProfile = menu.addAction(QApplication::translate("MainWindow", "Start profile")); -// startProfile->setIcon(QIcon("")); QAction *restartProfile = menu.addAction(QApplication::translate("MainWindow", "Restart profile")); -// restartProfile->setIcon(QIcon("")); + restartProfile->setIcon(QIcon::fromTheme("stock-refresh")); QAction *enableProfile = menu.addAction(QApplication::translate("MainWindow", "Enable profile")); -// enableProfile->setIcon(QIcon("")); menu.addSeparator(); QAction *removeProfile = menu.addAction(QApplication::translate("MainWindow", "Remove profile")); removeProfile->setIcon(QIcon::fromTheme("edit-delete")); @@ -361,10 +357,12 @@ void MainWindow::mainTabContextualMenu(const QPoint &pos) if (!checkState(QString("inactive"), item)) { restartProfile->setVisible(true); startProfile->setText(QApplication::translate("MainWindow", "Stop profile")); + startProfile->setIcon(QIcon::fromTheme("dialog-close")); } else { restartProfile->setVisible(false); startProfile->setText(QApplication::translate("MainWindow", "Start profile")); + startProfile->setIcon(QIcon::fromTheme("dialog-apply")); } if (checkState(QString("enabled"), item)) enableProfile->setText(QApplication::translate("MainWindow", "Disable profile")); @@ -518,10 +516,12 @@ void MainWindow::mainTabRefreshButtons(QTableWidgetItem *current, QTableWidgetIt if (!checkState(QString("inactive"), item)) { ui->pushButton_mainRestart->setEnabled(true); ui->pushButton_mainStart->setText(QApplication::translate("MainWindow", "Stop")); + ui->pushButton_mainStart->setIcon(QIcon::fromTheme("dialog-close")); } else { ui->pushButton_mainRestart->setDisabled(true); ui->pushButton_mainStart->setText(QApplication::translate("MainWindow", "Start")); + ui->pushButton_mainStart->setIcon(QIcon::fromTheme("dialog-apply")); } if (checkState(QString("enabled"), item)) ui->pushButton_mainEnable->setText(QApplication::translate("MainWindow", "Disable")); @@ -996,18 +996,23 @@ void MainWindow::wifiTabContextualMenu(const QPoint &pos) refreshTable->setIcon(QIcon::fromTheme("stock-refresh")); menu.addSeparator(); QAction *startWifi = menu.addAction(QApplication::translate("MainWindow", "Start WiFi")); -// startWifi->setIcon(QIcon("")); // set text QString item = ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 1)->text(); if (checkState(QString("exists"), item)) { - if (!checkState(QString("inactive"), item)) + if (!checkState(QString("inactive"), item)) { startWifi->setText(QApplication::translate("MainWindow", "Stop WiFi")); - else + startWifi->setIcon(QIcon::fromTheme("dialog-close")); + } + else { startWifi->setText(QApplication::translate("MainWindow", "Start WiFi")); + startWifi->setIcon(QIcon::fromTheme("dialog-apply")); + } } - else + else { startWifi->setText(QApplication::translate("MainWindow", "Start WiFi")); + startWifi->setIcon(QIcon::fromTheme("dialog-apply")); + } // actions QAction *action = menu.exec(ui->tableWidget_main->viewport()->mapToGlobal(pos)); @@ -1167,11 +1172,17 @@ void MainWindow::wifiTabRefreshButtons(QTableWidgetItem *current, QTableWidgetIt ui->pushButton_wifiStart->setEnabled(true); QString item = ui->tableWidget_wifi->item(current->row(), 1)->text(); if (checkState(QString("exists"), item)) { - if (!checkState(QString("inactive"), item)) + if (!checkState(QString("inactive"), item)) { ui->pushButton_wifiStart->setText(QApplication::translate("MainWindow", "Stop")); - else + ui->pushButton_wifiStart->setIcon(QIcon::fromTheme("dialog-close")); + } + else { ui->pushButton_wifiStart->setText(QApplication::translate("MainWindow", "Start")); + ui->pushButton_wifiStart->setIcon(QIcon::fromTheme("dialog-apply")); + } } - else + else { ui->pushButton_wifiStart->setText(QApplication::translate("MainWindow", "Start")); + ui->pushButton_wifiStart->setIcon(QIcon::fromTheme("dialog-apply")); + } } diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index 2dec490..18d139b 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -222,7 +222,7 @@ void Netctl::createActions() menuActions.append(contextMenu[QString("title")]); contextMenu[QString("start")] = new QAction(i18n("Start profile"), this); -// contextMenu[QString("start")]->setIcon(QIcon("")); + contextMenu[QString("start")]->setIcon(QIcon::fromTheme("dialog-apply")); startProfileMenu = new QMenu(NULL); contextMenu[QString("start")]->setMenu(startProfileMenu); connect(startProfileMenu, SIGNAL(triggered(QAction *)), this, @@ -230,17 +230,16 @@ void Netctl::createActions() menuActions.append(contextMenu[QString("start")]); contextMenu[QString("stop")] = new QAction(i18n("Stop profile"), this); -// contextMenu[QString("stop")]->setIcon(QIcon("")); + contextMenu[QString("stop")]->setIcon(QIcon::fromTheme("dialog-close")); connect(contextMenu[QString("stop")], SIGNAL(triggered(bool)), this, SLOT(stopProfileSlot())); menuActions.append(contextMenu[QString("stop")]); contextMenu[QString("restart")] = new QAction(i18n("Restart profile"), this); -// contextMenu[QString("restart")]->setIcon(QIcon("")); + contextMenu[QString("restart")]->setIcon(QIcon::fromTheme("stock-refresh")); connect(contextMenu[QString("restart")], SIGNAL(triggered(bool)), this, SLOT(restartProfileSlot())); menuActions.append(contextMenu[QString("restart")]); contextMenu[QString("enable")] = new QAction(i18n("Enable profile"), this); -// contextMenu[QString("enable")]->setIcon(QIcon("")); connect(contextMenu[QString("enable")], SIGNAL(triggered(bool)), this, SLOT(enableProfileSlot())); menuActions.append(contextMenu[QString("enable")]);