update gui

This commit is contained in:
arcan1s 2014-08-06 00:12:52 +04:00
parent 64937105c6
commit 4c9c7b00a1
13 changed files with 264 additions and 227 deletions

View File

@ -63,7 +63,6 @@ Additional information
TODO (wish list)
----------------
* refactoring of GUI according to library changes
* rewrite changelog to more comfortable format
Links

View File

@ -10,7 +10,7 @@ set (PROJECT_AUTHOR "Evgeniy Alekseev")
set (PROJECT_CONTACT "esalexeev@gmail.com")
set (PROJECT_LICENSE "GPLv3")
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 2)
set (PROJECT_VERSION_MINOR 3)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)

View File

@ -49,6 +49,12 @@ void AboutWindow::createText()
{
if (debug) qDebug() << "[AboutWindow]" << "[createText]";
QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
for (int i=0; i<trdPartyList.count(); i++)
trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
.arg(trdPartyList[i].split(QChar(','))[0])
.arg(trdPartyList[i].split(QChar(','))[1])
.arg(trdPartyList[i].split(QChar(','))[2]);
uiAbout->label_name->setText(QString(NAME));
uiAbout->label_version->setText(QApplication::translate("AboutWindow", "Version %1\n(build date %2)")
.arg(QString(VERSION)).arg(QString(BUILD_DATE)));
@ -61,8 +67,8 @@ void AboutWindow::createText()
QString("<a href=\"%1\">%2</a><br>").arg(QString(TRANSLATION)).arg(QApplication::translate("AboutWindow", "Translation issue")) +\
QString("<a href=\"%1\">%2</a>").arg(QString(AUR_PACKAGES)).arg(QApplication::translate("AboutWindow", "AUR packages")));
uiAbout->label_license->setText(QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) +
QApplication::translate("AboutWindow", "This software is licensed under %1").arg(QString(LICENSE)) +
QString("</small>"));
QApplication::translate("AboutWindow", "This software is licensed under %1").arg(QString(LICENSE)) + QString("<br>") +
QApplication::translate("AboutWindow", "This software uses: %1").arg(trdPartyList.join(QString(", "))) + QString("</small>"));
}

View File

@ -396,7 +396,7 @@ void MainWindow::updateMainTab()
return errorWin->showWindow(1, QString("[MainWindow] : [updateMainTab]"));
ui->tabWidget->setDisabled(true);
QList<QStringList> profiles = netctlCommand->getProfileList();
QList<netctlProfileInfo> profiles = netctlCommand->getProfileList();
if (netctlCommand->isNetctlAutoRunning())
ui->widget_netctlAuto->setHidden(false);
@ -418,13 +418,13 @@ void MainWindow::updateMainTab()
// create items
for (int i=0; i<profiles.count(); i++) {
// name
ui->tableWidget_main->setItem(i, 0, new QTableWidgetItem(profiles[i][0]));
ui->tableWidget_main->setItem(i, 0, new QTableWidgetItem(profiles[i].name));
ui->tableWidget_main->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
// description
ui->tableWidget_main->setItem(i, 1, new QTableWidgetItem(profiles[i][1]));
ui->tableWidget_main->setItem(i, 1, new QTableWidgetItem(profiles[i].description));
ui->tableWidget_main->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
// status
ui->tableWidget_main->setItem(i, 2, new QTableWidgetItem(profiles[i][2]));
ui->tableWidget_main->setItem(i, 2, new QTableWidgetItem(profiles[i].status));
ui->tableWidget_main->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
}
@ -513,9 +513,9 @@ void MainWindow::updateWifiTab()
if (!checkExternalApps(QString("wpasup")))
return errorWin->showWindow(1, QString("[MainWindow] : [updateWifiTab]"));
QList<QStringList> scanResults = wpaCommand->scanWifi();
ui->tabWidget->setDisabled(true);
QList<netctlWifiInfo> scanResults = wpaCommand->scanWifi();
ui->tableWidget_wifi->setSortingEnabled(false);
ui->tableWidget_wifi->selectRow(-1);
ui->tableWidget_wifi->sortByColumn(0, Qt::AscendingOrder);
@ -532,16 +532,16 @@ void MainWindow::updateWifiTab()
// create items
for (int i=0; i<scanResults.count(); i++) {
// name
ui->tableWidget_wifi->setItem(i, 0, new QTableWidgetItem(scanResults[i][0]));
ui->tableWidget_wifi->setItem(i, 0, new QTableWidgetItem(scanResults[i].name));
ui->tableWidget_wifi->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
// status
ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(scanResults[i][1]));
ui->tableWidget_wifi->setItem(i, 1, new QTableWidgetItem(scanResults[i].status));
ui->tableWidget_wifi->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
// signal
ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(scanResults[i][2]));
ui->tableWidget_wifi->setItem(i, 2, new QTableWidgetItem(scanResults[i].signal));
ui->tableWidget_wifi->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
// security
ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(scanResults[i][3]));
ui->tableWidget_wifi->setItem(i, 3, new QTableWidgetItem(scanResults[i].security));
ui->tableWidget_wifi->item(i, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
}
@ -936,9 +936,9 @@ void MainWindow::profileTabClear()
if (debug) qDebug() << "[MainWindow]" << "[profileTabClear]";
ui->comboBox_profile->clear();
QList<QStringList> profiles = netctlCommand->getProfileList();
QList<netctlProfileInfo> profiles = netctlCommand->getProfileList();
for (int i=0; i<profiles.count(); i++)
ui->comboBox_profile->addItem(profiles[i][0]);
ui->comboBox_profile->addItem(profiles[i].name);
ui->comboBox_profile->setCurrentIndex(-1);
generalWid->clear();
@ -1268,12 +1268,12 @@ void MainWindow::connectToUnknownEssid(const QString passwd)
if (passwdWid != 0)
delete passwdWid;
if (netctlCommand->getInterfaceList().isEmpty())
if (netctlCommand->getWirelessInterfaceList().isEmpty())
return;
QMap<QString, QString> settings;
settings[QString("Description")] = QString("'Automatically generated profile by Netctl GUI'");
settings[QString("Interface")] = netctlCommand->getInterfaceList()[0];
settings[QString("Interface")] = netctlCommand->getWirelessInterfaceList()[0];
settings[QString("Connection")] = QString("wireless");
QString security = ui->tableWidget_wifi->item(ui->tableWidget_wifi->currentItem()->row(), 3)->text();
if (checkState(QString("WPA"), security))

