[Xfce4-commits] <ristretto:devel> Improve UI definition

Stephan Arts stephan at xfce.org
Mon Aug 17 07:52:01 CEST 2009


Updating branch refs/heads/devel
         to 70aa8be1cde85cbde4c67e4758eafbb5d29ca58a (commit)
       from 9852ba3fbc8e80eac2b347c7c8c72aa12df09025 (commit)

commit 70aa8be1cde85cbde4c67e4758eafbb5d29ca58a
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Aug 17 07:49:29 2009 +0200

    Improve UI definition

 src/main.c            |    6 +-
 src/main_window.glade |  267 ++++++++++++++++++++++++++++++-------------------
 src/main_window.ui    |  219 +++++++++++++++++++++++++---------------
 3 files changed, 305 insertions(+), 187 deletions(-)

diff --git a/src/main.c b/src/main.c
index d4b3a4b..ad3aa49 100644
--- a/src/main.c
+++ b/src/main.c
@@ -176,11 +176,11 @@ rstto_main_window_configure_widgets (GtkBuilder *builder)
     gint location = BOTTOM;
 
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "navbox"));
+    GtkWidget *menuitem_open_recent = GTK_WIDGET (gtk_builder_get_object (builder, "menuitem_open_recent"));
     GtkWidget *menu = GTK_WIDGET (gtk_builder_get_object (builder, "navbar_popup_menu"));
-    gtk_menu_attach_to_widget (GTK_MENU (menu), nav_bar, NULL);
 
