Small UI improvements

Made small UI improvements. Spacebar now deletes a character at
the present cell and moves to the next one (depending on whether
the across mode or down mode is set)

diff --git a/player_mainwindow.py b/player_mainwindow.py
index 24fabf6..8ffdb16 100644 (file)
--- a/player_mainwindow.py
+++ b/player_mainwindow.py
@@ -262,7 +262,7 @@ along with GetAClue.  If not, see <http://www.gnu.org/licenses/>."""
                if self.puzzle:
                        # set a guess only if not revealed
                        if self.puzzle.data[self.selected_row][self.selected_col].revealed is False:
                if self.puzzle:
                        # set a guess only if not revealed
                        if self.puzzle.data[self.selected_row][self.selected_col].revealed is False:

-                               self.puzzle.data[self.selected_row][self.selected_col].guess = guess_char.upper ()
+                               self.puzzle.data[self.selected_row][self.selected_col].guess = guess_char

                                # across mode typing
                                if self.typing_mode == self.ACROSS:
                                        # move by one character across but only if there is no block
                                # across mode typing
                                if self.typing_mode == self.ACROSS:
                                        # move by one character across but only if there is no block


@@ -355,12 +355,18 @@ along with GetAClue.  If not, see <http://www.gnu.org/licenses/>."""
                                drawarea.queue_draw ()
                        # if it is A-Z or a-z then
                        elif len (key) == 1 and key.isalpha ():
                                drawarea.queue_draw ()
                        # if it is A-Z or a-z then
                        elif len (key) == 1 and key.isalpha ():

-                               self.set_guess (key)
+                               guess_char = key.upper ()
+                               self.set_guess (guess_char)

                                drawarea.queue_draw ()
                        # if it is the delete key then delete character at selected row/col
                                drawarea.queue_draw ()
                        # if it is the delete key then delete character at selected row/col

-                       elif key == "delete" or key == "space":
+                       elif key == "delete":

                                self.puzzle.data[self.selected_row][self.selected_col].guess = None
                                drawarea.queue_draw ()
                                self.puzzle.data[self.selected_row][self.selected_col].guess = None
                                drawarea.queue_draw ()

+                       # if the key is space key then delete character and move across or
+                       # down one step depending on the mode
+                       elif key == "space":
+                               self.set_guess (None)
+                               drawarea.queue_draw ()

                        # if it is backspace key then delete character at previous row/col
                        # depending on the input mode. If across editing mode, then delete
                        # at previous column else at previous row
                        # if it is backspace key then delete character at previous row/col
                        # depending on the input mode. If across editing mode, then delete
                        # at previous column else at previous row

diff --git a/playerwindow.glade b/playerwindow.glade
index 36dd5a6..2727527 100644 (file)
--- a/playerwindow.glade
+++ b/playerwindow.glade
@@ -213,13 +213,12 @@
             <child>
               <object class="GtkVPaned" id="vpaned1">
                 <property name="visible">True</property>
             <child>
               <object class="GtkVPaned" id="vpaned1">
                 <property name="visible">True</property>

-                <property name="can_focus">True</property>

                 <property name="position">180</property>
                 <property name="position_set">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                 <property name="position">180</property>
                 <property name="position_set">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>

-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>

                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>


@@ -230,16 +229,17 @@
                         <property name="can_focus">True</property>
                         <property name="model">clues_across</property>
                         <property name="headers_clickable">False</property>
                         <property name="can_focus">True</property>
                         <property name="model">clues_across</property>
                         <property name="headers_clickable">False</property>

+                        <property name="enable_search">False</property>

                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_across_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="number">
                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_across_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="number">

-                            <property name="title">Number</property>
+                            <property name="title">#</property>

                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="clueacross">
                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="clueacross">

-                            <property name="title">Clue Across</property>
+                            <property name="title">Clues Across</property>

                           </object>
                         </child>
                       </object>
                           </object>
                         </child>
                       </object>


@@ -253,7 +253,7 @@
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow2">
                     <property name="visible">True</property>

-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>

                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
                     <child>


@@ -264,16 +264,17 @@
                         <property name="can_focus">True</property>
                         <property name="model">clues_down</property>
                         <property name="headers_clickable">False</property>
                         <property name="can_focus">True</property>
                         <property name="model">clues_down</property>
                         <property name="headers_clickable">False</property>

+                        <property name="enable_search">False</property>

                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_down_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="downnum">
                         <property name="search_column">0</property>
                         <signal name="row_activated" handler="on_tree_clues_down_row_activated"/>
                         <child>
                           <object class="GtkTreeViewColumn" id="downnum">

-                            <property name="title">Number</property>
+                            <property name="title">#</property>

                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="cluedown">
                           </object>
                         </child>
                         <child>
                           <object class="GtkTreeViewColumn" id="cluedown">

-                            <property name="title">Clue Down</property>
+                            <property name="title">Clues Down</property>

                           </object>
                         </child>
                       </object>
                           </object>
                         </child>
                       </object>