Merge pull request bitcoin#5 from wellenreiter01/0.8.5

added close button to qrencode dialog
destenson · Dec 15, 2013 · 280d6c0 · 280d6c0
2 parents 6dc815d + e38edb9
commit 280d6c0
Showing 1 changed file with 28 additions and 5 deletions.
diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>340</width>
-    <height>530</height>
+    <height>543</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -156,6 +156,13 @@
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="btnClose">
+          <property name="text">
+           <string>Close</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
@@ -199,12 +206,28 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>92</x>
-     <y>285</y>
+     <x>110</x>
+     <y>399</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>177</x>
+     <y>430</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>btnClose</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>QRCodeDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>58</x>
+     <y>511</y>
     </hint>
     <hint type="destinationlabel">
-     <x>98</x>
-     <y>311</y>
+     <x>169</x>
+     <y>271</y>
     </hint>
    </hints>
   </connection>