From 2c145fc64cf6473ec3eb4ea5e11d871feadb2660 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 30 May 2017 13:18:57 +0100
Subject: [PATCH] Add handling to remote suggestion dialog for selecting
 remotes

---
 qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp | 8 +++++---
 qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.h   | 4 +++-
 qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui  | 8 +-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp
index 28a410cfc..09e1776ae 100644
--- a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.cpp
@@ -50,10 +50,11 @@ SuggestRemoteDialog::SuggestRemoteDialog(const QString &driver, const QString &m
   m_Remotes = new QMenu(this);
 
   ui->remote->setEnabled(false);
-  ui->remote->setIcon(QIcon());
   ui->remote->setText(tr("No Remote"));
 
   ui->remote->setMenu(m_Remotes);
+
+  QObject::connect(m_Remotes, &QMenu::triggered, this, &SuggestRemoteDialog::remoteItem_clicked);
 }
 
 SuggestRemoteDialog::~SuggestRemoteDialog()
@@ -73,7 +74,6 @@ void SuggestRemoteDialog::remotesAdded()
                        tr("the capture locally?"));
 
   ui->remote->setEnabled(true);
-  ui->remote->setIcon(Icons::down_arrow());
   ui->remote->setText(tr("Remote"));
 }
 
@@ -87,8 +87,10 @@ void SuggestRemoteDialog::on_alwaysLocal_toggled(bool checked)
   ui->remote->setEnabled(!m_Remotes->isEmpty() && !checked);
 }
 
-void SuggestRemoteDialog::on_remote_clicked()
+void SuggestRemoteDialog::remoteItem_clicked(QAction *action)
 {
+  m_Choice = Remote;
+  accept();
 }
 
 void SuggestRemoteDialog::on_local_clicked()
diff --git a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.h b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.h
index 60c069f4c..642a96dea 100644
--- a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.h
+++ b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.h
@@ -57,10 +57,12 @@ public:
 private slots:
   // automatic slots
   void on_alwaysLocal_toggled(bool checked);
-  void on_remote_clicked();
   void on_local_clicked();
   void on_cancel_clicked();
 
+  // manual slots
+  void remoteItem_clicked(QAction *action);
+
 private:
   Ui::SuggestRemoteDialog *ui;
   QMenu *m_Remotes;
diff --git a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui
index 87b6b1608..7641ae9f5 100644
--- a/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/SuggestRemoteDialog.ui
@@ -122,10 +122,6 @@ always replay locally.</string>
         <property name="text">
          <string>Remote</string>
         </property>
-        <property name="icon">
-         <iconset resource="../../Resources/resources.qrc">
-          <normaloff>:/down_arrow.png</normaloff>:/down_arrow.png</iconset>
-        </property>
        </widget>
       </item>
       <item>
@@ -147,8 +143,6 @@ always replay locally.</string>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../Resources/resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>