X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fchimara.ui;h=0a80104cb648c4494c3c7b95f801c4a6c884c67d;hb=HEAD;hp=35681da532325925798c346c4957d5843c3d8851;hpb=0dda9aadef69d5ec4a49ee922daf0dc9de3580ed;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/chimara.ui b/player/chimara.ui
index 35681da..0a80104 100644
--- a/player/chimara.ui
+++ b/player/chimara.ui
@@ -160,70 +160,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkActionGroup" id="style-actiongroup">
-    <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>
-    <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-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="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="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="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="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>
-  </object>
   <object class="GtkAboutDialog" id="aboutwindow">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -289,6 +225,12 @@ Philip Chimento</property>
       </object>
     </child>
   </object>
+  <object class="GtkListStore" id="available_interpreters">
+    <columns>
+      <!-- column-name Interpreter -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="chimara">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Chimara</property>
@@ -308,9 +250,9 @@ Philip Chimento</property>
   <object class="GtkListStore" id="interpreters">
     <columns>
       <!-- column-name Format -->
-      <column type="guint"/>
+      <column type="gchararray"/>
       <!-- column-name Interpreter -->
-      <column type="guint"/>
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkDialog" id="prefswindow">
@@ -452,6 +394,7 @@ Philip Chimento</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="title" translatable="yes">Select A CSS File</property>
+                        <signal name="file-set" handler="on_css_filechooser_file_set" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -499,6 +442,7 @@ Philip Chimento</property>
                       <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="width_request">163</property>
@@ -509,9 +453,23 @@ Philip Chimento</property>
                             <child>
                               <object class="GtkTreeView" id="style-treeview">
                                 <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
+                                <property name="model">style-list</property>
                                 <property name="headers_visible">False</property>
                                 <property name="headers_clickable">False</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="style-name-column">
+                                    <property name="title" translatable="yes">Style Name</property>
+                                    <property name="expand">True</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="style-name-renderer"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -525,54 +483,58 @@ Philip Chimento</property>
                           <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkTable" id="table2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="n_rows">3</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">6</property>
+                                <property name="row_spacing">6</property>
                                 <child>
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</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>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkFontButton" id="fontbutton1">
-                                    <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <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>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Foreground color:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <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>
                                     <property name="height_request">30</property>
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="use_action_appearance">False</property>
@@ -580,31 +542,24 @@ Philip Chimento</property>
                                     <signal name="color-set" handler="on_foreground_color_set" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="x">125</property>
-                                    <property name="y">10</property>
-                                  </packing>
-                                </child>
-                                <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>
-                                  <packing>
-                                    <property name="x">4</property>
-                                    <property name="y">17</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Background color:</property>
                                   </object>
                                   <packing>
-                                    <property name="x">6</property>
-                                    <property name="y">52</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -612,6 +567,7 @@ Philip Chimento</property>
                                     <property name="width_request">40</property>
                                     <property name="height_request">30</property>
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="use_action_appearance">False</property>
@@ -619,128 +575,104 @@ Philip Chimento</property>
                                     <signal name="color-set" handler="on_background_color_set" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="x">125</property>
-                                    <property name="y">45</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
                                   </packing>
                                 </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHButtonBox" id="hbuttonbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <property name="layout_style">start</property>
                                 <child>
-                                  <object class="GtkToolbar" id="style-toolbar">
-                                    <property name="width_request">283</property>
-                                    <property name="height_request">50</property>
+                                  <object class="GtkRadioButton" id="left">
+                                    <property name="label">gtk-justify-left</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="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">Align _left</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-justify-left</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-center">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">Align _center</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-justify-center</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-right">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">Align _right</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-justify-right</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-justify">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">Align _justify</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-justify-fill</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSeparatorToolItem" id="toolbutton4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-bold">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">_Bold</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-bold</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-italic">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">_Italic</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-italic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleToolButton" id="toolbutton-underline">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <property name="label" translatable="yes">_Underline</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="stock_id">gtk-underline</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">False</property>
+                                    <signal name="toggled" handler="on_toggle_left" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="center">
+                                    <property name="label">gtk-justify-center</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">left</property>
+                                    <signal name="toggled" handler="on_toggle_center" swapped="no"/>
                                   </object>
                                   <packing>
-                                    <property name="y">86</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="right">
+                                    <property name="label">gtk-justify-right</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">left</property>
+                                    <signal name="toggled" handler="on_toggle_right" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="justify">
+                                    <property name="label">gtk-justify-fill</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <property name="group">left</property>
+                                    <signal name="toggled" handler="on_toggle_justify" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
@@ -750,6 +682,76 @@ Philip Chimento</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkHButtonBox" id="hbuttonbox2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <property name="layout_style">start</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton1">
+                                    <property name="label">gtk-bold</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <signal name="toggled" handler="on_toggle_bold" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="checkbutton2">
+                                    <property name="label">gtk-italic</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <signal name="toggled" handler="on_toggle_italic" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="underline">
+                                    <property name="label">gtk-underline</property>
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="image_position">top</property>
+                                    <property name="draw_indicator">False</property>
+                                    <signal name="toggled" handler="on_toggle_underline" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -850,9 +852,36 @@ Philip Chimento</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip_text" translatable="yes">Which interpreter to use by default for each story format</property>
                                 <property name="model">interpreters</property>
-                                <property name="headers_visible">False</property>
                                 <property name="headers_clickable">False</property>
                                 <property name="rules_hint">True</property>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="format_column">
+                                    <property name="title">Format</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="format_renderer"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="interpreter_column">
+                                    <property name="title">Interpreter</property>
+                                    <child>
+                                      <object class="GtkCellRendererCombo" id="interpreter_renderer">
+                                        <property name="editable">True</property>
+                                        <property name="has_entry">False</property>
+                                        <property name="model">available_interpreters</property>
+                                        <property name="text_column">0</property>
+                                        <signal name="changed" handler="on_interpreter_cell_changed" swapped="no"/>
+                                      </object>
+                                      <attributes>
+                                        <attribute name="text">1</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -899,6 +928,7 @@ Philip Chimento</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Where to look for Blorb resource files containing graphics and sound; normally, these are part of the story file itself, but they are provided as separate files in some older games.</property>
                         <property name="action">select-folder</property>
+                        <signal name="file-set" handler="on_resource_file_set" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -942,4 +972,10 @@ Philip Chimento</property>
       <action-widget response="0">button-close</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkTreeStore" id="style-list">
+    <columns>
+      <!-- column-name Text -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
 </interface>