cleanup

src/mainwindow.cpp

@@ -192,7 +192,6 @@ void MainWindow::slotLanguageChanged(QString lang)
     if(lang != "") {
         // load the language
         loadLanguage(lang);
-        //setWindowIcon(action->icon());
     }
 }
 
@@ -229,7 +228,7 @@ void MainWindow::loadLanguage(QString& rLanguage) {
         switchTranslator(m_translator, QString("silentdragon_%1.qm").arg(lang));
         switchTranslator(m_translatorQt, QString("qt_%1.qm").arg(lang));
 
-        ui->statusBar->showMessage(tr("Current Language changed to %1").arg(languageName));
+        ui->statusBar->showMessage(tr("Language changed to") + " " + languageName + " (" + lang + ")");
     }
 }
 
@@ -499,17 +498,14 @@ void MainWindow::setupSettingsModal() {
         settings.testnetTxExplorerUrl->setText(explorer.testnetTxExplorerUrl);
         settings.testnetAddressExplorerUrl->setText(explorer.testnetAddressExplorerUrl);
 
-        /// create language drop down dynamically
-    QActionGroup* langGroup = new QActionGroup(settings.comboBoxLanguage);
-    langGroup->setExclusive(true);
-
-    //qDebug() << __func__ << ": connecting langGroup to slotLanguageChanged";
-    //connect(langGroup, SIGNAL (triggered(QAction *)), this, SLOT (slotLanguageChanged(QAction *)));
-
         // format systems language
         QString defaultLocale = QLocale::system().name(); // e.g. "de_DE"
         defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
 
+        // Set the current language to the default system language
+        // TODO: this will need to change when we read/write selected language to config on disk
+        m_currLang = defaultLocale;
+
         //QString defaultLang = QLocale::languageToString(QLocale("en").language());
         settings.comboBoxLanguage->addItem("English (en)");
 
@@ -523,6 +519,7 @@ void MainWindow::setupSettingsModal() {
 
         qDebug() << __func__ <<": found " << fileNames.size() << " translations";
 
+        // create language drop down dynamically
         for (int i = 0; i < fileNames.size(); ++i) {
             // get locale extracted by filename
             QString locale;
@@ -540,7 +537,6 @@ void MainWindow::setupSettingsModal() {
 
             //settings.comboBoxLanguage->addItem(action);
             settings.comboBoxLanguage->addItem(lang + " (" + locale + ")");
-        langGroup->addAction(action);
             qDebug() << __func__ << ": added lang=" << lang << " locale=" << locale;
 
             // set default translators and language checked
@@ -550,8 +546,8 @@ void MainWindow::setupSettingsModal() {
             }
         }
 
-        // Connection tab by default
-        settings.tabWidget->setCurrentIndex(0);
+        // Options tab by default
+        settings.tabWidget->setCurrentIndex(1);
 
         // Enable the troubleshooting options only if using embedded hushd
         if (!rpc->isEmbedded()) {