vkconfig: Add diagnostics search

Change-Id: I415054fef55a4e941d7cb08509a4455c44aed94b

Author: christophe-lunarg

vkconfig_core/configurator.cpp

@@ -883,6 +883,14 @@ bool Configurator::Load() {
 
             this->use_system_tray = json_object.value("use_system_tray").toBool();
 
+            if (json_object.value("show_diagnostic_search") != QJsonValue::Undefined) {
+                this->show_diagnostic_search = json_object.value("show_diagnostic_search").toBool();
+            }
+
+            if (json_object.value("diagnostic_search_text") != QJsonValue::Undefined) {
+                this->diagnostic_search_text = json_object.value("diagnostic_search_text").toString().toStdString();
+            }
+
             if (json_object.value("VULKAN_HOME") != QJsonValue::Undefined) {
                 ::SetHomePath(json_object.value("VULKAN_HOME").toString().toStdString());
             }
@@ -939,6 +947,8 @@ bool Configurator::Save() const {
         json_object.insert("use_notify_releases", this->use_notify_releases);
         json_object.insert("latest_sdk_version", this->latest_sdk_version.str().c_str());
         json_object.insert("last_vkconfig_version", Version::VKCONFIG.str().c_str());
+        json_object.insert("show_diagnostic_search", this->show_diagnostic_search);
+        json_object.insert("diagnostic_search_text", this->diagnostic_search_text.c_str());
         json_object.insert("VULKAN_HOME", ::Path(Path::HOME).RelativePath().c_str());
         json_object.insert("VULKAN_DOWNLOAD", ::Path(Path::DOWNLOAD).RelativePath().c_str());
         json_interface_object.insert(GetToken(TAB_PREFERENCES), json_object);
@@ -1004,6 +1014,10 @@ bool Configurator::GetUseNotifyReleases() const { return this->use_notify_releas
 
 void Configurator::SetUseNotifyReleases(bool enabled) { this->use_notify_releases = enabled; }
 
+bool Configurator::GetShowDiagnosticSearch() const { return show_diagnostic_search; }
+
+void Configurator::SetShowDiagnosticSearch(bool enabled) { this->show_diagnostic_search = enabled; }
+
 bool Configurator::ShouldNotify() const {
     return this->latest_sdk_version < this->online_sdk_version && this->online_sdk_version != Version::NONE &&
            !(Version::VKCONFIG > this->last_vkconfig_version);

vkconfig_core/configurator.h

@@ -113,6 +113,9 @@ class Configurator {
     bool GetUseNotifyReleases() const;
     void SetUseNotifyReleases(bool enabled);
 
+    bool GetShowDiagnosticSearch() const;
+    void SetShowDiagnosticSearch(bool enabled);
+
     bool ShouldNotify() const;
 
     bool HasActiveSettings() const;
@@ -149,12 +152,14 @@ class Configurator {
     Version latest_sdk_version = Version::NONE;
     Version online_sdk_version = Version::NONE;
     Version last_vkconfig_version = Version::NONE;
+    std::string diagnostic_search_text;
 
    private:
     int hide_message_boxes_flags = 0;
     bool use_system_tray = false;
     bool use_layer_dev_mode = false;
     bool use_notify_releases = true;
+    bool show_diagnostic_search = false;
     ExecutableScope executable_scope = EXECUTABLE_ANY;
     std::string selected_global_configuration = "Validation";
 };

vkconfig_gui/mainwindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1200</width>
+    <width>1024</width>
     <height>640</height>
    </rect>
   </property>
@@ -85,7 +85,7 @@
        <enum>QTabWidget::TabShape::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>5</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="tab_configurations">
        <attribute name="title">
@@ -1588,6 +1588,48 @@
            <property name="bottomMargin">
             <number>5</number>
            </property>
+           <item>
+            <layout class="QHBoxLayout" name="diagnostic_search_layout">
+             <property name="spacing">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QLineEdit" name="diagnostic_search_edit"/>
+             </item>
+             <item>
+              <widget class="QPushButton" name="diagnostic_search_next">
+               <property name="maximumSize">
+                <size>
+                 <width>32</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="diagnostic_search_exit">
+               <property name="maximumSize">
+                <size>
+                 <width>32</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
            <item>
             <widget class="QTextEdit" name="diagnostic_status_text">
              <property name="font">

vkconfig_gui/resourcefiles/dark/exit.png

@@ -10,6 +10,8 @@
 
         <file>resourcefiles/dark/clear.png</file>
         <file>resourcefiles/dark/drag.png</file>
+        <file>resourcefiles/dark/next.png</file>
+        <file>resourcefiles/dark/exit.png</file>
 
         <file>resourcefiles/dark/file_export.png</file>
         <file>resourcefiles/dark/file_search.png</file>
@@ -38,6 +40,8 @@
 
         <file>resourcefiles/light/clear.png</file>
         <file>resourcefiles/light/drag.png</file>
+        <file>resourcefiles/light/next.png</file>
+        <file>resourcefiles/light/exit.png</file>
 
         <file>resourcefiles/light/file_export.png</file>
         <file>resourcefiles/light/file_search.png</file>

vkconfig_gui/resourcefiles/dark/next.png

@@ -38,6 +38,8 @@ QIcon Get(Icon icon) {
     static const char* ICONS[] = {
         "clear.png",              // ICON_CLEAR
         "drag.png",               // ICON_DRAG
+        "next.png",               // ICON_NEXT
+        "exit.png",               // ICON_EXIT
         "file_append.png",        // ICON_FILE_APPEND,
         "file_export.png",        // ICON_FILE_EXPORT,
         "file_remove.png",        // ICON_FILE_REMOVE,

vkconfig_gui/resourcefiles/light/exit.png

@@ -27,6 +27,8 @@ bool isDarkMode();
 enum Icon {
     ICON_CLEAR = 0,
     ICON_DRAG,
+    ICON_NEXT,
+    ICON_EXIT,
     ICON_FILE_APPEND,
     ICON_FILE_EXPORT,
     ICON_FILE_REMOVE,

vkconfig_gui/resourcefiles/light/next.png

@@ -31,9 +31,24 @@
 #include <QDesktopServices>
 
 TabDiagnostics::TabDiagnostics(MainWindow &window, std::shared_ptr<Ui::MainWindow> ui) : Tab(TAB_DIAGNOSTIC, window, ui) {
+    Configurator &configurator = Configurator::Get();
+
+    this->ui->diagnostic_search_edit->setText(configurator.diagnostic_search_text.c_str());
+    this->ui->diagnostic_search_edit->setVisible(configurator.GetShowDiagnosticSearch());
+
+    this->ui->diagnostic_search_next->setIcon(::Get(::ICON_NEXT));
+    this->ui->diagnostic_search_next->setVisible(configurator.GetShowDiagnosticSearch());
+
+    this->ui->diagnostic_search_exit->setIcon(::Get(::ICON_EXIT));
+    this->ui->diagnostic_search_exit->setVisible(configurator.GetShowDiagnosticSearch());
+
     this->ui->diagnostic_status_text->installEventFilter(&window);
     this->ui->diagnostic_status_text->document()->setMaximumBlockCount(65536);
     this->ui->diagnostic_status_text->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    this->connect(this->ui->diagnostic_search_edit, SIGNAL(textEdited(QString)), this,
+                  SLOT(on_diagnostic_search_textEdited(QString)));
+    this->connect(this->ui->diagnostic_search_next, SIGNAL(clicked()), this, SLOT(on_diagnostic_search_next_pressed()));
     this->connect(this->ui->diagnostic_status_text, SIGNAL(customContextMenuRequested(QPoint)), this,
                   SLOT(on_customContextMenuRequested(const QPoint &)));
 
@@ -82,6 +97,13 @@ void TabDiagnostics::on_customContextMenuRequested(const QPoint &pos) {
     action_save->setEnabled(!this->status.empty());
     menu->addAction(action_save);
 
+    menu->addSeparator();
+
+    QAction *action_search = new QAction("Search...", nullptr);
+    action_search->setShortcut(QKeySequence("Ctrl+f"));
+    action_search->setEnabled(!configurator.GetShowDiagnosticSearch());
+    menu->addAction(action_search);
+
     QAction *action = menu->exec(this->ui->diagnostic_status_text->mapToGlobal(pos));
 
     if (action == action_refresh) {
@@ -96,6 +118,9 @@ void TabDiagnostics::on_customContextMenuRequested(const QPoint &pos) {
             this->status.clear();
             this->ui->diagnostic_status_text->clear();
         }
+    } else if (action == action_search) {
+        configurator.SetShowDiagnosticSearch(true);
+        this->ui->diagnostic_search_edit->setFocus();
     } else if (action == action_save) {
         const QString selected_path =
             QFileDialog::getSaveFileName(this->ui->diagnostic_group_box_refresh, "Select Log file...",