Clean up action group code

diff --git a/player/chimara.ui b/player/chimara.ui
index b7176c9c532b99739b261a3ef7b06ac54cb909ed..8bb7fc6941f6429d277e0b547556a8587cba5db0 100644 (file)
--- a/player/chimara.ui
+++ b/player/chimara.ui
@@ -1,124 +1,225 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="chimara">
-    <property name="title" translatable="yes">Chimara</property>
-    <property name="default_width">600</property>
-    <property name="default_height">800</property>
-    <signal name="delete_event" handler="on_window_delete_event"/>
+  <object class="GtkActionGroup" id="actiongroup">
     <child>
-      <object class="GtkVBox" id="vbox">
-        <property name="visible">True</property>
-        <child>
-          <placeholder/>
-        </child>
+      <object class="GtkAction" id="about">
+        <property name="label">_About...</property>
+        <property name="short_label">_About</property>
+        <property name="tooltip">About this application</property>
+        <property name="stock_id">gtk-about</property>
+        <signal name="activate" handler="on_about_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="help">
+        <property name="label">_Help</property>
+        <property name="short_label" translatable="yes">_Help</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="preferences">
+        <property name="label">P_references</property>
+        <property name="short_label" translatable="yes">P_references</property>
+        <property name="tooltip">Configure the application</property>
+        <property name="stock_id">gtk-preferences</property>
+        <signal name="activate" handler="on_preferences_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="paste">
+        <property name="label">_Paste</property>
+        <property name="short_label" translatable="yes">_Paste</property>
+        <property name="tooltip">Paste the clipboard</property>
+        <property name="stock_id">gtk-paste</property>
+        <signal name="activate" handler="on_paste_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="copy">
+        <property name="label">_Copy</property>
+        <property name="short_label" translatable="yes">_Copy</property>
+        <property name="tooltip">Copy the selection</property>
+        <property name="stock_id">gtk-copy</property>
+        <signal name="activate" handler="on_copy_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="quit">
+        <property name="label">_Quit</property>
+        <property name="short_label" translatable="yes">_Quit</property>
+        <property name="tooltip">Try to quit the game</property>
+        <property name="stock_id">gtk-media-stop</property>
+        <signal name="activate" handler="on_quit_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="restart">
+        <property name="label">Res_tart</property>
+        <property name="short_label" translatable="yes">Res_tart</property>
+        <property name="tooltip">Tell the game to restart</property>
+        <property name="stock_id">gtk-media-rewind</property>
+        <signal name="activate" handler="on_restart_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="undo">
+        <property name="label">_Undo</property>
+        <property name="short_label" translatable="yes">_Undo</property>
+        <property name="tooltip">Attempt to undo the last move (the game may not allow this)</property>
+        <property name="stock_id">gtk-undo</property>
+        <signal name="activate" handler="on_undo_activate" swapped="no"/>
+      </object>
+      <accelerator key="z" modifiers="GDK_CONTROL_MASK"/>
+    </child>
+    <child>
+      <object class="GtkRecentAction" id="recent">
+        <property name="label">Open _Recent</property>
+        <property name="short_label" translatable="yes">Open _Recent</property>
+        <property name="limit">10</property>
+        <property name="sort_type">mru</property>
+        <signal name="item-activated" handler="on_recent_item_activated" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="stop">
+        <property name="label">_Stop Game</property>
+        <property name="short_label">_Stop</property>
+        <property name="tooltip">Immediately stop the running game</property>
+        <property name="stock_id">gtk-stop</property>
+        <signal name="activate" handler="on_stop_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="edit">
+        <property name="label">_Edit</property>
+        <property name="short_label" translatable="yes">_Edit</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="command">
+        <property name="label">_Command</property>
+        <property name="short_label" translatable="yes">_Command</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="quit_chimara">
+        <property name="label">_Quit Chimara</property>
+        <property name="short_label" translatable="yes">_Quit Chimara</property>
+        <property name="tooltip">Leave the program</property>
+        <property name="stock_id">gtk-quit</property>
+        <signal name="activate" handler="on_quit_chimara_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="save">
+        <property name="label">_Save</property>
+        <property name="short_label" translatable="yes">_Save</property>
+        <property name="tooltip">Save the game</property>
+        <property name="stock_id">gtk-save</property>
+        <signal name="activate" handler="on_save_activate" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="restore">
+        <property name="label">_Restore...</property>
+        <property name="short_label">_Restore</property>
+        <property name="tooltip">Restore a previously saved game</property>
+        <property name="stock_id">gtk-open</property>
+        <signal name="activate" handler="on_restore_activate" swapped="no"/>
+      </object>
+      <accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="open">
+        <property name="label">_Open...</property>
+        <property name="short_label">_Open</property>
+        <property name="tooltip">Quit the current game and load a new one</property>
+        <property name="stock_id">gtk-media-play</property>
+        <signal name="activate" handler="on_open_activate" swapped="no"/>
+      </object>
+      <accelerator key="o" modifiers="GDK_CONTROL_MASK"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="game">
+        <property name="label">_Game</property>
+        <property name="short_label" translatable="yes">_Game</property>
       </object>
     </child>
   </object>
