From e9c10e262ee3e493357ac8ca3efe6375279fd724 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 1 Aug 2014 09:54:26 +0400 Subject: [PATCH] update about window add report a bug link --- sources/gui/src/about.ui | 17 +- sources/gui/src/aboutwindow.cpp | 1 + sources/gui/src/mainwindow.cpp | 13 ++ sources/gui/src/mainwindow.h | 1 + sources/gui/src/mainwindow.ui | 23 +- sources/plasmoid/netctl.cpp | 1 + sources/plasmoid/po/en.po | 76 +++--- sources/plasmoid/po/plasma_applet_netctl.pot | 74 +++--- sources/plasmoid/po/ru.po | 76 +++--- sources/resources/translations/en.ts | 8 + sources/resources/translations/netctl-gui.ts | 234 ++++++++++--------- sources/resources/translations/ru.ts | 8 + sources/version.h.in | 1 + 13 files changed, 304 insertions(+), 229 deletions(-) diff --git a/sources/gui/src/about.ui b/sources/gui/src/about.ui index 1eccf63..fe73b21 100644 --- a/sources/gui/src/about.ui +++ b/sources/gui/src/about.ui @@ -6,8 +6,8 @@ 0 0 - 390 - 290 + 388 + 288 @@ -50,7 +50,7 @@ - + Qt::Vertical @@ -63,7 +63,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -98,6 +98,13 @@ + + + + + + + diff --git a/sources/gui/src/aboutwindow.cpp b/sources/gui/src/aboutwindow.cpp index 64aa693..60b8508 100644 --- a/sources/gui/src/aboutwindow.cpp +++ b/sources/gui/src/aboutwindow.cpp @@ -53,6 +53,7 @@ void AboutWindow::createText() uiAbout->label_version->setText(QApplication::translate("AboutWindow", "Version %1\n(build date %2)") .arg(QString(VERSION)).arg(QString(BUILD_DATE))); uiAbout->label_description->setText(QApplication::translate("AboutWindow", "Qt-based graphical interface for netctl.")); + uiAbout->label_translators->setText(QApplication::translate("AboutWindow", "Translators: %1").arg(QString(TRANSLATORS))); uiAbout->label_links->setText(QApplication::translate("AboutWindow", "Links:") + QString("
") + QString("%2
").arg(QString(HOMEPAGE)).arg(QApplication::translate("AboutWindow", "Homepage")) + QString("%2
").arg(QString(REPOSITORY)).arg(QApplication::translate("AboutWindow", "Repository")) + diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index f13c4c7..527202b 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -19,6 +19,7 @@ #include "ui_mainwindow.h" #include +#include #include #include #include @@ -39,6 +40,7 @@ #include "settingswindow.h" #include "tunnelwidget.h" #include "tuntapwidget.h" +#include "version.h" #include "vlanwidget.h" #include "wirelesswidget.h" @@ -230,6 +232,7 @@ void MainWindow::createActions() connect(ui->actionAbout, SIGNAL(triggered(bool)), aboutWin, SLOT(show())); connect(ui->actionNetctlAuto, SIGNAL(triggered(bool)), netctlAutoWin, SLOT(showWindow())); connect(ui->actionSettings, SIGNAL(triggered(bool)), settingsWin, SLOT(showWindow())); + connect(ui->actionReport, SIGNAL(triggered(bool)), this, SLOT(reportABug())); connect(ui->actionQuit, SIGNAL(triggered(bool)), this, SLOT(close())); // actions menu @@ -319,6 +322,16 @@ QMap MainWindow::parseOptions(const QString options) } +void MainWindow::reportABug() +{ + if (debug) qDebug() << "[MainWindow]" << "[reportABug]"; + + if (QDesktopServices::openUrl(QUrl(QString(BUGTRACKER)))) + ui->statusBar->showMessage(QApplication::translate("MainWindow", "Done")); + else + ui->statusBar->showMessage(QApplication::translate("MainWindow", "Error")); +} + // window slots void MainWindow::setMenuActionsShown(const bool state) diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index 0199fcf..1e38028 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -74,6 +74,7 @@ public slots: void setHiddenName(const QString name); private slots: + void reportABug(); // menu update slots void setMenuActionsShown(const bool state = true); void updateMenuMain(); diff --git a/sources/gui/src/mainwindow.ui b/sources/gui/src/mainwindow.ui index 4033fc4..56b5a1b 100644 --- a/sources/gui/src/mainwindow.ui +++ b/sources/gui/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 479 - 507 + 477 + 505 @@ -206,8 +206,8 @@ 0 0 - 96 - 26 + 445 + 349 @@ -367,7 +367,7 @@ 0 0 - 479 + 477 22 @@ -402,6 +402,7 @@ Help + @@ -562,12 +563,22 @@ - + + + About + + + + + + Report a bug + + tabWidget diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp index b8d4059..696f431 100644 --- a/sources/plasmoid/netctl.cpp +++ b/sources/plasmoid/netctl.cpp @@ -760,6 +760,7 @@ void Netctl::createConfigurationInterface(KConfigDialog *parent) 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.")); + uiAboutConfig.label_translators->setText(i18n("Translators: %1", QString(TRANSLATORS))); uiAboutConfig.label_links->setText(i18n("Links:") + QString("
") + QString("%2
").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) + QString("%2
").arg(QString(REPOSITORY)).arg(i18n("Repository")) + diff --git a/sources/plasmoid/po/en.po b/sources/plasmoid/po/en.po index fe4b8cb..8f09523 100644 --- a/sources/plasmoid/po/en.po +++ b/sources/plasmoid/po/en.po @@ -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-07-14 18:33+0400\n" -"PO-Revision-Date: 2014-07-14 18:32+0400\n" +"POT-Creation-Date: 2014-08-01 09:53+0400\n" +"PO-Revision-Date: 2014-08-01 09:53+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \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:179 +#: netctl.cpp:213 msgid "Set profile %1 disabled" msgstr "Set profile %1 disabled" -#: netctl.cpp:183 +#: netctl.cpp:217 msgid "Set profile %1 enabled" msgstr "Set profile %1 enabled" -#: netctl.cpp:200 +#: netctl.cpp:238 msgid "Start profile %1" msgstr "Start profile %1" -#: netctl.cpp:228 +#: netctl.cpp:268 msgid "Stop profile %1" msgstr "Stop profile %1" -#: netctl.cpp:243 +#: netctl.cpp:287 msgid "Switch to profile %1" msgstr "Switch to profile %1" -#: netctl.cpp:254 +#: netctl.cpp:301 msgid "Restart profile %1" msgstr "Restart profile %1" -#: netctl.cpp:293 +#: netctl.cpp:343 msgid "Start another profile" msgstr "Start another profile" -#: netctl.cpp:295 +#: netctl.cpp:345 msgid "Stop %1" msgstr "Stop %1" -#: netctl.cpp:297 +#: netctl.cpp:347 msgid "Restart %1" msgstr "Restart %1" -#: netctl.cpp:300 +#: netctl.cpp:350 msgid "Disable %1" msgstr "Disable %1" -#: netctl.cpp:302 +#: netctl.cpp:352 msgid "Enable %1" msgstr "Enable %1" -#: netctl.cpp:305 netctl.cpp:333 +#: netctl.cpp:355 netctl.cpp:385 msgid "Start profile" msgstr "Start profile" -#: netctl.cpp:341 +#: netctl.cpp:393 msgid "Stop profile" msgstr "Stop profile" -#: netctl.cpp:346 +#: netctl.cpp:398 msgid "Switch to profile" msgstr "Switch to profile" -#: netctl.cpp:354 +#: netctl.cpp:406 msgid "Restart profile" msgstr "Restart profile" -#: netctl.cpp:359 +#: netctl.cpp:411 msgid "Enable profile" msgstr "Enable profile" -#: netctl.cpp:363 +#: netctl.cpp:415 msgid "Show WiFi menu" msgstr "Show WiFi menu" -#: netctl.cpp:384 +#: netctl.cpp:442 msgid "Start GUI" msgstr "Start GUI" -#: netctl.cpp:392 +#: netctl.cpp:453 msgid "Start WiFi menu" msgstr "Start WiFi menu" -#: netctl.cpp:456 +#: netctl.cpp:523 msgid "Network is up" msgstr "Network is up" -#: netctl.cpp:462 +#: netctl.cpp:529 msgid "Network is down" msgstr "Network is down" -#: netctl.cpp:666 +#: netctl.cpp:761 msgid "" "Version %1\n" "(build date %2)" @@ -110,51 +110,55 @@ msgstr "" "Version %1\n" "(build date %2)" -#: netctl.cpp:667 +#: netctl.cpp:762 msgid "KDE widget which interacts with netctl." msgstr "KDE widget which interacts with netctl." -#: netctl.cpp:668 +#: netctl.cpp:763 +msgid "Translators: %1" +msgstr "Translators: %1" + +#: netctl.cpp:764 msgid "Links:" msgstr "Links:" -#: netctl.cpp:669 +#: netctl.cpp:765 msgid "Homepage" msgstr "Homepage" -#: netctl.cpp:670 +#: netctl.cpp:766 msgid "Repository" msgstr "Repository" -#: netctl.cpp:671 +#: netctl.cpp:767 msgid "Bugtracker" msgstr "Bugtracker" -#: netctl.cpp:672 +#: netctl.cpp:768 msgid "Translation issue" msgstr "Translation issue" -#: netctl.cpp:673 +#: netctl.cpp:769 msgid "AUR packages" msgstr "AUR packages" -#: netctl.cpp:675 +#: netctl.cpp:771 msgid "This software is licensed under %1" msgstr "This software is licensed under %1" -#: netctl.cpp:678 +#: netctl.cpp:774 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:679 +#: netctl.cpp:775 msgid "Appearance" msgstr "Appearance" -#: netctl.cpp:680 +#: netctl.cpp:776 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:681 +#: netctl.cpp:777 msgid "About" msgstr "About" diff --git a/sources/plasmoid/po/plasma_applet_netctl.pot b/sources/plasmoid/po/plasma_applet_netctl.pot index f8e008d..6ffb605 100644 --- a/sources/plasmoid/po/plasma_applet_netctl.pot +++ b/sources/plasmoid/po/plasma_applet_netctl.pot @@ -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-07-14 18:33+0400\n" +"POT-Creation-Date: 2014-08-01 09:53+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,141 +17,145 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: netctl.cpp:179 +#: netctl.cpp:213 msgid "Set profile %1 disabled" msgstr "" -#: netctl.cpp:183 +#: netctl.cpp:217 msgid "Set profile %1 enabled" msgstr "" -#: netctl.cpp:200 +#: netctl.cpp:238 msgid "Start profile %1" msgstr "" -#: netctl.cpp:228 +#: netctl.cpp:268 msgid "Stop profile %1" msgstr "" -#: netctl.cpp:243 +#: netctl.cpp:287 msgid "Switch to profile %1" msgstr "" -#: netctl.cpp:254 +#: netctl.cpp:301 msgid "Restart profile %1" msgstr "" -#: netctl.cpp:293 +#: netctl.cpp:343 msgid "Start another profile" msgstr "" -#: netctl.cpp:295 +#: netctl.cpp:345 msgid "Stop %1" msgstr "" -#: netctl.cpp:297 +#: netctl.cpp:347 msgid "Restart %1" msgstr "" -#: netctl.cpp:300 +#: netctl.cpp:350 msgid "Disable %1" msgstr "" -#: netctl.cpp:302 +#: netctl.cpp:352 msgid "Enable %1" msgstr "" -#: netctl.cpp:305 netctl.cpp:333 +#: netctl.cpp:355 netctl.cpp:385 msgid "Start profile" msgstr "" -#: netctl.cpp:341 +#: netctl.cpp:393 msgid "Stop profile" msgstr "" -#: netctl.cpp:346 +#: netctl.cpp:398 msgid "Switch to profile" msgstr "" -#: netctl.cpp:354 +#: netctl.cpp:406 msgid "Restart profile" msgstr "" -#: netctl.cpp:359 +#: netctl.cpp:411 msgid "Enable profile" msgstr "" -#: netctl.cpp:363 +#: netctl.cpp:415 msgid "Show WiFi menu" msgstr "" -#: netctl.cpp:384 +#: netctl.cpp:442 msgid "Start GUI" msgstr "" -#: netctl.cpp:392 +#: netctl.cpp:453 msgid "Start WiFi menu" msgstr "" -#: netctl.cpp:456 +#: netctl.cpp:523 msgid "Network is up" msgstr "" -#: netctl.cpp:462 +#: netctl.cpp:529 msgid "Network is down" msgstr "" -#: netctl.cpp:666 +#: netctl.cpp:761 msgid "" "Version %1\n" "(build date %2)" msgstr "" -#: netctl.cpp:667 +#: netctl.cpp:762 msgid "KDE widget which interacts with netctl." msgstr "" -#: netctl.cpp:668 +#: netctl.cpp:763 +msgid "Translators: %1" +msgstr "" + +#: netctl.cpp:764 msgid "Links:" msgstr "" -#: netctl.cpp:669 +#: netctl.cpp:765 msgid "Homepage" msgstr "" -#: netctl.cpp:670 +#: netctl.cpp:766 msgid "Repository" msgstr "" -#: netctl.cpp:671 +#: netctl.cpp:767 msgid "Bugtracker" msgstr "" -#: netctl.cpp:672 +#: netctl.cpp:768 msgid "Translation issue" msgstr "" -#: netctl.cpp:673 +#: netctl.cpp:769 msgid "AUR packages" msgstr "" -#: netctl.cpp:675 +#: netctl.cpp:771 msgid "This software is licensed under %1" msgstr "" -#: netctl.cpp:678 +#: netctl.cpp:774 msgid "Netctl plasmoid" msgstr "" -#: netctl.cpp:679 +#: netctl.cpp:775 msgid "Appearance" msgstr "" -#: netctl.cpp:680 +#: netctl.cpp:776 msgid "DataEngine" msgstr "" -#: netctl.cpp:681 +#: netctl.cpp:777 msgid "About" msgstr "" diff --git a/sources/plasmoid/po/ru.po b/sources/plasmoid/po/ru.po index 162988e..3755600 100644 --- a/sources/plasmoid/po/ru.po +++ b/sources/plasmoid/po/ru.po @@ -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-07-14 18:33+0400\n" -"PO-Revision-Date: 2014-07-14 18:35+0400\n" +"POT-Creation-Date: 2014-08-01 09:53+0400\n" +"PO-Revision-Date: 2014-08-01 09:54+0400\n" "Last-Translator: Evgeniy Alekseev \n" "Language-Team: Russian \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:179 +#: netctl.cpp:213 msgid "Set profile %1 disabled" msgstr "Выключение автозагрузки профиля %1" -#: netctl.cpp:183 +#: netctl.cpp:217 msgid "Set profile %1 enabled" msgstr "Включение автозагрузки профиля %1" -#: netctl.cpp:200 +#: netctl.cpp:238 msgid "Start profile %1" msgstr "Запуск профиля %1" -#: netctl.cpp:228 +#: netctl.cpp:268 msgid "Stop profile %1" msgstr "Остановка профиля %1" -#: netctl.cpp:243 +#: netctl.cpp:287 msgid "Switch to profile %1" msgstr "Переключиться на профиль %1" -#: netctl.cpp:254 +#: netctl.cpp:301 msgid "Restart profile %1" msgstr "Перезапуск профиля %1" -#: netctl.cpp:293 +#: netctl.cpp:343 msgid "Start another profile" msgstr "Запустить другой профиль" -#: netctl.cpp:295 +#: netctl.cpp:345 msgid "Stop %1" msgstr "Остановить %1" -#: netctl.cpp:297 +#: netctl.cpp:347 msgid "Restart %1" msgstr "Перезапустить %1" -#: netctl.cpp:300 +#: netctl.cpp:350 msgid "Disable %1" msgstr "Отключить %1" -#: netctl.cpp:302 +#: netctl.cpp:352 msgid "Enable %1" msgstr "Включить %1" -#: netctl.cpp:305 netctl.cpp:333 +#: netctl.cpp:355 netctl.cpp:385 msgid "Start profile" msgstr "Запустить профиль" -#: netctl.cpp:341 +#: netctl.cpp:393 msgid "Stop profile" msgstr "Остановить профиль" -#: netctl.cpp:346 +#: netctl.cpp:398 msgid "Switch to profile" msgstr "Переключить профиль" -#: netctl.cpp:354 +#: netctl.cpp:406 msgid "Restart profile" msgstr "Перезапустить профиль" -#: netctl.cpp:359 +#: netctl.cpp:411 msgid "Enable profile" msgstr "Включить профиль" -#: netctl.cpp:363 +#: netctl.cpp:415 msgid "Show WiFi menu" msgstr "Запустить WiFi-menu" -#: netctl.cpp:384 +#: netctl.cpp:442 msgid "Start GUI" msgstr "Запуск GUI" -#: netctl.cpp:392 +#: netctl.cpp:453 msgid "Start WiFi menu" msgstr "Запуск WiFi-menu" -#: netctl.cpp:456 +#: netctl.cpp:523 msgid "Network is up" msgstr "Сеть работает" -#: netctl.cpp:462 +#: netctl.cpp:529 msgid "Network is down" msgstr "Сеть не работает" -#: netctl.cpp:666 +#: netctl.cpp:761 msgid "" "Version %1\n" "(build date %2)" @@ -110,51 +110,55 @@ msgstr "" "Версия %1\n" "(дата сборки %2)" -#: netctl.cpp:667 +#: netctl.cpp:762 msgid "KDE widget which interacts with netctl." msgstr "Виджет KDE, который взаимодействует с netctl." -#: netctl.cpp:668 +#: netctl.cpp:763 +msgid "Translators: %1" +msgstr "Переводчики: %1" + +#: netctl.cpp:764 msgid "Links:" msgstr "Ссылки:" -#: netctl.cpp:669 +#: netctl.cpp:765 msgid "Homepage" msgstr "Домашняя страница" -#: netctl.cpp:670 +#: netctl.cpp:766 msgid "Repository" msgstr "Репозиторий" -#: netctl.cpp:671 +#: netctl.cpp:767 msgid "Bugtracker" msgstr "Багтрекер" -#: netctl.cpp:672 +#: netctl.cpp:768 msgid "Translation issue" msgstr "Тикет перевода" -#: netctl.cpp:673 +#: netctl.cpp:769 msgid "AUR packages" msgstr "Пакеты в AUR" -#: netctl.cpp:675 +#: netctl.cpp:771 msgid "This software is licensed under %1" msgstr "Данное программное обеспечение лицензировано под %1" -#: netctl.cpp:678 +#: netctl.cpp:774 msgid "Netctl plasmoid" msgstr "Netctl plasmoid" -#: netctl.cpp:679 +#: netctl.cpp:775 msgid "Appearance" msgstr "Внешний вид" -#: netctl.cpp:680 +#: netctl.cpp:776 msgid "DataEngine" msgstr "DataEngine" -#: netctl.cpp:681 +#: netctl.cpp:777 msgid "About" msgstr "О программе" diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts index c402451..1c846d2 100644 --- a/sources/resources/translations/en.ts +++ b/sources/resources/translations/en.ts @@ -45,6 +45,10 @@ About About + + Translators: %1 + Translators: %1 + BridgeWidget @@ -990,6 +994,10 @@ read configuration from this file read configuration from this file + + Report a bug + Report a bug + MobileWidget diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts index fd77798..5183e5d 100644 --- a/sources/resources/translations/netctl-gui.ts +++ b/sources/resources/translations/netctl-gui.ts @@ -16,36 +16,41 @@ - Links: + Translators: %1 - Homepage + Links: - Repository + Homepage - Bugtracker + Repository - Translation issue + Bugtracker + Translation issue + + + + AUR packages - + This software is licensed under %1 @@ -723,287 +728,294 @@ MainWindow - + Netctl GUI - + Connect to profile - - - - + + + + Name - - + + Description - - - - + + + + Status - - - - - - + + + + + + Refresh - - + + Ctrl+R - + Restart - - - - - + + + + + Start - + Create a new profile - + Profile - - + + Clear - + + Report a bug + + + + Save - + Connect to Wi-Fi - + Please install 'wpa_supplicant' before using it - + About - + netctl-auto is running - + Show - - + + Signal - - + + Security - + Menu - + Actions - + Help - + Settings - + Ctrl+S - + Quit - + Ctrl+Q - - - - + + + + Start profile - - + + Restart profile - - - - + + + + Enable profile - - + + Edit profile - - - + + + Remove profile - + Load profile - + Save profile - + Start Wi-Fi - + netctl-auto - + Ready - - - + + + Updated - - + + Stop profile - - + + Disable profile - - + + Stop WiFi - - - - - + + + + + Start WiFi - - - - - - - - - - - + + + + + + + + + + + + Done - - - - - - - - - - - + + + + + + + + + + + + Error - - + + Stop diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts index e84f439..0423941 100644 --- a/sources/resources/translations/ru.ts +++ b/sources/resources/translations/ru.ts @@ -45,6 +45,10 @@ About О программе + + Translators: %1 + Переводчики: %1 + BridgeWidget @@ -989,6 +993,10 @@ read configuration from this file прочитать настройки из данного файла + + Report a bug + Сообщить о баге + MobileWidget diff --git a/sources/version.h.in b/sources/version.h.in index fbb7adb..e0fc3e0 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -4,6 +4,7 @@ #define NAME "Netctl Graphical Interface" #define VERSION "@PROJECT_VERSION@" #define AUTHOR "@PROJECT_AUTHOR@" +#define TRANSLATORS "" #define EMAIL "@PROJECT_CONTACT@" #define LICENSE "@PROJECT_LICENSE@"