View File

@ -88,7 +88,7 @@ void NetctlAutoWindow::netctlAutoUpdateTable()
if (debug) qDebug() << "[NetctlAutoWindow]" << "[netctlAutoUpdateTable]";
ui->tableWidget->setDisabled(true);
QList<QStringList> profiles = netctlCommand->getProfileListFromNetctlAuto();
QList<netctlProfileInfo> profiles = netctlCommand->getProfileListFromNetctlAuto();
// actions
if (netctlCommand->isNetctlAutoEnabled())
@ -99,12 +99,16 @@ void NetctlAutoWindow::netctlAutoUpdateTable()
if (netctlCommand->isNetctlAutoRunning()) {
ui->label_info->setText(QApplication::translate("NetctlAutoWindow", "netctl-auto is running"));
ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Stop service"));
ui->actionDisableAll->setVisible(true);
ui->actionEnableAll->setVisible(true);
ui->actionRestartService->setVisible(true);
}
else {
ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Start service"));
ui->actionRestartService->setVisible(false);
ui->label_info->setText(QApplication::translate("NetctlAutoWindow", "netctl-auto is not running"));
ui->actionStartService->setText(QApplication::translate("NetctlAutoWindow", "Start service"));
ui->actionDisableAll->setVisible(false);
ui->actionEnableAll->setVisible(false);
ui->actionRestartService->setVisible(false);
netctlAutoRefreshButtons(0, 0);
return;
}
@ -125,30 +129,26 @@ void NetctlAutoWindow::netctlAutoUpdateTable()
// create items
for (int i=0; i<profiles.count(); i++) {
// name
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(profiles[i][0]));
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(profiles[i].name));
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
if (profiles[i][2] == QString("*")) {
// description
ui->tableWidget->setItem(i, 1, new QTableWidgetItem(profiles[i].description));
ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
if (profiles[i].status == QString("*")) {
// active
QFont font;
font.setBold(true);
ui->tableWidget->item(i, 0)->setFont(font);
}
else if (profiles[i][2] == QString("!")) {
QFont font;
font.setItalic(true);
ui->tableWidget->item(i, 0)->setFont(font);
}
// description
ui->tableWidget->setItem(i, 1, new QTableWidgetItem(profiles[i][1]));
ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
if (profiles[i][2] == QString("*")) {
// active
ui->tableWidget->setItem(i, 2, new QTableWidgetItem(QApplication::translate("NetctlAutoWindow", "yes")));
ui->tableWidget->item(i, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
}
else
ui->tableWidget->setItem(i, 2, new QTableWidgetItem(QString("")));
if (profiles[i][2] == QString("!")) {
if (profiles[i].status == QString("!")) {
// disabled
QFont font;
font.setItalic(true);
ui->tableWidget->item(i, 0)->setFont(font);
ui->tableWidget->setItem(i, 3, new QTableWidgetItem(QApplication::translate("NetctlAutoWindow", "yes")));
ui->tableWidget->item(i, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
}

View File

@ -711,6 +711,12 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
uiDEConfig.lineEdit_extIp6->setText(deSettings[QString("EXTIP6CMD")]);
setDataEngineExternalIp6();
QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
for (int i=0; i<trdPartyList.count(); i++)
trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
.arg(trdPartyList[i].split(QChar(','))[0])
.arg(trdPartyList[i].split(QChar(','))[1])
.arg(trdPartyList[i].split(QChar(','))[2]);
uiAboutConfig.label_name->setText(QString(NAME));
uiAboutConfig.label_version->setText(i18n("Version %1\n(build date %2)", QString(VERSION), QString(BUILD_DATE)));
uiAboutConfig.label_description->setText(i18n("KDE widget which interacts with netctl."));
@ -722,8 +728,8 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent)
QString("<a href=\"%1\">%2</a><br>").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) +
QString("<a href=\"%1\">%2</a>").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages")));
uiAboutConfig.label_license->setText(QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) +
i18n("This software is licensed under %1", QString(LICENSE)) +
QString("</small>"));
i18n("This software is licensed under %1", QString(LICENSE)) + QString("<br>") +
i18n("This software uses: %1", trdPartyList.join(QString(", "))) + QString("</small>"));
parent->addPage(configWidget, i18n("Netctl plasmoid"), Applet::icon());
parent->addPage(appWidget, i18n("Appearance"), QString("preferences-desktop-theme"));

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
"POT-Creation-Date: 2014-08-05 20:32+0400\n"
"PO-Revision-Date: 2014-08-05 20:33+0400\n"
"POT-Creation-Date: 2014-08-06 00:06+0400\n"
"PO-Revision-Date: 2014-08-06 00:06+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"Language: ru\n"
@ -18,91 +18,91 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
#: netctl.cpp:296
#: netctl.cpp:297
msgid "Set profile %1 disabled"
msgstr "Set profile %1 disabled"
#: netctl.cpp:300
#: netctl.cpp:301
msgid "Set profile %1 enabled"
msgstr "Set profile %1 enabled"
#: netctl.cpp:317
#: netctl.cpp:318
msgid "Start profile %1"
msgstr "Start profile %1"
#: netctl.cpp:335
#: netctl.cpp:336
msgid "Stop profile %1"
msgstr "Stop profile %1"
#: netctl.cpp:352
#: netctl.cpp:353
msgid "Switch to profile %1"
msgstr "Switch to profile %1"
#: netctl.cpp:366
#: netctl.cpp:367
msgid "Restart profile %1"
msgstr "Restart profile %1"
#: netctl.cpp:405
#: netctl.cpp:406
msgid "Start another profile"
msgstr "Start another profile"
#: netctl.cpp:406
#: netctl.cpp:407
msgid "Stop %1"
msgstr "Stop %1"
#: netctl.cpp:407
#: netctl.cpp:408
msgid "Restart %1"
msgstr "Restart %1"
#: netctl.cpp:409
#: netctl.cpp:410
msgid "Disable %1"
msgstr "Disable %1"
#: netctl.cpp:411
#: netctl.cpp:412
msgid "Enable %1"
msgstr "Enable %1"
#: netctl.cpp:414 netctl.cpp:437
#: netctl.cpp:415 netctl.cpp:438
msgid "Start profile"
msgstr "Start profile"
#: netctl.cpp:445
#: netctl.cpp:446
msgid "Stop profile"
msgstr "Stop profile"
#: netctl.cpp:450
#: netctl.cpp:451
msgid "Switch to profile"
msgstr "Switch to profile"
#: netctl.cpp:458
#: netctl.cpp:459
msgid "Restart profile"
msgstr "Restart profile"
#: netctl.cpp:463
#: netctl.cpp:464
msgid "Enable profile"
msgstr "Enable profile"
#: netctl.cpp:467
#: netctl.cpp:468
msgid "Show WiFi menu"
msgstr "Show WiFi menu"
#: netctl.cpp:494
#: netctl.cpp:495
msgid "Start GUI"
msgstr "Start GUI"
#: netctl.cpp:505
#: netctl.cpp:506
msgid "Start WiFi menu"
msgstr "Start WiFi menu"
#: netctl.cpp:569
#: netctl.cpp:570
msgid "Network is up"
msgstr "Network is up"
#: netctl.cpp:574
#: netctl.cpp:575
msgid "Network is down"
msgstr "Network is down"
#: netctl.cpp:714
#: netctl.cpp:721
msgid ""
"Version %1\n"
"(build date %2)"
@ -110,55 +110,59 @@ msgstr ""
"Version %1\n"
"(build date %2)"
#: netctl.cpp:715
#: netctl.cpp:722
msgid "KDE widget which interacts with netctl."
msgstr "KDE widget which interacts with netctl."
#: netctl.cpp:716
#: netctl.cpp:723
msgid "Translators: %1"
msgstr "Translators: %1"
#: netctl.cpp:717
#: netctl.cpp:724
msgid "Links:"
msgstr "Links:"
#: netctl.cpp:718
#: netctl.cpp:725
msgid "Homepage"
msgstr "Homepage"
#: netctl.cpp:719
#: netctl.cpp:726
msgid "Repository"
msgstr "Repository"
#: netctl.cpp:720
#: netctl.cpp:727
msgid "Bugtracker"
msgstr "Bugtracker"
#: netctl.cpp:721
#: netctl.cpp:728
msgid "Translation issue"
msgstr "Translation issue"
#: netctl.cpp:722
#: netctl.cpp:729
msgid "AUR packages"
msgstr "AUR packages"
#: netctl.cpp:724
#: netctl.cpp:731
msgid "This software is licensed under %1"
msgstr "This software is licensed under %1"
#: netctl.cpp:727
#: netctl.cpp:732
msgid "This software uses: %1"
msgstr "This software uses: %1"
#: netctl.cpp:734
msgid "Netctl plasmoid"
msgstr "Netctl plasmoid"
#: netctl.cpp:728
#: netctl.cpp:735
msgid "Appearance"
msgstr "Appearance"
#: netctl.cpp:729
#: netctl.cpp:736
msgid "DataEngine"
msgstr "DataEngine"
#: netctl.cpp:730
#: netctl.cpp:737
msgid "About"
msgstr "About"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
"POT-Creation-Date: 2014-08-05 20:32+0400\n"
"POT-Creation-Date: 2014-08-06 00:06+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,145 +17,149 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: netctl.cpp:296
#: netctl.cpp:297
msgid "Set profile %1 disabled"
msgstr ""
#: netctl.cpp:300
#: netctl.cpp:301
msgid "Set profile %1 enabled"
msgstr ""
#: netctl.cpp:317
#: netctl.cpp:318
msgid "Start profile %1"
msgstr ""
#: netctl.cpp:335
#: netctl.cpp:336
msgid "Stop profile %1"
msgstr ""
#: netctl.cpp:352
#: netctl.cpp:353
msgid "Switch to profile %1"
msgstr ""
#: netctl.cpp:366
#: netctl.cpp:367
msgid "Restart profile %1"
msgstr ""
#: netctl.cpp:405
#: netctl.cpp:406
msgid "Start another profile"
msgstr ""
#: netctl.cpp:406
#: netctl.cpp:407
msgid "Stop %1"
msgstr ""
#: netctl.cpp:407
#: netctl.cpp:408
msgid "Restart %1"
msgstr ""
#: netctl.cpp:409
#: netctl.cpp:410
msgid "Disable %1"
msgstr ""
#: netctl.cpp:411
#: netctl.cpp:412
msgid "Enable %1"
msgstr ""
#: netctl.cpp:414 netctl.cpp:437
#: netctl.cpp:415 netctl.cpp:438
msgid "Start profile"
msgstr ""
#: netctl.cpp:445
#: netctl.cpp:446
msgid "Stop profile"
msgstr ""
#: netctl.cpp:450
#: netctl.cpp:451
msgid "Switch to profile"
msgstr ""
#: netctl.cpp:458
#: netctl.cpp:459
msgid "Restart profile"
msgstr ""
#: netctl.cpp:463
#: netctl.cpp:464
msgid "Enable profile"
msgstr ""
#: netctl.cpp:467
#: netctl.cpp:468
msgid "Show WiFi menu"
msgstr ""
#: netctl.cpp:494
#: netctl.cpp:495
msgid "Start GUI"
msgstr ""
#: netctl.cpp:505
#: netctl.cpp:506
msgid "Start WiFi menu"
msgstr ""
#: netctl.cpp:569
#: netctl.cpp:570
msgid "Network is up"
msgstr ""
#: netctl.cpp:574
#: netctl.cpp:575
msgid "Network is down"
msgstr ""
#: netctl.cpp:714
#: netctl.cpp:721
msgid ""
"Version %1\n"
"(build date %2)"
msgstr ""
#: netctl.cpp:715
#: netctl.cpp:722
msgid "KDE widget which interacts with netctl."
msgstr ""
#: netctl.cpp:716
#: netctl.cpp:723
msgid "Translators: %1"
msgstr ""
#: netctl.cpp:717
#: netctl.cpp:724
msgid "Links:"
msgstr ""
#: netctl.cpp:718
#: netctl.cpp:725
msgid "Homepage"
msgstr ""
#: netctl.cpp:719
#: netctl.cpp:726
msgid "Repository"
msgstr ""
#: netctl.cpp:720
#: netctl.cpp:727
msgid "Bugtracker"
msgstr ""
#: netctl.cpp:721
#: netctl.cpp:728
msgid "Translation issue"
msgstr ""
#: netctl.cpp:722
#: netctl.cpp:729
msgid "AUR packages"
msgstr ""
#: netctl.cpp:724
#: netctl.cpp:731
msgid "This software is licensed under %1"
msgstr ""
#: netctl.cpp:727
#: netctl.cpp:732
msgid "This software uses: %1"
msgstr ""
#: netctl.cpp:734
msgid "Netctl plasmoid"
msgstr ""
#: netctl.cpp:728
#: netctl.cpp:735
msgid "Appearance"
msgstr ""
#: netctl.cpp:729
#: netctl.cpp:736
msgid "DataEngine"
msgstr ""
#: netctl.cpp:730
#: netctl.cpp:737
msgid "About"
msgstr ""

