From e1f7319151510988f18fbc9278fb79490423ed54 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 31 Dec 2019 15:38:42 +1100 Subject: [PATCH] for languages in the PreferencesDialog use a function that provides a more appropriate name --- app/dialog/preferences/tabs/preferencesgeneraltab.cpp | 2 +- app/dialog/sequence/sequence.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp index 249b441eb..d2d2354d4 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp @@ -25,7 +25,7 @@ PreferencesGeneralTab::PreferencesGeneralTab() language_combobox_ = new QComboBox(); // Add default language (en-US) - language_combobox_->addItem(QLocale::languageToString(QLocale("en_US").language())); + language_combobox_->addItem(QLocale("en_US").nativeLanguageName()); // Set sequence to pick up default parameters from the config default_sequence_.set_default_parameters(); diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp index 5548e1321..889fa5d45 100644 --- a/app/dialog/sequence/sequence.cpp +++ b/app/dialog/sequence/sequence.cpp @@ -159,7 +159,6 @@ void SequenceDialog::accept() // Get the rational at the combobox's index (which will be correct provided AddFrameRate() was used at all time) rational video_time_base = frame_rate_list_.at(video_frame_rate_field_->currentIndex()).flipped(); - // Get the rational at the combobox's index (which will be correct provided AddFrameRate() was used at all time) int audio_sample_rate = sample_rate_list_.at(audio_sample_rate_field_->currentIndex());