From ddd199f103925db0f4e6ca8f2b9118558d787feb Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Mon, 29 Jan 2007 21:25:33 +0000
Subject: [PATCH] cancel new game dialog between games fixed impoved key
 handling while type and set bets

---
 src/gui/qt/mainwindow.ui          | 22 +++++++++++++++++++---
 src/gui/qt/mainwindowimpl.cpp     | 10 +++-------
 src/gui/qt/settingsdialogimpl.cpp |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index 2920044a..3ef5d3ab 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -3992,7 +3992,7 @@
      <x>0</x>
      <y>0</y>
      <width>874</width>
-     <height>30</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSpiel" >
@@ -4061,8 +4061,24 @@
      <y>616</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>717</x>
-     <y>614</y>
+     <x>716</x>
+     <y>627</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>spinBox_set</sender>
+   <signal>editingFinished()</signal>
+   <receiver>pushButton_set</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>572</x>
+     <y>498</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>533</x>
+     <y>501</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/gui/qt/mainwindowimpl.cpp b/src/gui/qt/mainwindowimpl.cpp
index cd3e65d3..13b81186 100755
--- a/src/gui/qt/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindowimpl.cpp
@@ -1422,15 +1422,13 @@ void mainWindowImpl::postRiverRunAnimation6() {
 	if (playersPositiveCashCounter==1) {
 		
 		callNewGameDialog();	
+		//Bei Cancel nichts machen!!!
+		return;
 	} 
-	//sonst 
-	else {
-
-	}
+	
 	postRiverRunAnimation6Timer->start(newRoundSpeed);
 }
 
-
 void mainWindowImpl::flipHolecardsAllIn() {
 
 	int i;
@@ -1466,8 +1464,6 @@ void mainWindowImpl::flipHolecardsAllIn() {
 
 }
 
-
-
 void mainWindowImpl::startNewHand() {
 
 if( !breakAfterActualHand){ actualGame->startHand();
diff --git a/src/gui/qt/settingsdialogimpl.cpp b/src/gui/qt/settingsdialogimpl.cpp
index b34163c0..2a367e3f 100644
--- a/src/gui/qt/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialogimpl.cpp
@@ -108,7 +108,7 @@ void settingsDialogImpl::setFlipsidePicFileName()
  {
  	QString fileName = QFileDialog::getOpenFileName(this, tr("Select your Flipside Picture"),
                                                 QDir::homePath(),
-                                                tr("Images (*.png *.xpm)"));
+                                                tr("Images (*.bmp *.png *.xpm)"));
 
      if (!fileName.isEmpty())
          lineEdit_OwnFlipsideFilename->setText(fileName);