4 files changed, 75 insertions, 1 deletions

diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index a48c4d69..b4562843 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -101,6 +101,20 @@ void InstanceSettingsPage::applySettings()
 {
     SettingsObject::Lock lock(m_settings);
 
+    // Miscellaneous
+    bool miscellaneous = ui->miscellaneousSettingsBox->isChecked();
+    m_settings->set("OverrideMiscellaneous", miscellaneous);
+    if (miscellaneous)
+    {
+        m_settings->set("CloseAfterLaunch", ui->closeAfterLaunchCheck->isChecked());
+        m_settings->set("QuitAfterGameStop", ui->quitAfterGameStopCheck->isChecked());
+    }
+    else
+    {
+        m_settings->reset("CloseAfterLaunch");
+        m_settings->reset("QuitAfterGameStop");
+    }
+
     // Console
     bool console = ui->consoleSettingsBox->isChecked();
     m_settings->set("OverrideConsole", console);
@@ -247,6 +261,11 @@ void InstanceSettingsPage::applySettings()
 
 void InstanceSettingsPage::loadSettings()
 {
+    // Miscellaneous
+    ui->miscellaneousSettingsBox->setChecked(m_settings->get("OverrideMiscellaneous").toBool());
+    ui->closeAfterLaunchCheck->setChecked(m_settings->get("CloseAfterLaunch").toBool());
+    ui->quitAfterGameStopCheck->setChecked(m_settings->get("QuitAfterGameStop").toBool());
+
     // Console
     ui->consoleSettingsBox->setChecked(m_settings->get("OverrideConsole").toBool());
     ui->showConsoleCheck->setChecked(m_settings->get("ShowConsole").toBool());
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 5db2d147..cb66b3ce 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -350,6 +350,35 @@
         </widget>
        </item>
        <item>
+        <widget class="QGroupBox" name="miscellaneousSettingsBox">
+         <property name="title">
+          <string>Miscellaneous</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_12">
+          <item>
+           <widget class="QCheckBox" name="closeAfterLaunchCheck">
+            <property name="text">
+             <string>Close the launcher after game window opens</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="quitAfterGameStopCheck">
+            <property name="text">
+             <string>Quit the launcher after game window closes</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <spacer name="verticalSpacerMinecraft_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index e694ebe3..2cf17b32 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -251,7 +251,7 @@ ScreenshotsPage::ScreenshotsPage(QString path, QWidget *parent)
     m_model.reset(new QFileSystemModel());
     m_filterModel.reset(new FilterModel());
     m_filterModel->setSourceModel(m_model.get());
-    m_model->setFilter(QDir::Files | QDir::Writable | QDir::Readable);
+    m_model->setFilter(QDir::Files);
     m_model->setReadOnly(false);
     m_model->setNameFilters({"*.png"});
     m_model->setNameFilterDisables(false);
@@ -343,6 +343,29 @@ void ScreenshotsPage::onItemActivated(QModelIndex index)
     DesktopServices::openFile(info.absoluteFilePath());
 }
 
+void ScreenshotsPage::onCurrentSelectionChanged(const QItemSelection &selected)
+{
+    bool allReadable = !selected.isEmpty();
+    bool allWritable = !selected.isEmpty();
+
+    for (auto index : selected.indexes())
+    {
+        if (!index.isValid())
+            break;
+        auto info = m_model->fileInfo(index);
+        if (!info.isReadable())
+            allReadable = false;
+        if (!info.isWritable())
+            allWritable = false;
+    }
+
+    ui->actionUpload->setEnabled(allReadable);
+    ui->actionCopy_Image->setEnabled(allReadable);
+    ui->actionCopy_File_s->setEnabled(allReadable);
+    ui->actionDelete->setEnabled(allWritable);
+    ui->actionRename->setEnabled(allWritable);
+}
+
 void ScreenshotsPage::on_actionView_Folder_triggered()
 {
     DesktopServices::openDirectory(m_folder, true);
@@ -503,6 +526,8 @@ void ScreenshotsPage::openedImpl()
         if(idx.isValid())
         {
             ui->listView->setModel(m_filterModel.get());
+            connect(ui->listView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ScreenshotsPage::onCurrentSelectionChanged);
+            onCurrentSelectionChanged(ui->listView->selectionModel()->selection()); // set initial button enable states
             ui->listView->setRootIndex(m_filterModel->mapFromSource(idx));
         }
         else
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.h b/launcher/ui/pages/instance/ScreenshotsPage.h
index 50cf1a17..c22706af 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.h
+++ b/launcher/ui/pages/instance/ScreenshotsPage.h
@@ -100,6 +100,7 @@ private slots:
     void on_actionRename_triggered();
     void on_actionView_Folder_triggered();
     void onItemActivated(QModelIndex);
+    void onCurrentSelectionChanged(const QItemSelection &selected);
     void ShowContextMenu(const QPoint &pos);
 
 private: