vkconfig: Open export files

Author: christophe-lunarg

vkconfig_core/test/test_type_hide_message.cpp

@@ -72,8 +72,7 @@ TEST(test_type_hide_message, convert_type_to_bit) {
 }
 
 TEST(test_type_hide_message, convert_specific_flags) {
-    const std::vector<std::string> TOKENS = {"HIDE_MESSAGE_NEED_APPLICATION_RESTART",
-                                             "HIDE_MESSAGE_NOTIFICATION_EXPORT_CONFIGURATION"};
+    const std::vector<std::string> TOKENS = {"HIDE_MESSAGE_NEED_APPLICATION_RESTART", "HIDE_MESSAGE_WARN_MISSING_LAYERS_IGNORE"};
 
     HideMessageFlags flags = GetHideMessageFlags(TOKENS);
     const std::vector<std::string>& back = GetHideMessageTokens(flags);

vkconfig_core/type_hide_message.cpp

@@ -32,8 +32,6 @@ const char* GetToken(HideMessageType value) {
                                 "HIDE_MESSAGE_WIDGET_SETTING_FLOAT",
                                 "HIDE_MESSAGE_WIDGET_SETTING_INT",
                                 "HIDE_MESSAGE_WIDGET_SETTING_FRAMES",
-                                "HIDE_MESSAGE_NOTIFICATION_EXPORT_CONFIGURATION",
-                                "HIDE_MESSAGE_NOTIFICATION_EXPORT_LAYERS_SETTINGS",
                                 "HIDE_MESSAGE_NOTIFICATION_LAYERS_LOADED",
                                 "HIDE_MESSAGE_NOTIFICATION_UNORDERED_LAYER",
                                 "HIDE_MESSAGE_NOTIFICATION_EXECUTABLE_ALL",

vkconfig_core/type_hide_message.h

@@ -30,8 +30,6 @@ enum HideMessageType {
     HIDE_MESSAGE_WIDGET_SETTING_FLOAT,
     HIDE_MESSAGE_WIDGET_SETTING_INT,
     HIDE_MESSAGE_WIDGET_SETTING_FRAMES,
-    HIDE_MESSAGE_NOTIFICATION_EXPORT_CONFIGURATION,
-    HIDE_MESSAGE_NOTIFICATION_EXPORT_LAYERS_SETTINGS,
     HIDE_MESSAGE_NOTIFICATION_LAYERS_LOADED,
     HIDE_MESSAGE_NOTIFICATION_UNORDERED_LAYER,
     HIDE_MESSAGE_NOTIFICATION_EXECUTABLE_ALL,

vkconfig_gui/CHANGELOG.md

@@ -8,6 +8,8 @@
 ### Improvements:
 - Add button to remove missing layers
 - Add loader messages only configuration
+- Open created files on export
+- Add button to open launcher log file
 
 ### Fixes:
 - Fix application arguments and environment variables splitting

vkconfig_gui/mainwindow.ui

@@ -1390,6 +1390,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <widget class="QPushButton" name="launch_options_log_open">
+               <property name="maximumSize">
+                <size>
+                 <width>32</width>
+                 <height>32</height>
+                </size>
+               </property>
+               <property name="toolTip">
+                <string>Open the output log</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
             </layout>
            </item>
           </layout>

vkconfig_gui/tab_applications.cpp

@@ -26,6 +26,7 @@
 #include "../vkconfig_core/alert.h"
 
 #include <QFileDialog>
+#include <QDesktopServices>
 
 TabApplications::TabApplications(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui)
     : Tab(TAB_APPLICATIONS, window, ui), _launch_application(nullptr) {
@@ -36,6 +37,7 @@ TabApplications::TabApplications(MainWindow &window, std::shared_ptr<Ui::MainWin
     this->ui->launch_options_remove->setIcon(::Get(::ICON_OPTIONS_REMOVE));
     this->ui->launch_options_dir_button->setIcon(::Get(::ICON_FOLDER_SEARCH));
     this->ui->launch_options_log_button->setIcon(::Get(::ICON_FILE_SEARCH));
+    this->ui->launch_options_log_open->setIcon(::Get(::ICON_FILE_EXPORT));
 
     this->connect(this->ui->launch_executable_list, SIGNAL(currentIndexChanged(int)), this,
                   SLOT(on_launch_executable_list_activated(int)));
@@ -62,6 +64,7 @@ TabApplications::TabApplications(MainWindow &window, std::shared_ptr<Ui::MainWin
     this->connect(this->ui->launch_options_log_edit, SIGNAL(textEdited(QString)), this,
                   SLOT(on_launch_options_log_textEdited(QString)));
     this->connect(this->ui->launch_options_log_button, SIGNAL(clicked()), this, SLOT(on_launch_options_log_pressed()));
+    this->connect(this->ui->launch_options_log_open, SIGNAL(clicked()), this, SLOT(on_launch_options_log_open_pressed()));
 
     this->connect(this->ui->launch_clear_at_launch, SIGNAL(toggled(bool)), this, SLOT(on_launch_clear_at_launch_toggled(bool)));
     this->connect(this->ui->launch_clear_log, SIGNAL(clicked()), this, SLOT(on_launch_clear_log_pressed()));
@@ -89,6 +92,9 @@ void TabApplications::UpdateUI(UpdateUIMode mode) {
     this->ui->launch_executable_remove->setEnabled(!configurator.executables.Empty());
     this->ui->launch_button->setEnabled(!configurator.executables.Empty());
 
+    const Executable *executable = configurator.executables.GetActiveExecutable();
+    const ExecutableOptions *options = executable->GetActiveOptions();
+
     if (mode == UPDATE_REBUILD_UI) {
         // Rebuild list of applications
         ui->launch_executable_list->blockSignals(true);
@@ -356,6 +362,19 @@ void TabApplications::on_launch_options_log_pressed() {
     }
 }
 
+void TabApplications::on_launch_options_log_open_pressed() {
+    Configurator &configurator = Configurator::Get();
+
+    Executable *executable = configurator.executables.GetActiveExecutable();
+    ExecutableOptions *options = executable->GetActiveOptions();
+
+    if (!options->log_file.Exists()) {
+        options->log_file.Create(true);
+    }
+
+    QDesktopServices::openUrl(QUrl::fromLocalFile(options->log_file.AbsolutePath().c_str()));
+}
+
 void TabApplications::on_launch_clear_at_launch_toggled(bool checked) {
     Configurator::Get().executables.launcher_clear_on_launch = checked;
 }

vkconfig_gui/tab_applications.h

@@ -58,6 +58,7 @@ class TabApplications : public Tab {
     void on_launch_options_envs_textEdited(const QString& text);
     void on_launch_options_log_textEdited(const QString& text);
     void on_launch_options_log_pressed();
+    void on_launch_options_log_open_pressed();
 
     void on_launch_clear_at_launch_toggled(bool checked);
     void on_launch_clear_log_pressed();

vkconfig_gui/tab_configurations.cpp

@@ -783,17 +783,8 @@ void TabConfigurations::OnContextMenuExportConfigsClicked(ListItem *item) {
         msg.setWindowTitle("Exporting of a Loader Configuration file failed...");
         msg.setText(format("Couldn't be create '%s' Loader configuration file.", selected_path.c_str()).c_str());
         msg.exec();
-    } else if (!(configurator.Get(HIDE_MESSAGE_NOTIFICATION_EXPORT_CONFIGURATION))) {
-        QMessageBox msg;
-        msg.setIcon(QMessageBox::Information);
-        msg.setWindowTitle("Exporting of a Loader Configuration file successful.");
-        msg.setText(format("'%s' Loader configuration file was created.", selected_path.c_str()).c_str());
-        msg.setCheckBox(new QCheckBox("Do not show again."));
-        msg.exec();
-
-        if (msg.checkBox()->isChecked()) {
-            configurator.Set(HIDE_MESSAGE_NOTIFICATION_EXPORT_CONFIGURATION);
-        }
+    } else {
+        QDesktopServices::openUrl(QUrl::fromLocalFile(selected_path.c_str()));
     }
 }
 
@@ -820,17 +811,8 @@ void TabConfigurations::OnContextMenuExportSettingsClicked(ListItem *item) {
         msg.setWindowTitle("Exporting of a layers settings file failed...");
         msg.setText(format("Couldn't be create '%s' layers settings file.", selected_path.c_str()).c_str());
         msg.exec();
-    } else if (!(configurator.Get(HIDE_MESSAGE_NOTIFICATION_EXPORT_LAYERS_SETTINGS))) {
-        QMessageBox msg;
-        msg.setIcon(QMessageBox::Information);
-        msg.setWindowTitle("Exporting of a layers Configuration file successful.");
-        msg.setText(format("'%s' layers configuration file was created.", selected_path.c_str()).c_str());
-        msg.setCheckBox(new QCheckBox("Do not show again."));
-        msg.exec();
-
-        if (msg.checkBox()->isChecked()) {
-            configurator.Set(HIDE_MESSAGE_NOTIFICATION_EXPORT_LAYERS_SETTINGS);
-        }
+    } else {
+        QDesktopServices::openUrl(QUrl::fromLocalFile(selected_path.c_str()));
     }
 }
 

vkconfig_gui/tab_diagnostics.cpp

@@ -28,6 +28,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QMenu>
+#include <QDesktopServices>
 
 TabDiagnostics::TabDiagnostics(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui) : Tab(TAB_DIAGNOSTIC, window, ui) {
     this->ui->diagnostic_status_text->installEventFilter(&window);
@@ -116,6 +117,8 @@ void TabDiagnostics::on_customContextMenuRequested(const QPoint &pos) {
             file.close();
 
             configurator.last_path_status = selected_path.toStdString();
+
+            QDesktopServices::openUrl(QUrl::fromLocalFile(selected_path.toStdString().c_str()));
         }
     }