From 033611482ed0ccf143704699969de723f0370f54 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Tue, 5 Dec 2017 21:24:55 +0100
Subject: [PATCH] SettingsDialog now also supports language

---
 dialogs/settingsdialog.cpp       | 11 +++++++++++
 dialogs/settingsdialog.ui        | 29 +++++++++++++++++++++--------
 translations/zeiterfassung_de.ts | 20 ++++++++++++++++++++
 translations/zeiterfassung_en.ts | 20 ++++++++++++++++++++
 4 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/dialogs/settingsdialog.cpp b/dialogs/settingsdialog.cpp
index 5b6f3bc..71903a7 100644
--- a/dialogs/settingsdialog.cpp
+++ b/dialogs/settingsdialog.cpp
@@ -1,6 +1,8 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
+#include <QMessageBox>
+
 #include "zeiterfassungsettings.h"
 
 SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent) :
@@ -10,6 +12,10 @@ SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent)
 {
     ui->setupUi(this);
 
+    ui->comboBoxLanguage->addItem(tr("English"), QLocale::English);
+    ui->comboBoxLanguage->addItem(tr("German"), QLocale::German);
+
+    ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(settings.language()));
     ui->lineEditBuchungStartBackgroundColor->setText(settings.buchungStartBackgroundColor());
     ui->lineEditBuchungEndBackgroundColor->setText(settings.buchungEndBackgroundColor());
     ui->lineEditBuchungOtherBackgroundColor->setText(settings.buchungOtherBackgroundColor());
@@ -25,6 +31,11 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::submit()
 {
+    if(ui->comboBoxLanguage->currentData().value<QLocale::Language>() != m_settings.language())
+    {
+        m_settings.setLanguage(ui->comboBoxLanguage->currentData().value<QLocale::Language>());
+        QMessageBox::warning(this, tr("Restart required!"), tr("To apply the new language a restart is required!"));
+    }
     if(ui->lineEditBuchungStartBackgroundColor->text() != m_settings.buchungStartBackgroundColor())
         m_settings.setBuchungStartBackgroundColor(ui->lineEditBuchungStartBackgroundColor->text());
     if(ui->lineEditBuchungEndBackgroundColor->text() != m_settings.buchungEndBackgroundColor())
diff --git a/dialogs/settingsdialog.ui b/dialogs/settingsdialog.ui
index f93d7ff..e55bad5 100644
--- a/dialogs/settingsdialog.ui
+++ b/dialogs/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>647</width>
-    <height>235</height>
+    <height>0</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -35,6 +35,16 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
+      <widget class="QLabel" name="labelLanguage">
+       <property name="text">
+        <string>language</string>
+       </property>
+       <property name="buddy">
+        <cstring>comboBoxLanguage</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
       <widget class="QLabel" name="labelbuchungStartBackgroundColor">
        <property name="text">
         <string>buchungStartBackgroundColor</string>
@@ -44,7 +54,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="labelbuchungEndBackgroundColor">
        <property name="text">
         <string>buchungEndBackgroundColor</string>
@@ -54,7 +64,7 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="labelbuchungOtherBackgroundColor">
        <property name="text">
         <string>buchungOtherBackgroundColor</string>
@@ -64,7 +74,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="labelTimeAssignmentBackgroundColor">
        <property name="text">
         <string>timeAssignmentBackgroundColor</string>
@@ -75,15 +85,18 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEditBuchungStartBackgroundColor"/>
+      <widget class="QComboBox" name="comboBoxLanguage"/>
      </item>
      <item row="1" column="1">
-      <widget class="QLineEdit" name="lineEditBuchungEndBackgroundColor"/>
+      <widget class="QLineEdit" name="lineEditBuchungStartBackgroundColor"/>
      </item>
      <item row="2" column="1">
-      <widget class="QLineEdit" name="lineEditBuchungOtherBackgroundColor"/>
+      <widget class="QLineEdit" name="lineEditBuchungEndBackgroundColor"/>
      </item>
      <item row="3" column="1">
+      <widget class="QLineEdit" name="lineEditBuchungOtherBackgroundColor"/>
+     </item>
+     <item row="4" column="1">
       <widget class="QLineEdit" name="lineEditTimeAssignmentBackgroundColor"/>
      </item>
     </layout>
@@ -94,7 +107,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
      </property>
     </widget>
    </item>
diff --git a/translations/zeiterfassung_de.ts b/translations/zeiterfassung_de.ts
index e792135..76c076c 100644
--- a/translations/zeiterfassung_de.ts
+++ b/translations/zeiterfassung_de.ts
@@ -402,6 +402,26 @@ Buchung ID: %1</source>
         <source>timeAssignmentBackgroundColor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation>Englisch</translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation>Deutsch</translation>
+    </message>
+    <message>
+        <source>Restart required!</source>
+        <translation>Neustart erforderlich!</translation>
+    </message>
+    <message>
+        <source>To apply the new language a restart is required!</source>
+        <translation>Um die neue Sprache anzuwenden ist ein Neustart erforderlich!</translation>
+    </message>
 </context>
 <context>
     <name>TimeAssignmentDialog</name>
diff --git a/translations/zeiterfassung_en.ts b/translations/zeiterfassung_en.ts
index 156c37a..4e5fc8c 100644
--- a/translations/zeiterfassung_en.ts
+++ b/translations/zeiterfassung_en.ts
@@ -402,6 +402,26 @@ Buchung ID: %1</source>
         <source>timeAssignmentBackgroundColor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>German</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart required!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To apply the new language a restart is required!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TimeAssignmentDialog</name>