[Eliot-dev] eliot/qt player_widget.cpp player_widget.h ui/p...

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>       11/01/15 16:33:02

Modified files:
        qt             : player_widget.cpp player_widget.h 
        qt/ui          : player_widget.ui 

Log message:
        In free game mode, the "Change" button cannot be used anymore to pass 
without changing any letter.
        This should be more intuitive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/player_widget.cpp?cvsroot=eliot&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/player_widget.h?cvsroot=eliot&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/player_widget.ui?cvsroot=eliot&r1=1.7&r2=1.8

Patches:
Index: player_widget.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/player_widget.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- player_widget.cpp   10 Jan 2011 22:06:10 -0000      1.18
+++ player_widget.cpp   15 Jan 2011 16:33:02 -0000      1.19
@@ -140,19 +140,33 @@
 {
     pushButtonChange->setEnabled(lineEditChange->hasAcceptableInput() &&
                                  lineEditChange->text() != "");
-    pushButtonPass->setEnabled(lineEditChange->text() == "");
 }
 
 
 void PlayerWidget::on_lineEditChange_returnPressed()
 {
     ASSERT(m_game->getMode() == PublicGame::kFREEGAME,
-           "Trying to pass or change letters while not in free game mode");
+           "Trying to change letters while not in free game mode");
 
-    QString inputLetters = lineEditChange->text();
+    pass(lineEditChange->text());
+}
+
+
+void PlayerWidget::on_pushButtonPass_clicked()
+{
+    ASSERT(m_game->getMode() == PublicGame::kFREEGAME,
+           "Trying to pass while not in free game mode");
+
+    pass("");
+}
+
+
+void PlayerWidget::pass(QString inputLetters)
+{
     // Convert the input string into an internal one
     const wstring &letters =
         m_game->getDic().convertFromInput(qtw(inputLetters));
+
     // Pass the turn (and possibly change letters)
     int res = m_game->freeGamePass(letters);
     if (res == 0)

Index: player_widget.h
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/player_widget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- player_widget.h     19 Feb 2009 18:25:19 -0000      1.10
+++ player_widget.h     15 Jan 2011 16:33:02 -0000      1.11
@@ -56,11 +56,13 @@
 private slots:
     void on_pushButtonShuffle_clicked();
     void on_pushButtonChange_clicked() { on_lineEditChange_returnPressed(); }
-    void on_pushButtonPass_clicked() { on_lineEditChange_returnPressed(); }
+    void on_pushButtonPass_clicked();
     void on_lineEditChange_textChanged();
     void on_lineEditChange_returnPressed();
 
 private:
+    void pass(QString inputLetters);
+
     /// Encapsulated game, can be NULL
     PublicGame *m_game;
 

Index: ui/player_widget.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/player_widget.ui,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ui/player_widget.ui 2 Jan 2010 11:30:20 -0000       1.7
+++ ui/player_widget.ui 15 Jan 2011 16:33:02 -0000      1.8
@@ -48,6 +48,9 @@
    </item>
    <item row="2" column="2" colspan="2">
     <widget class="QPushButton" name="pushButtonChange">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>_(&quot;Change&quot;)</string>
      </property>