From 753fd2ee40be941dbfc5e1c7387a99c1e2673759 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 20 Dec 2008 18:53:35 +0900
Subject: [PATCH] unify close buttons, rename deck menu to file

---
 ankiqt/ui/preferences.py      |  4 +--
 designer/displayproperties.ui | 63 ++++++++++++++++++++++++-----------
 designer/main.ui              |  2 +-
 designer/preferences.ui       |  3 +-
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/ankiqt/ui/preferences.py b/ankiqt/ui/preferences.py
index 9678d095c..db5ce18cb 100644
--- a/ankiqt/ui/preferences.py
+++ b/ankiqt/ui/preferences.py
@@ -57,9 +57,7 @@ class Preferences(QDialog):
         self.done(0)
 
     def reject(self):
-        self.origConfig['interfaceLang'] = self.origInterfaceLang
-        self.parent.setLang()
-        self.done(0)
+        self.accept()
 
     def setupLang(self):
         # interface lang
diff --git a/designer/displayproperties.ui b/designer/displayproperties.ui
index 1816f5031..ee3d57d5f 100644
--- a/designer/displayproperties.ui
+++ b/designer/displayproperties.ui
@@ -492,6 +492,13 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QPushButton" name="closeButton" >
+                 <property name="text" >
+                  <string>Close</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
             </layout>
@@ -588,12 +595,12 @@
    <slot>setShown(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>98</x>
-     <y>448</y>
+     <x>118</x>
+     <y>503</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>197</x>
-     <y>447</y>
+     <x>329</x>
+     <y>503</y>
     </hint>
    </hints>
   </connection>
@@ -604,12 +611,12 @@
    <slot>setShown(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>136</x>
-     <y>471</y>
+     <x>155</x>
+     <y>533</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>233</x>
-     <y>468</y>
+     <x>329</x>
+     <y>533</y>
     </hint>
    </hints>
   </connection>
@@ -620,12 +627,12 @@
    <slot>setShown(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>109</x>
-     <y>501</y>
+     <x>129</x>
+     <y>563</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>261</x>
-     <y>499</y>
+     <x>329</x>
+     <y>562</y>
     </hint>
    </hints>
   </connection>
@@ -636,12 +643,12 @@
    <slot>setShown(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>118</x>
-     <y>538</y>
+     <x>138</x>
+     <y>617</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>258</x>
-     <y>543</y>
+     <x>329</x>
+     <y>617</y>
     </hint>
    </hints>
   </connection>
@@ -652,12 +659,28 @@
    <slot>setShown(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>106</x>
-     <y>569</y>
+     <x>126</x>
+     <y>647</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>165</x>
-     <y>567</y>
+     <x>326</x>
+     <y>647</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>closeButton</sender>
+   <signal>clicked()</signal>
+   <receiver>DisplayProperties</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>294</x>
+     <y>667</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>388</x>
+     <y>-16</y>
     </hint>
    </hints>
   </connection>
diff --git a/designer/main.ui b/designer/main.ui
index 00f41a319..97102a7bb 100644
--- a/designer/main.ui
+++ b/designer/main.ui
@@ -655,7 +655,7 @@
    </widget>
    <widget class="QMenu" name="menuDeck" >
     <property name="title" >
-     <string>&amp;Deck</string>
+     <string>&amp;File</string>
     </property>
     <widget class="QMenu" name="menuOpenRecent" >
      <property name="title" >
diff --git a/designer/preferences.ui b/designer/preferences.ui
index 1cebb52cf..e16f8f16e 100644
--- a/designer/preferences.ui
+++ b/designer/preferences.ui
@@ -528,7 +528,6 @@
         </spacer>
        </item>
       </layout>
-      <zorder>alternativeTheme</zorder>
      </widget>
     </widget>
    </item>
@@ -538,7 +537,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
      </property>
     </widget>
    </item>