merged master and fixed superimpose effect
This commit is contained in:
@@ -83,9 +83,12 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) :
|
||||
{
|
||||
setWindowTitle(tr("Preferences"));
|
||||
setup_ui();
|
||||
}
|
||||
|
||||
PreferencesDialog::~PreferencesDialog() {}
|
||||
recordingComboBox->setCurrentIndex(olive::CurrentConfig.recording_mode - 1);
|
||||
imgSeqFormatEdit->setText(olive::CurrentConfig.img_seq_formats);
|
||||
|
||||
setup_kbd_shortcuts(olive::MainWindow->menuBar());
|
||||
}
|
||||
|
||||
void PreferencesDialog::setup_kbd_shortcut_worker(QMenu* menu, QTreeWidgetItem* parent) {
|
||||
QList<QAction*> actions = menu->actions();
|
||||
@@ -255,7 +258,7 @@ void PreferencesDialog::setup_kbd_shortcuts(QMenuBar* menubar) {
|
||||
}
|
||||
}
|
||||
|
||||
void PreferencesDialog::save() {
|
||||
void PreferencesDialog::accept() {
|
||||
bool restart_after_saving = false;
|
||||
bool reinit_audio = false;
|
||||
bool reload_language = false;
|
||||
@@ -448,7 +451,7 @@ void PreferencesDialog::save() {
|
||||
olive::Global->load_translation_from_config();
|
||||
}
|
||||
|
||||
accept();
|
||||
QDialog::accept();
|
||||
|
||||
if (restart_after_saving) {
|
||||
// since we already ran can_close_project(), bypass checking again by running set_modified(false)
|
||||
@@ -1025,6 +1028,6 @@ void PreferencesDialog::setup_ui() {
|
||||
|
||||
verticalLayout->addWidget(buttonBox);
|
||||
|
||||
connect(buttonBox, SIGNAL(accepted()), this, SLOT(save()));
|
||||
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
|
||||
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user