Virtual ISO: Add Qt and Win32 user interfaces

src/qt/languages/cs-CZ.po

@@ -229,6 +229,9 @@ msgstr "&Načíst znova předchozí obraz"
 msgid "&Image"
 msgstr "&Obraz..."
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Cílová snímková frekvence"
 

src/qt/languages/de-DE.po

@@ -229,6 +229,9 @@ msgstr "&Voriges Image neu laden"
 msgid "&Image"
 msgstr "&Image"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Ziel&framerate"
 

src/qt/languages/en-GB.po

@@ -229,6 +229,9 @@ msgstr "&Reload previous image"
 msgid "&Image"
 msgstr "&Image"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Target &framerate"
 

src/qt/languages/en-US.po

@@ -229,6 +229,9 @@ msgstr "&Reload previous image"
 msgid "&Image"
 msgstr "&Image"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Target &framerate"
 

src/qt/languages/es-ES.po

@@ -229,6 +229,9 @@ msgstr "&Recargar imagen previa"
 msgid "&Image"
 msgstr "&Imagen..."
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Tasa de refresco objetivo"
 

src/qt/languages/fi-FI.po

@@ -229,6 +229,9 @@ msgstr "&Lataa edellinen levykuva uudelleen"
 msgid "&Image"
 msgstr "L&evykuva"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Kuvataajuustavoite"
 

src/qt/languages/fr-FR.po

@@ -229,6 +229,9 @@ msgstr "&Recharger image précedente"
 msgid "&Image"
 msgstr "&Image"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Taux de rafraîchissement cible"
 

src/qt/languages/hr-HR.po

@@ -229,6 +229,9 @@ msgstr "&Ponovo učitaj prethodnu sliku"
 msgid "&Image"
 msgstr "&Slika"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Ciljni broj okvira u sekundi"
 

src/qt/languages/hu-HU.po

@@ -229,6 +229,9 @@ msgstr "Előző képfájl &újratöltése"
 msgid "&Image"
 msgstr "&Meglévő képfájl &megnyitása..."
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Cél &képkockasebesség"
 

src/qt/languages/it-IT.po

@@ -229,6 +229,9 @@ msgstr "&Ricarica l'immagine precedente"
 msgid "&Image"
 msgstr "&Immagine"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Imposta obiettivo &fotogrammi"
 

src/qt/languages/ja-JP.po

@@ -229,6 +229,9 @@ msgstr "前のイメージを再読み込み(&R)"
 msgid "&Image"
 msgstr "イメージ(&I)"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "目標フレームレート(&F)"
 

src/qt/languages/ko-KR.po

@@ -229,6 +229,9 @@ msgstr "이전 이미지 다시 불러오기(&R)"
 msgid "&Image"
 msgstr "이미지(&I)"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "목표 프레임 레이트(&F)"
 

src/qt/languages/pl-PL.po

@@ -229,6 +229,9 @@ msgstr "&Przeładuj poprzedni obraz"
 msgid "&Image"
 msgstr "&Obraz"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Docelowa &liczba klatek na sekundę"
 

src/qt/languages/pt-BR.po

@@ -229,6 +229,9 @@ msgstr "&Recarregar imagem anterior"
 msgid "&Image"
 msgstr "&Imagem"
 
+msgid "&Folder"
+msgstr "&Pasta"
+
 msgid "Target &framerate"
 msgstr "&Taxa de quadro pretendida"
 

src/qt/languages/pt-PT.po

@@ -229,6 +229,9 @@ msgstr "&Recarregar imagem anterior"
 msgid "&Image"
 msgstr "&Imagem"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Taxa de quadros de destino"
 

src/qt/languages/ru-RU.po

@@ -229,6 +229,9 @@ msgstr "&Снова загрузить предыдущий образ"
 msgid "&Image"
 msgstr "&Образ..."
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Целевая &частота кадров"
 

src/qt/languages/sl-SI.po

@@ -229,6 +229,9 @@ msgstr "&Naloži zadnjo sliko"
 msgid "&Image"
 msgstr "&Slika"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "&Ciljno št. sličic na sekundo"
 

src/qt/languages/tr-TR.po

@@ -229,6 +229,9 @@ msgstr "&Önceki imajı seç"
 msgid "&Image"
 msgstr "&İmaj seç"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Hedef &kare oranı"
 

src/qt/languages/uk-UA.po

@@ -229,6 +229,9 @@ msgstr "&Знову завантажити попередній образ"
 msgid "&Image"
 msgstr "&Образ..."
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "Цільова &частота кадрів"
 

