Merge branch 'master' into 2.7

1 files changed, 29 insertions, 6 deletions

diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index b0e1e996..30146c90 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -1,6 +1,5 @@
 #include "aooptionsdialog.h"
 #include "aoapplication.h"
-#include "bass.h"
 
 AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent)
 {
@@ -178,6 +177,21 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
 
     ui_gameplay_form->setWidget(10, QFormLayout::FieldRole, ui_epilepsy_cb);
 
+    ui_language_label = new QLabel(ui_form_layout_widget);
+    ui_language_label->setText(tr("Language:"));
+    ui_language_label->setToolTip(tr("Sets the language if you don't want to use your system language."));
+    ui_gameplay_form->setWidget(10, QFormLayout::LabelRole, ui_language_label);
+
+    ui_language_combobox = new QComboBox(ui_form_layout_widget);
+    ui_language_combobox->addItem(configini->value("language", "  ").value<QString>() + " - Keep current setting");
+    ui_language_combobox->addItem("   - Default");
+    ui_language_combobox->addItem("en - English");
+    ui_language_combobox->addItem("de - Deutsch");
+    ui_language_combobox->addItem("es - Español");
+    ui_language_combobox->addItem("jp - 日本語");
+    ui_language_combobox->addItem("ru - Русский");
+    ui_gameplay_form->setWidget(10, QFormLayout::FieldRole, ui_language_combobox);
+
     // Here we start the callwords tab.
     ui_callwords_tab = new QWidget();
     ui_settings_tabs->addTab(ui_callwords_tab, tr("Callwords"));
@@ -229,22 +243,30 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
 
     ui_audio_device_combobox = new QComboBox(ui_audio_widget);
 
-    // Let's fill out the combobox with the available audio devices.
+    // Let's fill out the combobox with the available audio devices. Or don't if there is no audio
     int a = 0;
-    BASS_DEVICEINFO info;
-
     if (needs_default_audiodev())
     {
+
         ui_audio_device_combobox->addItem("default");
-    }
 
+    }
+    #ifdef BASSAUDIO
+    BASS_DEVICEINFO info;
     for (a = 0; BASS_GetDeviceInfo(a, &info); a++)
     {
         ui_audio_device_combobox->addItem(info.name);
         if (p_ao_app->get_audio_output_device() == info.name)
             ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1);
     }
-
+    #elif defined QTAUDIO
+    foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
+    {
+        ui_audio_device_combobox->addItem(deviceInfo.deviceName());
+        if (p_ao_app->get_audio_output_device() == deviceInfo.deviceName())
+            ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1);
+    }
+    #endif
     ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);
 
     ui_audio_volume_divider = new QFrame(ui_audio_widget);
@@ -510,6 +532,7 @@ void AOOptionsDialog::save_pressed()
     configini->setValue("master", ui_ms_textbox->text());
     configini->setValue("discord", ui_discord_cb->isChecked());
     configini->setValue("shakeandflash", ui_epilepsy_cb->isChecked());
+    configini->setValue("language", ui_language_combobox->currentText().left(2));
 
     QFile* callwordsini = new QFile(ao_app->get_base_path() + "callwords.ini");