-  <object class="GtkActionGroup" id="actiongroup"/>
-  <object class="GtkAction" id="game">
-    <property name="label">_Game</property>
-  </object>
-  <object class="GtkAction" id="open">
-    <property name="label">_Open...</property>
-    <property name="short_label">_Open</property>
-    <property name="tooltip">Quit the current game and load a new one</property>
-    <property name="stock_id">gtk-media-play</property>
-    <signal name="activate" handler="on_open_activate"/>
-  </object>
-  <object class="GtkAction" id="restore">
-    <property name="label">_Restore...</property>
-    <property name="short_label">_Restore</property>
-    <property name="tooltip">Restore a previously saved game</property>
-    <property name="stock_id">gtk-open</property>
-    <signal name="activate" handler="on_restore_activate"/>
-  </object>
-  <object class="GtkAction" id="save">
-    <property name="label">_Save</property>
-    <property name="tooltip">Save the game</property>
-    <property name="stock_id">gtk-save</property>
-    <signal name="activate" handler="on_save_activate"/>
-  </object>
-  <object class="GtkAction" id="quit_chimara">
-    <property name="label">_Quit Chimara</property>
-    <property name="tooltip">Leave the program</property>
-    <property name="stock_id">gtk-quit</property>
-    <signal name="activate" handler="on_quit_chimara_activate"/>
-  </object>
-  <object class="GtkAction" id="command">
-    <property name="label">_Command</property>
-  </object>
-  <object class="GtkAction" id="edit">
-    <property name="label">_Edit</property>
-  </object>
-  <object class="GtkAction" id="stop">
-    <property name="label">_Stop Game</property>
-    <property name="short_label">_Stop</property>
-    <property name="tooltip">Immediately stop the running game</property>
-    <property name="stock_id">gtk-stop</property>
-    <signal name="activate" handler="on_stop_activate"/>
-  </object>
-  <object class="GtkRecentAction" id="recent">
-    <property name="label">Open _Recent</property>
-    <property name="sort_type">mru</property>
-    <property name="limit">10</property>
-    <signal name="item_activated" handler="on_recent_item_activated"/>
-  </object>
-  <object class="GtkAction" id="undo">
-    <property name="label">_Undo</property>
-    <property name="tooltip">Attempt to undo the last move (the game may not allow this)</property>
-    <property name="stock_id">gtk-undo</property>
-    <signal name="activate" handler="on_undo_activate"/>
-  </object>
-  <object class="GtkAction" id="restart">
-    <property name="label">Res_tart</property>
-    <property name="tooltip">Tell the game to restart</property>
-    <property name="stock_id">gtk-media-rewind</property>
-    <signal name="activate" handler="on_restart_activate"/>
-  </object>
-  <object class="GtkAction" id="quit">
-    <property name="label">_Quit</property>
-    <property name="tooltip">Try to quit the game</property>
-    <property name="stock_id">gtk-media-stop</property>
-    <signal name="activate" handler="on_quit_activate"/>
-  </object>
-  <object class="GtkAction" id="copy">
-    <property name="label">_Copy</property>
-    <property name="tooltip">Copy the selection</property>
-    <property name="stock_id">gtk-copy</property>
-    <signal name="activate" handler="on_copy_activate"/>
-  </object>
-  <object class="GtkAction" id="paste">
-    <property name="label">_Paste</property>
-    <property name="tooltip">Paste the clipboard</property>
-    <property name="stock_id">gtk-paste</property>
-    <signal name="activate" handler="on_paste_activate"/>
-  </object>
-  <object class="GtkAction" id="preferences">
-    <property name="label">P_references</property>
-    <property name="tooltip">Configure the application</property>
-    <property name="stock_id">gtk-preferences</property>
-    <signal name="activate" handler="on_preferences_activate"/>
-  </object>
-  <object class="GtkAction" id="help">
-    <property name="label">_Help</property>
-  </object>
-  <object class="GtkAction" id="about">
-    <property name="label">_About...</property>
-    <property name="short_label">_About</property>
-    <property name="tooltip">About this application</property>
-    <property name="stock_id">gtk-about</property>
-    <signal name="activate" handler="on_about_activate"/>
+  <object class="GtkActionGroup" id="style-actiongroup">
+    <child>
+      <object class="GtkToggleAction" id="align-center">
+        <property name="label" translatable="yes">_Center</property>
+        <property name="short_label" translatable="yes">_Center</property>
+        <property name="stock_id">gtk-justify-center</property>
+        <signal name="toggled" handler="on_toggle_center" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="underline">
+        <property name="label">_Underline</property>
+        <property name="short_label">_Underline</property>
+        <property name="tooltip">Underline the text</property>
+        <property name="stock_id">gtk-underline</property>
+        <signal name="toggled" handler="on_toggle_underline" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="italic">
+        <property name="label">_Italic</property>
+        <property name="short_label">_Italic</property>
+        <property name="tooltip">Print the text in italics</property>
+        <property name="stock_id">gtk-italic</property>
+        <signal name="toggled" handler="on_toggle_italic" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="bold">
+        <property name="label">_Bold</property>
+        <property name="short_label">_Bold</property>
+        <property name="tooltip">Make the text bold</property>
+        <property name="stock_id">gtk-bold</property>
+        <signal name="toggled" handler="on_toggle_bold" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="align-right">
+        <property name="label">Align _right</property>
+        <property name="short_label">Align _right</property>
+        <property name="tooltip">Align text to the right</property>
+        <property name="stock_id">gtk-justify-right</property>
+        <signal name="toggled" handler="on_toggle_right" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="align-justify">
+        <property name="label">Align _justify</property>
+        <property name="short_label">Align _justify</property>
+        <property name="tooltip">Justify the text</property>
+        <property name="stock_id">gtk-justify-fill</property>
+        <signal name="toggled" handler="on_toggle_justify" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="align-left">
+        <property name="label">Align _left</property>
+        <property name="short_label">Align _left</property>
+        <property name="tooltip">Align text to the left</property>
+        <property name="stock_id">gtk-justify-left</property>
+        <signal name="toggled" handler="on_toggle_left" swapped="no"/>
+      </object>
+    </child>
   </object>
   <object class="GtkAboutDialog" id="aboutwindow">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About Chimara</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Chimara</property>