src/qt/languages/zh-CN.po

@@ -229,6 +229,9 @@ msgstr "载入上一个镜像(&R)"
 msgid "&Image"
 msgstr "镜像(&I)"
 
+msgid "&Folder"
+msgstr "&Folder"
+
 msgid "Target &framerate"
 msgstr "目标帧率(&F)"
 

src/qt/qt_mediamenu.cpp

@@ -119,7 +119,9 @@ void MediaMenu::refresh(QMenu *parentMenu) {
         menu->addAction(tr("&Reload previous image"), [this, i]() { cdromReload(i); });
         menu->addSeparator();
         cdromImagePos = menu->children().count();
-        menu->addAction(tr("&Image"), [this, i]() { cdromMount(i); })->setCheckable(true);
+        menu->addAction(tr("&Image"), [this, i]() { cdromMount(i, 0); })->setCheckable(true);
+        cdromDirPos = menu->children().count();
+        menu->addAction(tr("&Folder"), [this, i]() { cdromMount(i, 1); })->setCheckable(true);
         cdromMenus[i] = menu;
         cdromUpdateMenu(i);
     });
@@ -358,18 +360,23 @@ void MediaMenu::cdromMute(int i) {
     sound_cd_thread_reset();
 }
 
-void MediaMenu::cdromMount(int i) {
-    QString dir;
+void MediaMenu::cdromMount(int i, int dir) {
+    QString filename;
     QFileInfo fi(cdrom[i].image_path);
 
-    auto filename = QFileDialog::getOpenFileName(
-        parentWidget,
-        QString(),
-        QString(),
-        tr("CD-ROM images") %
-        util::DlgFilter({ "iso","cue" }) %
-        tr("All files") %
-        util::DlgFilter({ "*" }, true));
+    if (dir) {
+        filename = QFileDialog::getExistingDirectory(
+            parentWidget);
+    } else {
+        filename = QFileDialog::getOpenFileName(
+            parentWidget,
+            QString(),
+            QString(),
+            tr("CD-ROM images") %
+            util::DlgFilter({ "iso","cue" }) %
+            tr("All files") %
+            util::DlgFilter({ "*" }, true));
+    }
 
     if (filename.isEmpty()) {
         return;
@@ -419,8 +426,10 @@ void MediaMenu::cdromUpdateMenu(int i) {
     muteMenu->setChecked(cdrom[i].sound_on == 0);
 
     auto* imageMenu = dynamic_cast<QAction*>(childs[cdromImagePos]);
+    auto* dirMenu = dynamic_cast<QAction*>(childs[cdromDirPos]);
     auto* emptyMenu = dynamic_cast<QAction*>(childs[cdromEmptyPos]);
-    imageMenu->setChecked(cdrom[i].host_drive == 200);
+    imageMenu->setChecked((cdrom[i].host_drive == 200) && !cdrom[i].is_dir);
+    dirMenu->setChecked((cdrom[i].host_drive == 200) && cdrom[i].is_dir);
     emptyMenu->setChecked(cdrom[i].host_drive != 200);
 
     auto* prevMenu = dynamic_cast<QAction*>(childs[cdromReloadPos]);

src/qt/qt_mediamenu.hpp

@@ -36,7 +36,7 @@ public:
     void floppyUpdateMenu(int i);
 
     void cdromMute(int i);
-    void cdromMount(int i);
+    void cdromMount(int i, int dir);
     void cdromEject(int i);
     void cdromReload(int i);
     void cdromUpdateMenu(int i);
@@ -79,6 +79,7 @@ private:
     int cdromEmptyPos;
     int cdromReloadPos;
     int cdromImagePos;
+    int cdromDirPos;
 
     int zipEjectPos;
     int zipReloadPos;

src/qt/qt_platform.cpp

@@ -184,6 +184,13 @@ plat_getcwd(char *bufp, int max)
     return 0;
 }
 
+char *
+plat_get_basename(const char *path)
+{
+    QFileInfo fi(path);
+    return fi.fileName().toUtf8().data();
+}
+
 void
 plat_get_dirname(char *dest, const char *path)
 {

src/qt/qt_settingsfloppycdrom.cpp

@@ -154,7 +154,7 @@ void SettingsFloppyCDROM::save() {
     /* Removable devices category */
     model = ui->tableViewCDROM->model();
     for (int i = 0; i < CDROM_NUM; i++) {
-	cdrom[i].img_fp = NULL;
+	cdrom[i].is_dir = 0;
         cdrom[i].priv = NULL;
         cdrom[i].ops = NULL;
         cdrom[i].image = NULL;