View File

@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://kde-look.org/content/show.php?content=98925\n"
"POT-Creation-Date: 2014-08-05 20:32+0400\n"
"PO-Revision-Date: 2014-08-05 20:36+0400\n"
"POT-Creation-Date: 2014-08-06 00:06+0400\n"
"PO-Revision-Date: 2014-08-06 00:07+0400\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"Language: ru\n"
@ -18,91 +18,91 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
#: netctl.cpp:296
#: netctl.cpp:297
msgid "Set profile %1 disabled"
msgstr "Выключение автозагрузки профиля %1"
#: netctl.cpp:300
#: netctl.cpp:301
msgid "Set profile %1 enabled"
msgstr "Включение автозагрузки профиля %1"
#: netctl.cpp:317
#: netctl.cpp:318
msgid "Start profile %1"
msgstr "Запуск профиля %1"
#: netctl.cpp:335
#: netctl.cpp:336
msgid "Stop profile %1"
msgstr "Остановка профиля %1"
#: netctl.cpp:352
#: netctl.cpp:353
msgid "Switch to profile %1"
msgstr "Переключение на профиль %1"
#: netctl.cpp:366
#: netctl.cpp:367
msgid "Restart profile %1"
msgstr "Перезапуск профиля %1"
#: netctl.cpp:405
#: netctl.cpp:406
msgid "Start another profile"
msgstr "Запустить другой профиль"
#: netctl.cpp:406
#: netctl.cpp:407
msgid "Stop %1"
msgstr "Остановить %1"
#: netctl.cpp:407
#: netctl.cpp:408
msgid "Restart %1"
msgstr "Перезапустить %1"
#: netctl.cpp:409
#: netctl.cpp:410
msgid "Disable %1"
msgstr "Отключить %1"
#: netctl.cpp:411
#: netctl.cpp:412
msgid "Enable %1"
msgstr "Включить %1"
#: netctl.cpp:414 netctl.cpp:437
#: netctl.cpp:415 netctl.cpp:438
msgid "Start profile"
msgstr "Запустить профиль"
#: netctl.cpp:445
#: netctl.cpp:446
msgid "Stop profile"
msgstr "Остановить профиль"
#: netctl.cpp:450
#: netctl.cpp:451
msgid "Switch to profile"
msgstr "Переключить профиль"
#: netctl.cpp:458
#: netctl.cpp:459
msgid "Restart profile"
msgstr "Перезапустить профиль"
#: netctl.cpp:463
#: netctl.cpp:464
msgid "Enable profile"
msgstr "Включить профиль"
#: netctl.cpp:467
#: netctl.cpp:468
msgid "Show WiFi menu"
msgstr "Запустить WiFi-menu"
#: netctl.cpp:494
#: netctl.cpp:495
msgid "Start GUI"
msgstr "Запуск GUI"
#: netctl.cpp:505
#: netctl.cpp:506
msgid "Start WiFi menu"
msgstr "Запуск WiFi-menu"
#: netctl.cpp:569
#: netctl.cpp:570
msgid "Network is up"
msgstr "Сеть работает"
#: netctl.cpp:574
#: netctl.cpp:575
msgid "Network is down"
msgstr "Сеть не работает"
#: netctl.cpp:714
#: netctl.cpp:721
msgid ""
"Version %1\n"
"(build date %2)"
@ -110,55 +110,59 @@ msgstr ""
"Версия %1\n"
"(дата сборки %2)"
#: netctl.cpp:715
#: netctl.cpp:722
msgid "KDE widget which interacts with netctl."
msgstr "Виджет KDE, который взаимодействует с netctl."
#: netctl.cpp:716
#: netctl.cpp:723
msgid "Translators: %1"
msgstr "Переводчики: %1"
#: netctl.cpp:717
#: netctl.cpp:724
msgid "Links:"
msgstr "Ссылки:"
#: netctl.cpp:718
#: netctl.cpp:725
msgid "Homepage"
msgstr "Домашняя страница"
#: netctl.cpp:719
#: netctl.cpp:726
msgid "Repository"
msgstr "Репозиторий"
#: netctl.cpp:720
#: netctl.cpp:727
msgid "Bugtracker"
msgstr "Багтрекер"
#: netctl.cpp:721
#: netctl.cpp:728
msgid "Translation issue"
msgstr "Тикет перевода"
#: netctl.cpp:722
#: netctl.cpp:729
msgid "AUR packages"
msgstr "Пакеты в AUR"
#: netctl.cpp:724
#: netctl.cpp:731
msgid "This software is licensed under %1"
msgstr "Данное программное обеспечение лицензировано под %1"
msgstr "Данное приложение лицензировано под %1"
#: netctl.cpp:727
#: netctl.cpp:732
msgid "This software uses: %1"
msgstr "Данное приложение использует: %1"
#: netctl.cpp:734
msgid "Netctl plasmoid"
msgstr "Netctl plasmoid"
#: netctl.cpp:728
#: netctl.cpp:735
msgid "Appearance"
msgstr "Внешний вид"
#: netctl.cpp:729
#: netctl.cpp:736
msgid "DataEngine"
msgstr "DataEngine"
#: netctl.cpp:730
#: netctl.cpp:737
msgid "About"
msgstr "О программе"

