diff --git a/.gitignore b/.gitignore
index a6f7e40..77b98f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,11 +15,12 @@
# Source archive
*.tar.xz
*.tar.gz
+*.sig
# Build directory
build/
-sources/build/
tmp/
+usr/
# translations
*.qm
diff --git a/PKGBUILD b/PKGBUILD
index 617d4f4..021bf0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: sudo support'
'wpa_supplicant: wifi support')
source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
install="${pkgbase}.install"
-md5sums=('4d52513623e2501d8dd9a531327c01a7')
+md5sums=('f09c15bc74ace36a59897f34220ac098')
prepare() {
rm -rf "${srcdir}/"{build-plasmoid,build-qt4,build-qt5}
diff --git a/sources/gui/src/main.cpp b/sources/gui/src/main.cpp
index d9b413f..894fbfc 100644
--- a/sources/gui/src/main.cpp
+++ b/sources/gui/src/main.cpp
@@ -190,6 +190,9 @@ int main(int argc, char *argv[])
.arg(QApplication::translate("MainWindow", "select profile %1").arg(selectProfile));
// additional functions
helpMessage += QString("%1\n").arg(QApplication::translate("MainWindow", "Additional flags:"));
+ helpMessage += QString(" --config %1 - %2\n")
+ .arg(configPath)
+ .arg(QApplication::translate("MainWindow", "read configuration from file %1").arg(configPath));
helpMessage += QString("%1 -d --debug - %2\n")
.arg(isParametrEnable(debug))
.arg(QApplication::translate("MainWindow", "print debug information"));
@@ -227,9 +230,15 @@ int main(int argc, char *argv[])
QString versionMessage = QString("");
versionMessage += QString("%1\n").arg(QString(NAME));
- versionMessage += QApplication::translate("MainWindow", "Version : %1\n").arg(QString(VERSION));
- versionMessage += QApplication::translate("MainWindow", "Author : %1\n").arg(QString(AUTHOR));
- versionMessage += QApplication::translate("MainWindow", "License : %1\n").arg(QString(LICENSE));
+ versionMessage += QString("%1 : %2\n")
+ .arg(QApplication::translate("MainWindow", "Version"))
+ .arg(QString(VERSION));
+ versionMessage += QString("%1 : %2\n")
+ .arg(QApplication::translate("MainWindow", "Author"))
+ .arg(QString(AUTHOR));
+ versionMessage += QString("%1 : %2\n")
+ .arg(QApplication::translate("MainWindow", "License"))
+ .arg(QString(LICENSE));
// reread translations
a.removeTranslator(&translator);
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index 6744046..88afca1 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -67,6 +67,7 @@ MainWindow::MainWindow(QWidget *parent,
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectEssid" << selectEssid;
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "openProfile" << openProfile;
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "selectProfile" << selectProfile;
+ if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "configPath" << configPath;
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "debug" << debug;
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "defaultSettings" << defaultSettings;
if (debug) qDebug() << "[MainWindow]" << "[MainWindow]" << ":" << "options" << options;
diff --git a/sources/resources/translations/en.ts b/sources/resources/translations/en.ts
index dc06ff9..40637ef 100644
--- a/sources/resources/translations/en.ts
+++ b/sources/resources/translations/en.ts
@@ -939,19 +939,19 @@
Version : %1
- Version : %1
+ Version : %1
Author : %1
- Author : %1
+ Author : %1
License : %1
- License : %1
+ License : %1
@@ -970,6 +970,22 @@
Help
Help
+
+ read configuration from file %1
+ read configuration from file %1
+
+
+ Version
+ Version
+
+
+ Author
+ Author
+
+
+ License
+ License
+
MobileWidget
diff --git a/sources/resources/translations/netctl-gui.ts b/sources/resources/translations/netctl-gui.ts
index be9e522..51f19ee 100644
--- a/sources/resources/translations/netctl-gui.ts
+++ b/sources/resources/translations/netctl-gui.ts
@@ -733,30 +733,30 @@
-
-
+
+
Name
-
+
Description
-
-
+
+
Status
-
-
+
+
@@ -776,9 +776,9 @@
-
-
-
+
+
+
Start
@@ -831,13 +831,13 @@
-
+
Signal
-
+
Security
@@ -878,35 +878,35 @@
-
-
-
+
+
+
Start profile
-
+
Restart profile
-
-
-
+
+
+
Enable profile
-
+
Edit profile
-
+
Remove profile
@@ -933,77 +933,77 @@
-
+
Ready
-
-
-
+
+
+
Updated
-
-
+
+
Stop profile
-
-
+
+
Disable profile
-
-
+
+
Stop WiFi
-
-
-
-
-
+
+
+
+
+
Start WiFi
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Done
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Error
-
-
+
+
Stop
@@ -1070,70 +1070,72 @@
- print debug information
+ read configuration from file %1
+ print debug information
+
+
+
+
start with default settings
-
+
set options for this run, comma separated
-
+
open a tab with number %1
-
+
Show messages:
-
+
show version and exit
-
+
show build information and exit
-
+
show this help and exit
-
+
Build date: %1
-
+
cmake flags:
-
- Version : %1
-
+
+ Version
-
- Author : %1
-
+
+ Author
-
- License : %1
-
+
+ License
diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts
index aa9fbf7..1c06653 100644
--- a/sources/resources/translations/ru.ts
+++ b/sources/resources/translations/ru.ts
@@ -938,19 +938,19 @@
Version : %1
- Версия : %1
+ Версия : %1
Author : %1
- Автор : %1
+ Автор : %1
License : %1
- Лицензия : %1
+ Лицензия : %1
@@ -969,6 +969,22 @@
Help
Справка
+
+ read configuration from file %1
+ прочитать настройки из файла %1
+
+
+ Version
+ Версия
+
+
+ Author
+ Автор
+
+
+ License
+ Лицензия
+
MobileWidget