-    <property name="copyright" translatable="yes">&#xA9; 2008&#x2013;2009 Marijn van Vliet and Philip Chimento</property>
+    <property name="copyright" translatable="yes">© 2008–2009 Marijn van Vliet and Philip Chimento</property>
     <property name="comments" translatable="yes">Interactive Fiction Player</property>
     <property name="license" translatable="yes">Copyright (C) 2008, Philip Chimento and Marijn van Vliet.
 All rights reserved.
@@ -150,40 +251,119 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </property>
     <property name="authors">Marijn van Vliet
 Philip Chimento</property>
-    <signal name="response" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+    <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="chimara">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Chimara</property>
+    <property name="default_width">600</property>
+    <property name="default_height">800</property>
+    <signal name="delete-event" handler="on_window_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="vbox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="prefswindow">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Chimara Preferences</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <signal name="response" handler="gtk_widget_hide"/>
-    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+    <signal name="response" handler="gtk_widget_hide" swapped="no"/>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">9</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">Reset</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button-close">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="gtk_widget_hide" object="prefswindow" swapped="yes"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
@@ -191,11 +371,13 @@ Philip Chimento</property>
             <child>
               <object class="GtkFixed" id="fixed1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Environment</property>
               </object>
               <packing>
@@ -205,13 +387,16 @@ Philip Chimento</property>
             <child>
               <object class="GtkVBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkTable" id="table1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_columns">2</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">1</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">Load layout from this CSS file:</property>
@@ -224,6 +409,7 @@ Philip Chimento</property>
                       <object class="GtkFileChooserButton" id="css-filechooser">
                         <property name="width_request">250</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="title" translatable="yes">Select A CSS File</property>
                       </object>
                       <packing>