View File

@ -49,6 +49,10 @@
<source>Translators: %1</source>
<translation>Translators: %1</translation>
</message>
<message>
<source>This software uses: %1</source>
<translation>This software uses: %1</translation>
</message>
</context>
<context>
<name>BridgeWidget</name>

View File

@ -4,56 +4,61 @@
<context>
<name>AboutWindow</name>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="53"/>
<location filename="../../gui/src/aboutwindow.cpp" line="59"/>
<source>Version %1
(build date %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="55"/>
<location filename="../../gui/src/aboutwindow.cpp" line="61"/>
<source>Qt-based graphical interface for netctl.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="56"/>
<location filename="../../gui/src/aboutwindow.cpp" line="62"/>
<source>Translators: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="57"/>
<location filename="../../gui/src/aboutwindow.cpp" line="63"/>
<source>Links:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="58"/>
<location filename="../../gui/src/aboutwindow.cpp" line="64"/>
<source>Homepage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="59"/>
<location filename="../../gui/src/aboutwindow.cpp" line="65"/>
<source>Repository</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="60"/>
<location filename="../../gui/src/aboutwindow.cpp" line="66"/>
<source>Bugtracker</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="61"/>
<location filename="../../gui/src/aboutwindow.cpp" line="67"/>
<source>Translation issue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="62"/>
<location filename="../../gui/src/aboutwindow.cpp" line="68"/>
<source>AUR packages</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="64"/>
<location filename="../../gui/src/aboutwindow.cpp" line="70"/>
<source>This software is licensed under %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/aboutwindow.cpp" line="71"/>
<source>This software uses: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../build/gui/src/ui_aboutwindow.h" line="47"/>
<source>About</source>
@ -738,30 +743,30 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="413"/>
<location filename="../../gui/src/mainwindow.cpp" line="526"/>
<location filename="../../gui/src/mainwindow.cpp" line="414"/>
<location filename="../../gui/src/mainwindow.cpp" line="527"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="513"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="529"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="414"/>
<location filename="../../gui/src/mainwindow.cpp" line="415"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="515"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="415"/>
<location filename="../../gui/src/mainwindow.cpp" line="527"/>
<location filename="../../gui/src/mainwindow.cpp" line="416"/>
<location filename="../../gui/src/mainwindow.cpp" line="528"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="517"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="531"/>
<source>Status</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="596"/>
<location filename="../../gui/src/mainwindow.cpp" line="1210"/>
<location filename="../../gui/src/mainwindow.cpp" line="597"/>
<location filename="../../gui/src/mainwindow.cpp" line="1211"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="495"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="502"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="518"/>
@ -781,9 +786,9 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="787"/>
<location filename="../../gui/src/mainwindow.cpp" line="1408"/>
<location filename="../../gui/src/mainwindow.cpp" line="1413"/>
<location filename="../../gui/src/mainwindow.cpp" line="788"/>
<location filename="../../gui/src/mainwindow.cpp" line="1409"/>
<location filename="../../gui/src/mainwindow.cpp" line="1414"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="521"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="538"/>
<source>Start</source>
@ -841,13 +846,13 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="528"/>
<location filename="../../gui/src/mainwindow.cpp" line="529"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="533"/>
<source>Signal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="529"/>
<location filename="../../gui/src/mainwindow.cpp" line="530"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="535"/>
<source>Security</source>
<translation type="unfinished"></translation>
@ -888,35 +893,35 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="459"/>
<location filename="../../gui/src/mainwindow.cpp" line="599"/>
<location filename="../../gui/src/mainwindow.cpp" line="618"/>
<location filename="../../gui/src/mainwindow.cpp" line="460"/>
<location filename="../../gui/src/mainwindow.cpp" line="600"/>
<location filename="../../gui/src/mainwindow.cpp" line="619"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="496"/>
<source>Start profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="600"/>
<location filename="../../gui/src/mainwindow.cpp" line="601"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="497"/>
<source>Restart profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="468"/>
<location filename="../../gui/src/mainwindow.cpp" line="602"/>
<location filename="../../gui/src/mainwindow.cpp" line="626"/>
<location filename="../../gui/src/mainwindow.cpp" line="469"/>
<location filename="../../gui/src/mainwindow.cpp" line="603"/>
<location filename="../../gui/src/mainwindow.cpp" line="627"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="498"/>
<source>Enable profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="604"/>
<location filename="../../gui/src/mainwindow.cpp" line="605"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="499"/>
<source>Edit profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="606"/>
<location filename="../../gui/src/mainwindow.cpp" line="607"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="500"/>
<location filename="../../../build/gui/src/ui_mainwindow.h" line="506"/>
<source>Remove profile</source>
@ -943,79 +948,79 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="150"/>
<location filename="../../gui/src/mainwindow.cpp" line="151"/>
<source>Ready</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="438"/>
<location filename="../../gui/src/mainwindow.cpp" line="484"/>
<location filename="../../gui/src/mainwindow.cpp" line="555"/>
<location filename="../../gui/src/mainwindow.cpp" line="439"/>
<location filename="../../gui/src/mainwindow.cpp" line="485"/>
<location filename="../../gui/src/mainwindow.cpp" line="556"/>
<source>Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="454"/>
<location filename="../../gui/src/mainwindow.cpp" line="613"/>
<location filename="../../gui/src/mainwindow.cpp" line="455"/>
<location filename="../../gui/src/mainwindow.cpp" line="614"/>
<source>Stop profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="464"/>
<location filename="../../gui/src/mainwindow.cpp" line="622"/>
<location filename="../../gui/src/mainwindow.cpp" line="465"/>
<location filename="../../gui/src/mainwindow.cpp" line="623"/>
<source>Disable profile</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="571"/>
<location filename="../../gui/src/mainwindow.cpp" line="1219"/>
<location filename="../../gui/src/mainwindow.cpp" line="572"/>
<location filename="../../gui/src/mainwindow.cpp" line="1220"/>
<source>Stop WiFi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="575"/>
<location filename="../../gui/src/mainwindow.cpp" line="580"/>
<location filename="../../gui/src/mainwindow.cpp" line="1213"/>
<location filename="../../gui/src/mainwindow.cpp" line="1223"/>
<location filename="../../gui/src/mainwindow.cpp" line="1228"/>
<location filename="../../gui/src/mainwindow.cpp" line="576"/>
<location filename="../../gui/src/mainwindow.cpp" line="581"/>
<location filename="../../gui/src/mainwindow.cpp" line="1214"/>
<location filename="../../gui/src/mainwindow.cpp" line="1224"/>
<location filename="../../gui/src/mainwindow.cpp" line="1229"/>
<source>Start WiFi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="330"/>
<location filename="../../gui/src/mainwindow.cpp" line="679"/>
<location filename="../../gui/src/mainwindow.cpp" line="703"/>
<location filename="../../gui/src/mainwindow.cpp" line="707"/>
<location filename="../../gui/src/mainwindow.cpp" line="728"/>
<location filename="../../gui/src/mainwindow.cpp" line="752"/>
<location filename="../../gui/src/mainwindow.cpp" line="756"/>
<location filename="../../gui/src/mainwindow.cpp" line="1122"/>
<location filename="../../gui/src/mainwindow.cpp" line="1193"/>
<location filename="../../gui/src/mainwindow.cpp" line="1299"/>
<location filename="../../gui/src/mainwindow.cpp" line="1354"/>
<location filename="../../gui/src/mainwindow.cpp" line="1358"/>
<location filename="../../gui/src/mainwindow.cpp" line="331"/>
<location filename="../../gui/src/mainwindow.cpp" line="680"/>
<location filename="../../gui/src/mainwindow.cpp" line="704"/>
<location filename="../../gui/src/mainwindow.cpp" line="708"/>
<location filename="../../gui/src/mainwindow.cpp" line="729"/>
<location filename="../../gui/src/mainwindow.cpp" line="753"/>
<location filename="../../gui/src/mainwindow.cpp" line="757"/>
<location filename="../../gui/src/mainwindow.cpp" line="1123"/>
<location filename="../../gui/src/mainwindow.cpp" line="1194"/>
<location filename="../../gui/src/mainwindow.cpp" line="1300"/>
<location filename="../../gui/src/mainwindow.cpp" line="1355"/>
<location filename="../../gui/src/mainwindow.cpp" line="1359"/>
<source>Done</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="332"/>
<location filename="../../gui/src/mainwindow.cpp" line="681"/>
<location filename="../../gui/src/mainwindow.cpp" line="701"/>
<location filename="../../gui/src/mainwindow.cpp" line="709"/>
<location filename="../../gui/src/mainwindow.cpp" line="730"/>
<location filename="../../gui/src/mainwindow.cpp" line="750"/>
<location filename="../../gui/src/mainwindow.cpp" line="758"/>
<location filename="../../gui/src/mainwindow.cpp" line="1124"/>
<location filename="../../gui/src/mainwindow.cpp" line="1195"/>
<location filename="../../gui/src/mainwindow.cpp" line="1301"/>
<location filename="../../gui/src/mainwindow.cpp" line="1352"/>
<location filename="../../gui/src/mainwindow.cpp" line="1360"/>
<location filename="../../gui/src/mainwindow.cpp" line="333"/>
<location filename="../../gui/src/mainwindow.cpp" line="682"/>
<location filename="../../gui/src/mainwindow.cpp" line="702"/>
<location filename="../../gui/src/mainwindow.cpp" line="710"/>
<location filename="../../gui/src/mainwindow.cpp" line="731"/>
<location filename="../../gui/src/mainwindow.cpp" line="751"/>
<location filename="../../gui/src/mainwindow.cpp" line="759"/>
<location filename="../../gui/src/mainwindow.cpp" line="1125"/>
<location filename="../../gui/src/mainwindow.cpp" line="1196"/>
<location filename="../../gui/src/mainwindow.cpp" line="1302"/>
<location filename="../../gui/src/mainwindow.cpp" line="1353"/>
<location filename="../../gui/src/mainwindow.cpp" line="1361"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/mainwindow.cpp" line="782"/>
<location filename="../../gui/src/mainwindow.cpp" line="1404"/>
<location filename="../../gui/src/mainwindow.cpp" line="783"/>
<location filename="../../gui/src/mainwindow.cpp" line="1405"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
@ -1325,25 +1330,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="120"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="124"/>
<location filename="../../../build/gui/src/ui_netctlautowindow.h" line="226"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="121"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="125"/>
<location filename="../../../build/gui/src/ui_netctlautowindow.h" line="228"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="122"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="126"/>
<location filename="../../../build/gui/src/ui_netctlautowindow.h" line="230"/>
<source>Active</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="123"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="127"/>
<location filename="../../../build/gui/src/ui_netctlautowindow.h" line="232"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
@ -1385,7 +1390,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="105"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="108"/>
<location filename="../../../build/gui/src/ui_netctlautowindow.h" line="220"/>
<source>Start service</source>
<translation type="unfinished"></translation>
@ -1396,7 +1401,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../gui/src/netctlautowindow.cpp" line="145"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="142"/>
<location filename="../../gui/src/netctlautowindow.cpp" line="152"/>
<source>yes</source>
<translation type="unfinished"></translation>

View File

@ -39,7 +39,7 @@
</message>
<message>
<source>This software is licensed under %1</source>
<translation>Данной программное обеспечение лицензировано под %1</translation>
<translation>Данное приложение лицензировано под %1</translation>
</message>
<message>
<source>About</source>
@ -49,6 +49,10 @@
<source>Translators: %1</source>
<translation>Переводчики: %1</translation>
</message>
<message>
<source>This software uses: %1</source>
<translation>Данное приложение использует: %1</translation>
</message>
</context>
<context>
<name>BridgeWidget</name>

View File

@ -7,6 +7,7 @@
#define TRANSLATORS ""
#define EMAIL "@PROJECT_CONTACT@"
#define LICENSE "@PROJECT_LICENSE@"
#define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks;"
#define HOMEPAGE "http://arcanis.name/projects/netctl-gui/"
#define REPOSITORY "https://github.com/arcan1s/netctl-gui"