Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into i18n

Browse Source
This commit is contained in:
stonedDiscord 2019-07-30 20:43:12 +02:00
commit 77a536e2a9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/configure_ubuntu.sh
View File

@ -11,7 +11,8 @@ cd ${ROOT_DIR}
#need some openGL stuff #need some openGL stuff
sudo apt install libgl1-mesa-dev sudo apt install libgl1-mesa-dev
#install curl incase of fresh vm
sudo apt install curl
mkdir tmp mkdir tmp
cd tmp cd tmp

13
src/aooptionsdialog.cpp
View File

@ -199,7 +199,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_callwords_layout->addWidget(ui_callwords_explain_lbl); ui_callwords_layout->addWidget(ui_callwords_explain_lbl);
// The audio tab. // The audio tab.
#ifdef BASSAUDIO
ui_audio_tab = new QWidget(); ui_audio_tab = new QWidget();
ui_settings_tabs->addTab(ui_audio_tab, tr("Audio")); ui_settings_tabs->addTab(ui_audio_tab, tr("Audio"));
@ -221,20 +220,23 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
// Let's fill out the combobox with the available audio devices. Or don't if there is no audio // Let's fill out the combobox with the available audio devices. Or don't if there is no audio
int a = 0; int a = 0;
#ifdef BASSAUDIO
BASS_DEVICEINFO info; BASS_DEVICEINFO info;
#endif
if (needs_default_audiodev()) if (needs_default_audiodev())
{ {
ui_audio_device_combobox->addItem("default");
}
ui_audio_device_combobox->addItem("default");
}
#ifdef BASSAUDIO
for (a = 0; BASS_GetDeviceInfo(a, &info); a++) for (a = 0; BASS_GetDeviceInfo(a, &info); a++)
{ {
ui_audio_device_combobox->addItem(info.name); ui_audio_device_combobox->addItem(info.name);
if (p_ao_app->get_audio_output_device() == info.name) if (p_ao_app->get_audio_output_device() == info.name)
ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1); 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_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);
ui_audio_volume_divider = new QFrame(ui_audio_widget); ui_audio_volume_divider = new QFrame(ui_audio_widget);
@ -312,7 +314,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_blank_blips_cb->setChecked(p_ao_app->get_blank_blip()); ui_blank_blips_cb->setChecked(p_ao_app->get_blank_blip());
ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb); ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb);
#endif
// The casing tab! // The casing tab!
ui_casing_tab = new QWidget(); ui_casing_tab = new QWidget();