@@ -234,15 +420,18 @@ Philip Chimento</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkHSeparator" id="hseparator1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">1</property>
                   </packing>
@@ -250,21 +439,25 @@ Philip Chimento</property>
                 <child>
                   <object class="GtkVBox" id="vbox3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">5</property>
                         <property name="label" translatable="yes">Select a style to edit:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="width_request">163</property>
@@ -282,22 +475,28 @@ Philip Chimento</property>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Font:</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">0</property>
                                   </packing>
@@ -307,15 +506,19 @@ Philip Chimento</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <signal name="font_set" handler="on_font_set"/>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="font-set" handler="on_font_set" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -323,6 +526,7 @@ Philip Chimento</property>
                               <object class="GtkFixed" id="fixed2">
                                 <property name="height_request">130</property>
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkColorButton" id="colorbutton1">
                                     <property name="width_request">40</property>
@@ -330,8 +534,9 @@ Philip Chimento</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="color">#000000000000</property>
-                                    <signal name="color_set" handler="on_foreground_color_set"/>
+                                    <signal name="color-set" handler="on_foreground_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="x">125</property>
@@ -341,6 +546,7 @@ Philip Chimento</property>
                                 <child>
                                   <object class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xpad">5</property>
                                     <property name="label" translatable="yes">Foreground color:</property>
                                   </object>
@@ -352,6 +558,7 @@ Philip Chimento</property>
                                 <child>
                                   <object class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Background color:</property>
                                   </object>
                                   <packing>
@@ -366,8 +573,9 @@ Philip Chimento</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="color">#ffffffffffff</property>
-                                    <signal name="color_set" handler="on_background_color_set"/>
+                                    <signal name="color-set" handler="on_background_color_set" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="x">125</property>
@@ -379,12 +587,12 @@ Philip Chimento</property>
                                     <property name="width_request">283</property>
                                     <property name="height_request">50</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="toolbar_style">icons</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-left">
                                         <property name="visible">True</property>
-                                        <property name="related_action">align-left</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Align _left</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-justify-left</property>
@@ -397,7 +605,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-center">
                                         <property name="visible">True</property>
-                                        <property name="related_action">align-center</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Align _center</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-justify-center</property>
@@ -410,8 +618,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-right">
                                         <property name="visible">True</property>
-                                        <property name="related_action">align-right</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Align _right</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-justify-right</property>
@@ -424,8 +631,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-justify">
                                         <property name="visible">True</property>
-                                        <property name="related_action">align-justify</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">Align _justify</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-justify-fill</property>
@@ -438,6 +644,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkSeparatorToolItem" id="toolbutton4">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -447,8 +654,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-bold">
                                         <property name="visible">True</property>
-                                        <property name="related_action">bold</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">_Bold</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-bold</property>
@@ -461,8 +667,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-italic">
                                         <property name="visible">True</property>
-                                        <property name="related_action">italic</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">_Italic</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-italic</property>
@@ -475,8 +680,7 @@ Philip Chimento</property>
                                     <child>
                                       <object class="GtkToggleToolButton" id="toolbutton-underline">
                                         <property name="visible">True</property>
-                                        <property name="related_action">underline</property>
-                                        <property name="use_action_appearance">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">_Underline</property>
                                         <property name="use_underline">True</property>
                                         <property name="stock_id">gtk-underline</property>
@@ -493,22 +697,30 @@ Philip Chimento</property>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="padding">5</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="padding">5</property>
                     <property name="position">2</property>
                   </packing>
@@ -517,6 +729,7 @@ Philip Chimento</property>
                   <object class="GtkLabel" id="label4">
                     <property name="height_request">30</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">1</property>
                     <property name="xpad">5</property>
@@ -524,6 +737,7 @@ Philip Chimento</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -538,6 +752,8 @@ Philip Chimento</property>
                     <property name="right_margin">10</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
@@ -549,6 +765,7 @@ Philip Chimento</property>
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Layout</property>
               </object>
               <packing>
@@ -559,6 +776,7 @@ Philip Chimento</property>
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -576,6 +794,7 @@ Philip Chimento</property>
             <child type="tab">
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Interpreters</property>
               </object>
               <packing>
