From b4b68fae176823cec6c39c9e22dec41cb8d4876d Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 9 Jan 2016 18:41:41 +0000
Subject: [PATCH] Add cancel button to add-plugin dialog Closes #343

---
 resources/16x16/dialog-cancel.png | Bin 0 -> 714 bytes
 resources/resources.qrc           |   1 +
 resources/ui/carla_database.ui    |  11 +++++++++++
 source/carla_database.py          |   1 +
 4 files changed, 13 insertions(+)
 create mode 100644 resources/16x16/dialog-cancel.png

diff --git a/resources/16x16/dialog-cancel.png b/resources/16x16/dialog-cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..5196d433399591e4bdc6073f8330e903d420b0fa
GIT binary patch
literal 714
zcmV;*0yX`KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007!Nkl<Zc-p0t
z-%C?r9LA5w{Wv?vvtRCP%`Jueagh)Rm0((6vCJr<1z}M%y6B=pL79m+;YGy^NgYWt
z%@Rj!Wi2!}w9TYn;${{Ib&>ypVO?pVPv2K+D9LWRcsZQs`+Odr^PczR0AyM`TbVrn
z2p?KocSb8K=Yu?-dR|oYbF{4NSJ-6w7_F+BXS0j}iMqP(M+U?4c+FuX8yoT2=fjuw
zcBH&s#Hy<iq#5&UWH!M;lVNST{wn5Ln(?f>979eghKma^am0n0hI&k0^k7ibtugPW
zfN84M&(hDGLE`i&bc@1buS(Sv)ajg0^!hz9OYTyv)`dxr2Ql{vFfU`$0U`S4aA`57
zE}Tbaj`+<lNw#&Jo@4fHUthV8Bkp!1Qga9+$BrUYS^~zT1NsXK7oYB@%4MbSt5ja5
z1trNkmS<l`dg}1T<wEp81#W272$bx=<9&O<n7;vhmn5x(4ptzLZ$qCb+8I1zRTgGX
z)*?xJ@w#F++I8C10gk&AP>kr#w}LT@T@UD>m)m9?dd(6BBxzT~VqS<BSTLg~c)Q&K
zAHjVbcQ(jzwxL`ZcVrbhHUw~8RHxHK^~?eyR?Cl3i-31jZib9L4ZnJiVCEZ?q=sQ@
z4tmMUnDid>(1!GocvsD1*dbzq<o9|tZW8SO15-0w%wbsyYj^~VYA_}p@REK>n_j<s
z-zFeLQbN(<x{!@qJm2IOg#3rH>>V#qz9;k=gvrCajM;RM9?;=vQ}b(~JOOcn<GC6{
z6l!BPVAd&PPRzy&y8z~4-Yt)E9}TWidOtOYIs_ygI(%}9n4~pm)q>5KC*x&`P&FTY
w-(`+VHOul!i_y4pB`Yh%w8$2h>A$b@Z`Lt11j{z4y#N3J07*qoM6N<$f}?p$y8r+H

literal 0
HcmV?d00001

diff --git a/resources/resources.qrc b/resources/resources.qrc
index d9da4e3bf..991d1bfc4 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -6,6 +6,7 @@
         <file>16x16/application-exit.png</file>
         <file>16x16/arrow-right.png</file>
         <file>16x16/configure.png</file>
+        <file>16x16/dialog-cancel.png</file>
         <file>16x16/dialog-error.png</file>
         <file>16x16/dialog-information.png</file>
         <file>16x16/dialog-ok-apply.png</file>
diff --git a/resources/ui/carla_database.ui b/resources/ui/carla_database.ui
index 89d337dac..c5a648bd5 100644
--- a/resources/ui/carla_database.ui
+++ b/resources/ui/carla_database.ui
@@ -339,6 +339,17 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="b_cancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../resources.qrc">
+         <normaloff>:/16x16/dialog-cancel.png</normaloff>:/16x16/dialog-cancel.png</iconset>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/source/carla_database.py b/source/carla_database.py
index 1646d5832..dac3efcdf 100755
--- a/source/carla_database.py
+++ b/source/carla_database.py
@@ -1162,6 +1162,7 @@ class PluginDatabaseW(QDialog):
 
         self.finished.connect(self.slot_saveSettings)
         self.ui.b_add.clicked.connect(self.slot_addPlugin)
+        self.ui.b_cancel.clicked.connect(self.reject)
         self.ui.b_refresh.clicked.connect(self.slot_refreshPlugins)
         self.ui.tb_filters.clicked.connect(self.slot_maybeShowFilters)
         self.ui.lineEdit.textChanged.connect(self.slot_checkFilters)