From d1ebf8fce246dbd34855da7135a447c0f5a4e85f Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Fri, 12 Aug 2022 00:41:02 +0900 Subject: [PATCH] [UI][Qt][MEDIA_DIALOG] Prepare to be working as separate thread. --- source/src/qt/gui/menu_harddisk.cpp | 2 +- source/src/qt/gui/menu_metaclass.cpp | 10 +++++----- source/src/qt/gui/menu_metaclass.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/src/qt/gui/menu_harddisk.cpp b/source/src/qt/gui/menu_harddisk.cpp index e5b1fc932..cbfb12825 100644 --- a/source/src/qt/gui/menu_harddisk.cpp +++ b/source/src/qt/gui/menu_harddisk.cpp @@ -58,7 +58,7 @@ void Menu_HDDClass::retranslate_pulldown_menu_device_sub(void) void Menu_HDDClass::do_open_dialog_create_hd() { CSP_CreateHardDiskDialog dlg(media_drive, 512, 15, 4, 1024); - + if(initial_dir.isEmpty()) { QDir dir; char app[PATH_MAX]; diff --git a/source/src/qt/gui/menu_metaclass.cpp b/source/src/qt/gui/menu_metaclass.cpp index 5bffe1e95..86cb6b4b6 100644 --- a/source/src/qt/gui/menu_metaclass.cpp +++ b/source/src/qt/gui/menu_metaclass.cpp @@ -59,6 +59,7 @@ Menu_MetaClass::Menu_MetaClass(QMenuBar *root_entry, QString desc, std::shared_p icon_write_enabled = QIcon(); setToolTipsVisible(true); + connect(this, SIGNAL(sig_emu_update_config()), p_wid, SLOT(do_emu_update_config())); tmps = QString::fromUtf8("%1").arg(drv + base_drv); @@ -183,11 +184,10 @@ void Menu_MetaClass::do_select_inner_media(int num) } } - void Menu_MetaClass::do_open_dialog() { - CSP_DiskDialog dlg; - + CSP_DiskDialog dlg(this); + if(initial_dir.isEmpty()) { QDir dir; char app[PATH_MAX]; @@ -214,7 +214,7 @@ void Menu_MetaClass::do_open_dialog() tmps = tmps + QString::fromUtf8(" ") + this->title(); } dlg.setWindowTitle(tmps); - + QObject::connect(&dlg, SIGNAL(fileSelected(QString)), dlg.param, SLOT(_open_disk(QString))); QObject::connect(dlg.param, SIGNAL(sig_open_disk(int, QString)), this, SLOT(do_open_media(int, QString))); @@ -284,7 +284,7 @@ void Menu_MetaClass::create_pulldown_menu_sub(void) _tmp_ins.setValue(tmp); action_insert->setData(_tmp_ins); - connect(action_insert, SIGNAL(triggered()), this, SLOT(do_open_dialog())); + connect(action_insert, SIGNAL(triggered()), this, SLOT(do_open_dialog()), Qt::QueuedConnection); action_insert->setIcon(icon_insert); action_eject = new Action_Control(p_wid, using_flags); diff --git a/source/src/qt/gui/menu_metaclass.h b/source/src/qt/gui/menu_metaclass.h index 6f842b53c..33321303c 100644 --- a/source/src/qt/gui/menu_metaclass.h +++ b/source/src/qt/gui/menu_metaclass.h @@ -13,6 +13,7 @@ #include #include #include + #include #include "common.h" -- 2.11.0