arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-08 03:15:54 +00:00
Code Issues Projects Releases Wiki Activity

small edit of showing information

Browse Source
This commit is contained in:
arcan1s
2014-08-18 21:17:53 +04:00
parent 709431ead2
commit 8b58f6d383
9 changed files with 182 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sources/gui/src/mainpublicslots.cpp
View File

@ -480,10 +480,33 @@ void MainWindow::connectToUnknownEssid(const QString passwd)
netctlCommand->startProfile(profile);
status = netctlCommand->isProfileActive(profile);
}
if (status)
QString message;
if (status) {
message = QApplication::translate("MainWindow", "Connection is successfully.");
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done"));
else
} else {
message = QApplication::translate("MainWindow", "Connection failed.");
ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error"));
}
message += QString("\n");
message += QApplication::translate("MainWindow", "Do you want to save profile %1?").arg(profile);
int select = QMessageBox::question(this, QApplication::translate("MainWindow", "WiFi menu"),
message, QMessageBox::Save | QMessageBox::Discard, QMessageBox::Save);
switch (select) {
case QMessageBox::Save:
break;
case QMessageBox::Discard:
default:
if (useHelper) {
QList<QVariant> args;
args.append(profile);
sendDBusRequest(DBUS_HELPER_SERVICE, DBUS_CTRL_PATH,
DBUS_HELPER_INTERFACE, QString("Remove"),
args, true, debug)[0].toBool();
} else
netctlProfile->removeProfile(profile);
break;
}
updateWifiTab();
}

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

@ -56,6 +56,7 @@ MainWindow::MainWindow(QWidget *parent,
qtTranslator(qtAppTranslator),
translator(appTranslator)
{
setWindowIcon(QIcon(":icon"));
if (debug) qDebug() << PDEBUG << ":" << "about" << args[QString("about")].toBool();
if (debug) qDebug() << PDEBUG << ":" << "auto" << args[QString("auto")].toBool();
if (debug) qDebug() << PDEBUG << ":" << "config" << configPath;

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

@ -96,18 +96,23 @@ void TrayIcon::updateMenu()
contextMenu[QString("title")]->setText(QApplication::translate("TrayIcon", "(inactive)"));
} else {
contextMenu[QString("title")]->setIcon(QIcon(QString(":network-idle-64x64")));
QStringList status;
if (netctlAutoStatus)
QStringList currentProfiles, status;
if (netctlAutoStatus) {
currentProfiles.append(current);
status.append(QApplication::translate("TrayIcon", "(netctl-auto)"));
else {
for (int i=0; i<enabled.split(QChar('|')).count(); i++)
} else {
for (int i=0; i<enabled.split(QChar('|')).count(); i++) {
currentProfiles.append(current.split(QChar('|'))[i]);
if (enabled.split(QChar('|'))[i] == QString("0"))
status.append(QApplication::translate("TrayIcon", "static"));
else
status.append(QApplication::translate("TrayIcon", "enabled"));
}
}
contextMenu[QString("title")]->setText(current + QString(" ") +
QString("(") + status.join(QChar('|')) + QString(")"));
QStringList profiles;
for (int i=0; i<currentProfiles.count(); i++)
profiles.append(currentProfiles[i] + QString(" (") + status[i] + QString(")"));
contextMenu[QString("title")]->setText(profiles.join(QString(" | ")));
}
if (netctlAutoStatus) {