-    //g_signal_connect(G_OBJECT(nav_bar), "popup-menu", G_CALLBACK(cb_rstto_navbar_popup_menu), NULL);
-    //g_signal_connect(G_OBJECT(nav_bar), "button-press-event", G_CALLBACK(cb_rstto_navbar_button_press_event), NULL);
+
+    gtk_menu_attach_to_widget (GTK_MENU (menu), nav_bar, NULL);
 
     switch (location)
     {
diff --git a/src/main_window.glade b/src/main_window.glade
index 8f8a16a..00e77f4 100644
--- a/src/main_window.glade
+++ b/src/main_window.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Aug 16 08:17:14 2009 -->
+<!--Generated with glade3 3.4.5 on Mon Aug 17 00:37:26 2009 -->
 <glade-interface>
   <widget class="GtkWindow" id="mainwindow">
     <property name="title" translatable="yes">Image Viewer</property>
@@ -213,53 +213,33 @@
                             <child>
                               <widget class="GtkImageMenuItem" id="menuitem19">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom fit</property>
+                                <property name="label" translatable="yes">gtk-zoom-fit</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image3">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">zoom-fit-best</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="menuitem20">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom 100%</property>
+                                <property name="label" translatable="yes">gtk-zoom-100</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image4">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">zoom-p</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="menuitem21">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom in</property>
+                                <property name="label" translatable="yes">gtk-zoom-in</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image5">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">zoom-in</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                             <child>
                               <widget class="GtkImageMenuItem" id="menuitem22">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Zoom out</property>
+                                <property name="label" translatable="yes">gtk-zoom-out</property>
                                 <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image6">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">zoom-out</property>
-                                  </widget>
-                                </child>
+                                <property name="use_stock">True</property>
                               </widget>
                             </child>
                           </widget>
@@ -331,6 +311,70 @@
               </widget>
             </child>
             <child>
+              <widget class="GtkMenuItem" id="menuitem5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Go</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu7">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem7">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">gtk-go-back</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem10">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">gtk-go-forward</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem11">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">gtk-goto-first</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem31">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">gtk-goto-last</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="menuitem32">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">menuitem32</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem33">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="label" translatable="yes">gtk-media-play</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
@@ -359,7 +403,7 @@
           <widget class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkToolButton" id="open_fil">
+              <widget class="GtkToolButton" id="open_file">
                 <property name="visible">True</property>
                 <property name="icon_name">document-open</property>
               </widget>
@@ -387,6 +431,7 @@
             <child>
               <widget class="GtkToolButton" id="save_copy">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-save-as</property>
               </widget>
               <packing>
@@ -396,6 +441,7 @@
             <child>
               <widget class="GtkToolButton" id="close_file">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-close</property>
               </widget>
               <packing>
@@ -405,6 +451,7 @@
             <child>
               <widget class="GtkToolButton" id="delete_file">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-delete</property>
               </widget>
               <packing>
@@ -438,6 +485,76 @@
               <placeholder/>
             </child>
             <child>
+              <widget class="GtkHPaned" id="hpaned1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <widget class="GtkHPaned" id="hpaned2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <widget class="GtkVPaned" id="vpaned1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkVPaned" id="vpaned2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="center_wiindow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="resize">False</property>
+                                <property name="shrink">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="resize">True</property>
+                            <property name="shrink">True</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="resize">False</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
               <widget class="GtkToolbar" id="navbox">
                 <property name="visible">True</property>
                 <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
@@ -446,6 +563,7 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_previous_image">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-up</property>
                     <signal name="clicked" handler="cb_btn_previous_image_clicked"/>
                   </widget>
@@ -456,6 +574,7 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_play_slideshow">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-media-play</property>
                   </widget>
                   <packing>
@@ -465,6 +584,7 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_next_image">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-down</property>
                     <signal name="clicked" handler="cb_btn_next_image_clicked"/>
                   </widget>
@@ -484,6 +604,9 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_rotate_left">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="is_important">True</property>
+                    <property name="label" translatable="yes">Rotate Left</property>
                     <property name="icon_name">object-rotate-left</property>
                   </widget>
                   <packing>
@@ -493,6 +616,8 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_rotate_right">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="label" translatable="yes">Rotate Right</property>
                     <property name="icon_name">object-rotate-right</property>
                   </widget>
                   <packing>
@@ -510,7 +635,8 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_zoom_in">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-in</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-in</property>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -519,7 +645,8 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_zoom_out">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-out</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-out</property>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -528,7 +655,8 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_zoom_origin">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-original</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-100</property>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -537,7 +665,8 @@
                 <child>
                   <widget class="GtkToolButton" id="btn_zoom_fit">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-fit-best</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-fit</property>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -566,76 +695,6 @@
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkHPaned" id="hpaned1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkHPaned" id="hpaned2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <widget class="GtkVPaned" id="vpaned1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <widget class="GtkVPaned" id="vpaned2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child>
-                              <widget class="GtkScrolledWindow" id="center_wiindow">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="resize">True</property>
-                            <property name="shrink">True</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="resize">False</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
           </widget>
           <packing>
             <property name="position">2</property>
diff --git a/src/main_window.ui b/src/main_window.ui
index 723aca9..5159864 100644
--- a/src/main_window.ui
+++ b/src/main_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Sun Aug 16 08:17:14 2009 -->
+<!--Generated with glade3 3.4.5 on Mon Aug 17 00:37:26 2009 -->
 <interface>
   <object class="GtkUIManager" id="uimanager1">
     <child>
@@ -116,26 +116,26 @@
         </child>
         <child>
           <object class="GtkAction" id="menuitem19">
+            <property name="stock_id" translatable="yes">gtk-zoom-fit</property>
             <property name="name">menuitem19</property>
-            <property name="label" translatable="yes">Zoom fit</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="menuitem20">
+            <property name="stock_id" translatable="yes">gtk-zoom-100</property>
             <property name="name">menuitem20</property>
-            <property name="label" translatable="yes">Zoom 100%</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="menuitem21">
+            <property name="stock_id" translatable="yes">gtk-zoom-in</property>
             <property name="name">menuitem21</property>
-            <property name="label" translatable="yes">Zoom in</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="menuitem22">
+            <property name="stock_id" translatable="yes">gtk-zoom-out</property>
             <property name="name">menuitem22</property>
-            <property name="label" translatable="yes">Zoom out</property>
           </object>
         </child>
         <child>
@@ -169,6 +169,42 @@
           </object>
         </child>
         <child>
+          <object class="GtkAction" id="menuitem5">
+            <property name="name">menuitem5</property>
+            <property name="label" translatable="yes">_Go</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem7">
+            <property name="stock_id" translatable="yes">gtk-go-back</property>
+            <property name="name">menuitem7</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem10">
+            <property name="stock_id" translatable="yes">gtk-go-forward</property>
+            <property name="name">menuitem10</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem11">
+            <property name="stock_id" translatable="yes">gtk-goto-first</property>
+            <property name="name">menuitem11</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem31">
+            <property name="stock_id" translatable="yes">gtk-goto-last</property>
+            <property name="name">menuitem31</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem33">
+            <property name="stock_id" translatable="yes">gtk-media-play</property>
+            <property name="name">menuitem33</property>
+          </object>
+        </child>
+        <child>
           <object class="GtkAction" id="menuitem4">
             <property name="name">menuitem4</property>
             <property name="label" translatable="yes">_Help</property>
@@ -223,6 +259,14 @@
           <menuitem action="menuitem26"/>
           <menuitem action="menuitem27"/>
         </menu>
+        <menu action="menuitem5">
+          <menuitem action="menuitem7"/>
+          <menuitem action="menuitem10"/>
+          <menuitem action="menuitem11"/>
+          <menuitem action="menuitem31"/>
+          <separator/>
+          <menuitem action="menuitem33"/>
+        </menu>
         <menu action="menuitem4">
           <menuitem action="imagemenuitem10"/>
         </menu>
@@ -302,7 +346,7 @@
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <child>
-              <object class="GtkToolButton" id="open_fil">
+              <object class="GtkToolButton" id="open_file">
                 <property name="visible">True</property>
                 <property name="icon_name">document-open</property>
               </object>
@@ -330,6 +374,7 @@
             <child>
               <object class="GtkToolButton" id="save_copy">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-save-as</property>
               </object>
               <packing>
@@ -339,6 +384,7 @@
             <child>
               <object class="GtkToolButton" id="close_file">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-close</property>
               </object>
               <packing>
@@ -348,6 +394,7 @@
             <child>
               <object class="GtkToolButton" id="delete_file">
                 <property name="visible">True</property>
+                <property name="sensitive">False</property>
                 <property name="stock_id">gtk-delete</property>
               </object>
               <packing>
@@ -381,6 +428,76 @@
               <placeholder/>
             </child>
             <child>
+              <object class="GtkHPaned" id="hpaned1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkHPaned" id="hpaned2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <object class="GtkVPaned" id="vpaned1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkVPaned" id="vpaned2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="center_wiindow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="resize">False</property>
+                                <property name="shrink">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="resize">True</property>
+                            <property name="shrink">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="resize">False</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkToolbar" id="navbox">
                 <property name="visible">True</property>
                 <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
@@ -389,6 +506,7 @@
                 <child>
                   <object class="GtkToolButton" id="btn_previous_image">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-up</property>
                     <signal handler="cb_btn_previous_image_clicked" name="clicked"/>
                   </object>
@@ -399,6 +517,7 @@
                 <child>
                   <object class="GtkToolButton" id="btn_play_slideshow">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-media-play</property>
                   </object>
                   <packing>
@@ -408,6 +527,7 @@
                 <child>
                   <object class="GtkToolButton" id="btn_next_image">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-down</property>
                     <signal handler="cb_btn_next_image_clicked" name="clicked"/>
                   </object>
@@ -427,6 +547,9 @@
                 <child>
                   <object class="GtkToolButton" id="btn_rotate_left">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="is_important">True</property>
+                    <property name="label" translatable="yes">Rotate Left</property>
                     <property name="icon_name">object-rotate-left</property>
                   </object>
                   <packing>
@@ -436,6 +559,8 @@
                 <child>
                   <object class="GtkToolButton" id="btn_rotate_right">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="label" translatable="yes">Rotate Right</property>
                     <property name="icon_name">object-rotate-right</property>
                   </object>
                   <packing>
@@ -453,7 +578,8 @@
                 <child>
                   <object class="GtkToolButton" id="btn_zoom_in">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-in</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-in</property>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -462,7 +588,8 @@
                 <child>
                   <object class="GtkToolButton" id="btn_zoom_out">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-out</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-out</property>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -471,7 +598,8 @@
                 <child>
                   <object class="GtkToolButton" id="btn_zoom_origin">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-original</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-100</property>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -480,7 +608,8 @@
                 <child>
                   <object class="GtkToolButton" id="btn_zoom_fit">
                     <property name="visible">True</property>
-                    <property name="icon_name">zoom-fit-best</property>
+                    <property name="sensitive">False</property>
+                    <property name="stock_id">gtk-zoom-fit</property>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -509,76 +638,6 @@
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkHPaned" id="hpaned1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkHPaned" id="hpaned2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkVPaned" id="vpaned1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkVPaned" id="vpaned2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="center_wiindow">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="resize">True</property>
-                            <property name="shrink">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="resize">False</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="position">2</property>



More information about the Xfce4-commits mailing list