From 6eec7789cc3e70653f0cd71d4d47cd93870e7bdb Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 23 Jul 2015 18:44:19 +0200
Subject: [PATCH] Cosmetics

---
 companion/src/mainwindow.cpp | 31 ++++++++-----------------------
 companion/src/mainwindow.h   | 30 +++++++++++++++---------------
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 7ed524a93..9dc878acd 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -530,37 +530,22 @@ void MainWindow::closeEvent(QCloseEvent *event)
     }
 }
 
-void MainWindow::setLanguage(QString langString)
+void MainWindow::setLanguage(const QString & langString)
 {    
-    g.locale( langString );
-    
-    QMessageBox msgBox;
-    msgBox.setText(tr("The selected language will be used the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+  g.locale(langString);
+  QMessageBox::information(this, tr("Companion"), tr("The selected language will be used the next time you start Companion."));
 }
 
 void  MainWindow::setTheme(int index)
 {    
-    g.theme( index );
-    
-    QMessageBox msgBox;
-    msgBox.setText(tr("The new theme will be loaded the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+  g.theme(index);
+  QMessageBox::information(this, tr("Companion"), tr("The new theme will be loaded the next time you start Companion."));
 }
 
 void  MainWindow::setIconThemeSize(int index)
 {    
-    g.iconSize( index );
-
-    QMessageBox msgBox;
-    msgBox.setText(tr("The icon size will be used the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+  g.iconSize(index);
+  QMessageBox::information(this, tr("Companion"), tr("The icon size will be used the next time you start Companion."));
 }
 
 void MainWindow::newFile()
@@ -934,7 +919,7 @@ void MainWindow::updateMenus()
     updateLanguageActions();
     updateIconSizeActions();
     updateIconThemeActions();
-    setWindowTitle(tr("OpenTX Companion 2.1 - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->getName()).arg( g.profile[g.id()].name() ));
+    setWindowTitle(tr("OpenTX Companion %1 - Radio: %2 - Profile: %3").arg(C9X_VERSION).arg(GetCurrentFirmware()->getName()).arg(g.profile[g.id()].name()));
 }
 
 MdiChild *MainWindow::createMdiChild()
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index a4568afe3..abd6bfdcf 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -81,25 +81,25 @@ class MainWindow : public QMainWindow
     void closeEvent(QCloseEvent *event);
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
+    void setLanguage(const QString & langString);
 
   private slots:
     void openDocURL();
 
-    void setLanguage(QString langString);
-    void setSysLanguage() {setLanguage("");};
-    void setCZLanguage() {setLanguage("cs_CZ");};
-    void setDELanguage() {setLanguage("de_DE");};
-    void setENLanguage() {setLanguage("en");};
-    void setFILanguage() {setLanguage("fi_FI");};
-    void setFRLanguage() {setLanguage("fr_FR");};
-    void setITLanguage() {setLanguage("it_IT");};
-    void setHELanguage() {setLanguage("he_IL");};
-    void setPLLanguage() {setLanguage("pl_PL");};
-    void setESLanguage() {setLanguage("es_ES");};
-    void setPTLanguage() {setLanguage("pt_PT");};
-    void setRULanguage() {setLanguage("ru_RU");};
-    void setSELanguage() {setLanguage("sv_SE");};
-    void setNLLanguage() {setLanguage("nl_NL");};
+    void setSysLanguage() { setLanguage("");      };
+    void setCZLanguage()  { setLanguage("cs_CZ"); };
+    void setDELanguage()  { setLanguage("de_DE"); };
+    void setENLanguage()  { setLanguage("en");    };
+    void setFILanguage()  { setLanguage("fi_FI"); };
+    void setFRLanguage()  { setLanguage("fr_FR"); };
+    void setITLanguage()  { setLanguage("it_IT"); };
+    void setHELanguage()  { setLanguage("he_IL"); };
+    void setPLLanguage()  { setLanguage("pl_PL"); };
+    void setESLanguage()  { setLanguage("es_ES"); };
+    void setPTLanguage()  { setLanguage("pt_PT"); };
+    void setRULanguage()  { setLanguage("ru_RU"); };
+    void setSELanguage()  { setLanguage("sv_SE"); };
+    void setNLLanguage()  { setLanguage("nl_NL"); };
 
     void setTheme(int index);
     void setClassicTheme()   {setTheme(0);};