@@ -585,62 +804,11 @@ Philip Chimento</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button1">
-                <property name="label">gtk-save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button2">
-                <property name="label" translatable="yes">Reset</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button-close">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="gtk_widget_hide" object="prefswindow"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>
@@ -649,51 +817,4 @@ Philip Chimento</property>
       <action-widget response="0">button-close</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkActionGroup" id="style-actiongroup"/>
-  <object class="GtkToggleAction" id="align-left">
-    <property name="label">Align _left</property>
-    <property name="short_label">Align _left</property>
-    <property name="tooltip">Align text to the left</property>
-    <property name="stock_id">gtk-justify-left</property>
-    <signal name="toggled" handler="on_toggle_left"/>
-  </object>
-  <object class="GtkToggleAction" id="align-justify">
-    <property name="label">Align _justify</property>
-    <property name="short_label">Align _justify</property>
-    <property name="tooltip">Justify the text</property>
-    <property name="stock_id">gtk-justify-fill</property>
-    <signal name="toggled" handler="on_toggle_justify"/>
-  </object>
-  <object class="GtkToggleAction" id="align-right">
-    <property name="label">Align _right</property>
-    <property name="short_label">Align _right</property>
-    <property name="tooltip">Align text to the right</property>
-    <property name="stock_id">gtk-justify-right</property>
-    <signal name="toggled" handler="on_toggle_right"/>
-  </object>
-  <object class="GtkToggleAction" id="bold">
-    <property name="label">_Bold</property>
-    <property name="short_label">_Bold</property>
-    <property name="tooltip">Make the text bold</property>
-    <property name="stock_id">gtk-bold</property>
-    <signal name="toggled" handler="on_toggle_bold"/>
-  </object>
-  <object class="GtkToggleAction" id="italic">
-    <property name="label">_Italic</property>
-    <property name="short_label">_Italic</property>
-    <property name="tooltip">Print the text in italics</property>
-    <property name="stock_id">gtk-italic</property>
-    <signal name="toggled" handler="on_toggle_italic"/>
-  </object>
-  <object class="GtkToggleAction" id="underline">
-    <property name="label">_Underline</property>
-    <property name="short_label">_Underline</property>
-    <property name="tooltip">Underline the text</property>
-    <property name="stock_id">gtk-underline</property>
-    <signal name="toggled" handler="on_toggle_underline"/>
-  </object>
-  <object class="GtkToggleAction" id="align-center">
-    <property name="stock_id">gtk-justify-center</property>
-    <signal name="toggled" handler="on_toggle_center"/>
-  </object>
 </interface>

diff --git a/player/main.c b/player/main.c
index 9bfcb6fa6a096670ce113cf623ef968df5fc6f20..9722235c680309e32c785dffafeae4705c9d462d 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -110,52 +110,15 @@ create_window(void)
        aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
        prefswindow = GTK_WIDGET(load_object("prefswindow"));
        GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
-       GtkActionGroup *style_actiongroup = GTK_ACTION_GROUP(load_object("style-actiongroup"));
 
-       /* Add all the actions to the action group. This for-loop is a temporary fix
-       and can be removed once Glade supports adding actions and accelerators to an
-       action group. */
-       const gchar *actions[] = { 
-               "game", "",
-               "open", "<ctrl>O", 
-               "recent", "",
-               "stop", "",
-               "quit_chimara", NULL, /* NULL means use stock accelerator */
-               "command", "",
-               "undo", "<ctrl>Z",
-               "save", NULL, 
-               "restore", "<ctrl>R", 
-               "restart", "",
-               "quit", "",
-               "edit", "",
-               "copy", NULL,
-               "paste", NULL,
-               "preferences", "",
-               "help", "",
-               "about", "",
-               NULL
-       };
-       const gchar *style_actions[] = { 
-               "align-left",
-               "align-justify",
-               "align-right",
-               "bold",
-               "italic",
-               "underline",
-               NULL
-       };
        const gchar **ptr;
-       for(ptr = actions; *ptr; ptr += 2)
-               gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
-       for(ptr = style_actions; *ptr; ptr ++)
-               gtk_action_group_add_action(style_actiongroup, GTK_ACTION(load_object(*ptr)));
        GtkRecentFilter *filter = gtk_recent_filter_new();
        /* TODO: Use mimetypes and construct the filter dynamically depending on 
        what plugins are installed */
        const gchar *patterns[] = {
                "*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
        };
-       
+
        for(ptr = patterns; *ptr; ptr++)
                gtk_recent_filter_add_pattern(filter, *ptr);
        GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));