unify close buttons, rename deck menu to file

This commit is contained in:
Damien Elmes 2008-12-20 18:53:35 +09:00
parent eacff663ef
commit 753fd2ee40
4 changed files with 46 additions and 26 deletions

View file

@ -57,9 +57,7 @@ class Preferences(QDialog):
self.done(0) self.done(0)
def reject(self): def reject(self):
self.origConfig['interfaceLang'] = self.origInterfaceLang self.accept()
self.parent.setLang()
self.done(0)
def setupLang(self): def setupLang(self):
# interface lang # interface lang

View file

@ -492,6 +492,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="closeButton" >
<property name="text" >
<string>Close</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -588,12 +595,12 @@
<slot>setShown(bool)</slot> <slot>setShown(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>98</x> <x>118</x>
<y>448</y> <y>503</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>197</x> <x>329</x>
<y>447</y> <y>503</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -604,12 +611,12 @@
<slot>setShown(bool)</slot> <slot>setShown(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>136</x> <x>155</x>
<y>471</y> <y>533</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>233</x> <x>329</x>
<y>468</y> <y>533</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -620,12 +627,12 @@
<slot>setShown(bool)</slot> <slot>setShown(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>109</x> <x>129</x>
<y>501</y> <y>563</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>261</x> <x>329</x>
<y>499</y> <y>562</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -636,12 +643,12 @@
<slot>setShown(bool)</slot> <slot>setShown(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>118</x> <x>138</x>
<y>538</y> <y>617</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>258</x> <x>329</x>
<y>543</y> <y>617</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@ -652,12 +659,28 @@
<slot>setShown(bool)</slot> <slot>setShown(bool)</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
<x>106</x> <x>126</x>
<y>569</y> <y>647</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel" >
<x>165</x> <x>326</x>
<y>567</y> <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> </hint>
</hints> </hints>
</connection> </connection>

View file

@ -655,7 +655,7 @@
</widget> </widget>
<widget class="QMenu" name="menuDeck" > <widget class="QMenu" name="menuDeck" >
<property name="title" > <property name="title" >
<string>&amp;Deck</string> <string>&amp;File</string>
</property> </property>
<widget class="QMenu" name="menuOpenRecent" > <widget class="QMenu" name="menuOpenRecent" >
<property name="title" > <property name="title" >

View file

@ -528,7 +528,6 @@
</spacer> </spacer>
</item> </item>
</layout> </layout>
<zorder>alternativeTheme</zorder>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -538,7 +537,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property> </property>
</widget> </widget>
</item> </item>