sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #162 (Does not keep settings on Android) and settingsdialog issues for desktop

Browse Source
This commit is contained in:
doitux
2012-12-24 00:14:01 +01:00
parent 805a804400
commit 3ae4ded536
2 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gui_800x480/settingsdialog_800x480.ui
+25 -41
View File
@@ -3785,7 +3785,7 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pushButton_ok">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QObject{font: 32px;}</string> <string notr="true">QObject{font: 32px;}</string>
</property> </property>
@@ -3962,12 +3962,12 @@ p, li { white-space: pre-wrap; }
<slot>setNum(int)</slot> <slot>setNum(int)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>786</x> <x>292</x>
<y>63</y> <y>40</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>362</x> <x>265</x>
<y>63</y> <y>40</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -3978,12 +3978,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>786</x> <x>292</x>
<y>184</y> <y>41</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>786</x> <x>292</x>
<y>217</y> <y>33</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -3994,12 +3994,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>784</x> <x>290</x>
<y>168</y> <y>36</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>784</x> <x>290</x>
<y>188</y> <y>27</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -4010,12 +4010,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>249</x> <x>245</x>
<y>53</y> <y>23</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>277</x> <x>273</x>
<y>53</y> <y>23</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -4026,12 +4026,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>249</x> <x>245</x>
<y>53</y> <y>23</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>306</x> <x>302</x>
<y>79</y> <y>49</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
@@ -4042,28 +4042,12 @@ p, li { white-space: pre-wrap; }
<slot>setEnabled(bool)</slot> <slot>setEnabled(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>362</x> <x>256</x>
<y>235</y> <y>124</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>779</x> <x>297</x>
<y>239</y> <y>125</y>
</hint>
</hints>
</connection>
<connection>
<sender>pushButton</sender>
<signal>clicked()</signal>
<receiver>settingsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>685</x>
<y>390</y>
</hint>
<hint type="destinationlabel">
<x>578</x>
<y>396</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+6
View File
@@ -82,6 +82,12 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
comboBox_switchLanguage->addItem(QString(tr("Tamil")+" "+QString::fromUtf8("(தமிழ்)")),"ta"); comboBox_switchLanguage->addItem(QString(tr("Tamil")+" "+QString::fromUtf8("(தமிழ்)")),"ta");
comboBox_switchLanguage->addItem(QString(tr("Turkish")+" "+QString::fromUtf8("(Tϋrkçe)")),"tr"); comboBox_switchLanguage->addItem(QString(tr("Turkish")+" "+QString::fromUtf8("(Tϋrkçe)")),"tr");
#ifdef ANDROID
connect( pushButton_ok, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
#else
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
#endif
connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent1Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );
connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent2Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) );