added translations

.gitignore

@@ -20,3 +20,6 @@ build/
 sources/build/
 tmp/
 
+# translations
+*.qm
+

PKGBUILD

@@ -17,7 +17,7 @@ optdepends=('kdebase-runtime: sudo support'
             'sudo: sudo support')
 source=("https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz")
 install="${pkgname}.install"
-md5sums=('772eb08f63d45b4f1505e3dfc59bbb20')
+md5sums=('a8893bf6d745cbcc7e54bab227cc6d5a')
 
 # flags
 _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"

create_archive.sh

@@ -3,7 +3,7 @@
 ARCHIVE="netctl-gui"
 SRCDIR="sources"
 FILES="LICENSE README.md"
-IGNORELIST="CMakeLists.txt.user"
+IGNORELIST="gui/resources/translations/english.qm gui/resources/translations/russian.qm"
 VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)

sources/gui/CMakeLists.txt

@@ -5,6 +5,8 @@ message (STATUS "Subproject ${SUBPROJECT}")
 # set directories
 set (SUBPROJECT_BINARY_DIR bin)
 set (SUBPROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set (SUBPROJECT_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/resources)
+set (SUBPROJECT_TRANSLATION_DIR ${SUBPROJECT_RESOURCE_DIR}/translations)
 # executable path
 set (EXECUTABLE_OUTPUT_PATH ${SUBPROJECT_BINARY_DIR})
 

sources/gui/resources/resources.qrc

@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>translations/english.qm</file>
+  <file>translations/russian.qm</file>
+</qresource>
+</RCC> 

sources/gui/src/CMakeLists.txt

@@ -3,6 +3,10 @@ file (GLOB SOURCES *.cpp)
 file (GLOB HEADERS *.h)
 file (GLOB FORMS *.ui)
 
+set (LANGUAGES english
+               russian)
+set (RESOURCES ${SUBPROJECT_RESOURCE_DIR}/resources.qrc)
+
 message (STATUS "${SUBPROJECT} Sources: ${SOURCES}")
 message (STATUS "${SUBPROJECT} Headers: ${HEADERS}")
 message (STATUS "${SUBPROJECT} Forms: ${FORMS}")
@@ -14,12 +18,24 @@ find_package (Qt4 REQUIRED)
 include (${QT_USE_FILE})
 qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
 qt4_wrap_ui (UI_HEADERS ${FORMS})
+qt4_add_resources (QRC_SOURCES ${RESOURCES})
+
+foreach (LANGUAGE ${LANGUAGES})
+    set (TS ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.ts)
+    set (QM ${SUBPROJECT_TRANSLATION_DIR}/${LANGUAGE}.qm)
+    set (TRANSLATIONS ${TRANSLATIONS} ${TS})
+    set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
+    add_custom_command (OUTPUT ${QM} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
+endforeach ()
+add_custom_target (translations COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} ${UI_HEADERS} -ts ${TRANSLATIONS})
+add_custom_command (TARGET translations COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+message (STATUS "${SUBPROJECT} Translations: ${TRANSLATIONS_BINARY}")
 
 source_group ("Header Files" FILES ${HEADERS})
 source_group ("Source Files" FILES ${SOURCES})
 source_group ("Generated Files" FILES ${MOC_SOURCES})
 
-add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES})
+add_executable (${SUBPROJECT} ${UI_HEADERS} ${HEADERS} ${SOURCES} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})
 target_link_libraries (${SUBPROJECT} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
 
 # install properties

sources/gui/src/main.cpp

@@ -18,8 +18,10 @@
 
 #include <QApplication>
 
+#include <QDir>
+#include <QTextStream>
+#include <QTranslator>
 #include <iostream>
-#include <cstdlib>
 
 #include "mainwindow.h"
 #include "version.h"
@@ -30,6 +32,31 @@ using namespace std;
 
 int main(int argc, char *argv[])
 {
+    QApplication a(argc, argv);
+
+    // translation
+    QString configPath = QDir::homePath() + QDir::separator() + QString(".config") +
+            QDir::separator() + QString("netctl-gui.conf");
+    QFile configFile(configPath);
+    QString fileStr;
+    QString language = QString("english");
+    if (configFile.open(QIODevice::ReadOnly))
+        while (true) {
+            fileStr = QString(configFile.readLine());
+            if (configFile.atEnd())
+                break;
+            else if (fileStr[0] != '#') {
+                if (fileStr.contains(QString("LANGUAGE=")))
+                    language = fileStr.split(QString("="))[1]
+                            .remove(QString(" "))
+                            .trimmed();
+            }
+        }
+    configFile.close();
+    QTranslator translator;
+    translator.load(QString(":/translations/") + language);
+    a.installTranslator(&translator);
+
     QString helpMessage = QString("");
     helpMessage += QApplication::translate("MainWindow", "                                    Netctl GUI\n");
     helpMessage += QApplication::translate("MainWindow", "Version : %1                                                  License : GPLv3\n")
@@ -73,7 +100,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    QApplication a(argc, argv);
     MainWindow w(0, defaultSettings, tabNumber);
     w.show();
     return a.exec();

sources/gui/src/settingswindow.cpp

@@ -265,9 +265,9 @@ QMap<QString, QString> SettingsWindow::getSettings()
             break;
         else if (fileStr[0] != '#') {
             if (fileStr.indexOf(QString("=")) > -1)
-                    settings[fileStr.split(QString("="))[0]] = fileStr.split(QString("="))[1]
-                            .remove(QString(" "))
-                            .trimmed();
+                settings[fileStr.split(QString("="))[0]] = fileStr.split(QString("="))[1]
+                        .remove(QString(" "))
+                        .trimmed();
         }
     }