[Xfce4-commits] <ristretto:devel> Add callbacks for file- and navigation- toolbar

Stephan Arts stephan at xfce.org
Fri Aug 28 07:34:01 CEST 2009


Updating branch refs/heads/devel
         to 41db803f9d7229e9176b499a1be32c586dacc87e (commit)
       from 0b0f71fdcd7c78c9596027be90df4b729be732f3 (commit)

commit 41db803f9d7229e9176b499a1be32c586dacc87e
Author: Stephan Arts <stephan at xfce.org>
Date:   Thu Aug 20 00:28:32 2009 +0200

    Add callbacks for file- and navigation- toolbar

 src/main.c            |  215 +++++++++++++++++++++++--------------------------
 src/main_window.glade |   49 +++++++----
 src/main_window.ui    |   49 +++++++----
 3 files changed, 164 insertions(+), 149 deletions(-)

diff --git a/src/main.c b/src/main.c
index 80407b2..7c5b039 100644
--- a/src/main.c
+++ b/src/main.c
@@ -66,109 +66,6 @@ static GOptionEntry entries[] =
     { NULL, ' ', 0, 0, NULL, NULL, NULL }
 };
 
-/*
-static void
-rstto_navbar_do_popup_menu (GtkWidget *widget, gpointer user_data)
-{
-    gint location = BOTTOM;
-    GdkEventButton *event = user_data;
-    GtkWidget *menu, *position_menu;
-    gint button, event_time;
-    GSList *group = NULL;
-    GtkMenuItem *top_menuitem, *position_menuitem, *bottom_menuitem, *left_menuitem, *right_menuitem;
-
-    menu = gtk_menu_new ();
-    g_signal_connect (menu, "deactivate", 
-                    G_CALLBACK (gtk_widget_destroy), NULL);
-
-    position_menuitem = gtk_menu_item_new_with_label (_("Position"));
-    position_menu = gtk_menu_new();
-    gtk_menu_item_set_submenu (position_menuitem, position_menu);
-
-    top_menuitem = gtk_radio_menu_item_new_with_label (group, _("Top"));
-    group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (top_menuitem));
-
-    bottom_menuitem = gtk_radio_menu_item_new_with_label (group, _("Bottom"));
-    group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (bottom_menuitem));
-
-    left_menuitem = gtk_radio_menu_item_new_with_label (group, _("Left"));
-    group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (left_menuitem));
-
-    right_menuitem = gtk_radio_menu_item_new_with_label (group, _("Right"));
-    group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (right_menuitem));
-
-    gtk_menu_shell_append (position_menu, top_menuitem);
-    gtk_menu_shell_append (position_menu, bottom_menuitem);
-    gtk_menu_shell_append (position_menu, left_menuitem);
-    gtk_menu_shell_append (position_menu, right_menuitem);
-
-    switch (location)
-    {
-        case BOTTOM:
-            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (bottom_menuitem), TRUE);
-            break;
-        case TOP:
-            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (top_menuitem), TRUE);
-            break;
-        case LEFT:
-            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (left_menuitem), TRUE);
-            break;
-        case RIGHT:
-            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (right_menuitem), TRUE);
-            break;
-    }
-    g_signal_connect(G_OBJECT(top_menuitem), "toggled", G_CALLBACK(cb_rstto_navbar_top), NULL);
-    g_signal_connect(G_OBJECT(bottom_menuitem), "toggled", G_CALLBACK(cb_rstto_navbar_bottom), NULL);
-    g_signal_connect(G_OBJECT(left_menuitem), "toggled", G_CALLBACK(cb_rstto_navbar_left), NULL);
-    g_signal_connect(G_OBJECT(right_menuitem), "toggled", G_CALLBACK(cb_rstto_navbar_right), NULL);
-
-    gtk_menu_shell_append (menu, position_menuitem);
-    gtk_widget_show_all (menu);
-
-    if (event)
-    {
-        button = event->button;
-        event_time = event->time;
-    }
-    else
-    {
-        button = 0;
-        event_time = gtk_get_current_event_time ();
-    }
-
-    gtk_menu_attach_to_widget (GTK_MENU (menu), widget, NULL);
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
-                  button, event_time);
-
-}
-
-static gboolean
-cb_rstto_navbar_button_press_event (GtkWidget *widget, GdkEventButton *event)
-{
-  // Ignore double-clicks and triple-clicks
-  if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
-    {
-      rstto_navbar_do_popup_menu (widget, event);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-cb_rstto_navbar_popup_menu(GtkWidget *widget)
-{
-  rstto_navbar_do_popup_menu (widget, NULL);
-  return TRUE;
-}
-
-static void
-cb_rstto_navbar_top (GtkWidget *widget, gpointer user_data)
-{
-    
-}
-*/
-
 
 void
 rstto_main_window_configure_widgets (GtkBuilder *builder)
@@ -267,20 +164,112 @@ main(int argc, char **argv)
 
 /* */
 void
-cb_btn_next_image_clicked (GtkWidget *widget, gpointer user_data)
+cb_toolbtn_next_image_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_previous_image_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_play_slideshow_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_rotate_left_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_rotate_right_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_zoom_in_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_zoom_out_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_zoom_fit_clicked (GtkWidget *widget, gpointer user_data)
 {
     g_debug ("%s",__FUNCTION__);
 
 }
 
 void
-cb_btn_previous_image_clicked (GtkWidget *widget, gpointer user_data)
+cb_toolbtn_zoom_origin_clicked (GtkWidget *widget, gpointer user_data)
 {
     g_debug ("%s",__FUNCTION__);
 
 }
 
 
+
+void
+cb_toolbtn_open_file_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_open_folder_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_save_copy_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_delete_file_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_close_file_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_toolbtn_fullscreen_clicked (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
 /* */
 void
 cb_menuitem_navbar_pos_bottom_toggled (GtkWidget *widget, gpointer user_data)
@@ -293,8 +282,8 @@ cb_menuitem_navbar_pos_bottom_toggled (GtkWidget *widget, gpointer user_data)
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
 
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_previous_image")), GTK_STOCK_GO_BACK);
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_next_image")), GTK_STOCK_GO_FORWARD);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_previous_image")), GTK_STOCK_GO_BACK);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_next_image")), GTK_STOCK_GO_FORWARD);
         gtk_table_attach (GTK_TABLE(table), nav_bar, 0, 3, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
         gtk_toolbar_set_orientation (GTK_TOOLBAR (nav_bar), GTK_ORIENTATION_HORIZONTAL);
     }
@@ -312,8 +301,8 @@ cb_menuitem_navbar_pos_top_toggled (GtkWidget *widget, gpointer user_data)
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
 
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_previous_image")), GTK_STOCK_GO_BACK);
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_next_image")), GTK_STOCK_GO_FORWARD);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_previous_image")), GTK_STOCK_GO_BACK);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_next_image")), GTK_STOCK_GO_FORWARD);
         gtk_table_attach (GTK_TABLE(table), nav_bar, 0, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
         gtk_toolbar_set_orientation (GTK_TOOLBAR(nav_bar), GTK_ORIENTATION_HORIZONTAL);
     }
@@ -331,8 +320,8 @@ cb_menuitem_navbar_pos_left_toggled (GtkWidget *widget, gpointer user_data)
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
 
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_previous_image")), GTK_STOCK_GO_UP);
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_next_image")), GTK_STOCK_GO_DOWN);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_previous_image")), GTK_STOCK_GO_UP);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_next_image")), GTK_STOCK_GO_DOWN);
         gtk_table_attach (GTK_TABLE(table), nav_bar, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
         gtk_toolbar_set_orientation (GTK_TOOLBAR (nav_bar), GTK_ORIENTATION_VERTICAL);
     }
@@ -349,8 +338,8 @@ cb_menuitem_navbar_pos_right_toggled (GtkWidget *widget, gpointer user_data)
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
 
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_previous_image")), GTK_STOCK_GO_UP);
-        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "btn_next_image")), GTK_STOCK_GO_DOWN);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_previous_image")), GTK_STOCK_GO_UP);
+        gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(gtk_builder_get_object (builder, "toolbtn_next_image")), GTK_STOCK_GO_DOWN);
         gtk_table_attach (GTK_TABLE(table), nav_bar, 2, 3, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
         gtk_toolbar_set_orientation (GTK_TOOLBAR (nav_bar), GTK_ORIENTATION_VERTICAL);
     }
diff --git a/src/main_window.glade b/src/main_window.glade
index f087b45..b664940 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 Tue Aug 18 07:46:55 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Aug 20 00:14:02 2009 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="GtkWindow" id="main_window">
@@ -414,22 +414,24 @@
             <property name="visible">True</property>
             <property name="no_show_all">True</property>
             <child>
-              <widget class="GtkToolButton" id="open_file">
+              <widget class="GtkToolButton" id="toolbtn_open_file">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Open</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">document-open</property>
+                <signal name="clicked" handler="cb_toolbtn_open_file_clicked"/>
               </widget>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="open_folder ">
+              <widget class="GtkToolButton" id="toolbtn_open_folder ">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Open _Folder</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">folder-open</property>
+                <signal name="clicked" handler="cb_toolbtn_open_folder_clicked"/>
               </widget>
               <packing>
                 <property name="homogeneous">True</property>
@@ -444,30 +446,33 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="save_copy">
+              <widget class="GtkToolButton" id="toolbtn_save_copy">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-save-as</property>
+                <signal name="clicked" handler="cb_toolbtn_save_copy_clicked"/>
               </widget>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="close_file">
+              <widget class="GtkToolButton" id="toolbtn_close_file">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-close</property>
+                <signal name="clicked" handler="cb_toolbtn_close_file_clicked"/>
               </widget>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="delete_file">
+              <widget class="GtkToolButton" id="toolbtn_delete_file">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-delete</property>
+                <signal name="clicked" handler="cb_toolbtn_delete_file_clicked"/>
               </widget>
               <packing>
                 <property name="homogeneous">True</property>
@@ -507,32 +512,33 @@
                 <signal name="button_press_event" handler="cb_navbox_button_press_event"/>
                 <signal name="popup_context_menu" handler="cb_navbox_popup_context_menu"/>
                 <child>
-                  <widget class="GtkToolButton" id="btn_previous_image">
+                  <widget class="GtkToolButton" id="toolbtn_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"/>
+                    <signal name="clicked" handler="cb_toolbtn_previous_image_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_play_slideshow">
+                  <widget class="GtkToolButton" id="toolbtn_play_slideshow">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-media-play</property>
+                    <signal name="clicked" handler="cb_toolbtn_play_slideshow_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_next_image">
+                  <widget class="GtkToolButton" id="toolbtn_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"/>
+                    <signal name="clicked" handler="cb_toolbtn_next_image_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -548,23 +554,25 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_rotate_left">
+                  <widget class="GtkToolButton" id="toolbtn_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>
+                    <signal name="clicked" handler="cb_toolbtn_rotate_left_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_rotate_right">
+                  <widget class="GtkToolButton" id="toolbtn_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>
+                    <signal name="clicked" handler="cb_toolbtn_rotate_right_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -579,40 +587,44 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_zoom_in">
+                  <widget class="GtkToolButton" id="toolbtn_zoom_in">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-in</property>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_in_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_zoom_out">
+                  <widget class="GtkToolButton" id="toolbtn_zoom_out">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-out</property>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_out_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_zoom_origin">
+                  <widget class="GtkToolButton" id="toolbtn_zoom_origin">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-100</property>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_origin_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="btn_zoom_fit">
+                  <widget class="GtkToolButton" id="toolbtn_zoom_fit">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-fit</property>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_fit_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -627,9 +639,10 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkToolButton" id="toolbutton17">
+                  <widget class="GtkToolButton" id="toolbtn_fullscreen">
                     <property name="visible">True</property>
                     <property name="stock_id">gtk-fullscreen</property>
+                    <signal name="clicked" handler="cb_toolbtn_fullscreen_clicked"/>
                   </widget>
                   <packing>
                     <property name="homogeneous">True</property>
diff --git a/src/main_window.ui b/src/main_window.ui
index 0c9abac..de9c871 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 Tue Aug 18 07:46:55 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Aug 20 00:14:02 2009 -->
 <interface>
   <object class="GtkUIManager" id="uimanager1">
     <child>
@@ -356,22 +356,24 @@
             <property name="visible">True</property>
             <property name="no_show_all">True</property>
             <child>
-              <object class="GtkToolButton" id="open_file">
+              <object class="GtkToolButton" id="toolbtn_open_file">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Open</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">document-open</property>
+                <signal handler="cb_toolbtn_open_file_clicked" name="clicked"/>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="open_folder ">
+              <object class="GtkToolButton" id="toolbtn_open_folder ">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Open _Folder</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">folder-open</property>
+                <signal handler="cb_toolbtn_open_folder_clicked" name="clicked"/>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
@@ -386,30 +388,33 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="save_copy">
+              <object class="GtkToolButton" id="toolbtn_save_copy">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-save-as</property>
+                <signal handler="cb_toolbtn_save_copy_clicked" name="clicked"/>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="close_file">
+              <object class="GtkToolButton" id="toolbtn_close_file">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-close</property>
+                <signal handler="cb_toolbtn_close_file_clicked" name="clicked"/>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="delete_file">
+              <object class="GtkToolButton" id="toolbtn_delete_file">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-delete</property>
+                <signal handler="cb_toolbtn_delete_file_clicked" name="clicked"/>
               </object>
               <packing>
                 <property name="homogeneous">True</property>
@@ -449,32 +454,33 @@
                 <signal handler="cb_navbox_button_press_event" name="button_press_event"/>
                 <signal handler="cb_navbox_popup_context_menu" name="popup_context_menu"/>
                 <child>
-                  <object class="GtkToolButton" id="btn_previous_image">
+                  <object class="GtkToolButton" id="toolbtn_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"/>
+                    <signal handler="cb_toolbtn_previous_image_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_play_slideshow">
+                  <object class="GtkToolButton" id="toolbtn_play_slideshow">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-media-play</property>
+                    <signal handler="cb_toolbtn_play_slideshow_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_next_image">
+                  <object class="GtkToolButton" id="toolbtn_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"/>
+                    <signal handler="cb_toolbtn_next_image_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -490,23 +496,25 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_rotate_left">
+                  <object class="GtkToolButton" id="toolbtn_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>
+                    <signal handler="cb_toolbtn_rotate_left_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_rotate_right">
+                  <object class="GtkToolButton" id="toolbtn_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>
+                    <signal handler="cb_toolbtn_rotate_right_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -521,40 +529,44 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_zoom_in">
+                  <object class="GtkToolButton" id="toolbtn_zoom_in">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-in</property>
+                    <signal handler="cb_toolbtn_zoom_in_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_zoom_out">
+                  <object class="GtkToolButton" id="toolbtn_zoom_out">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-out</property>
+                    <signal handler="cb_toolbtn_zoom_out_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_zoom_origin">
+                  <object class="GtkToolButton" id="toolbtn_zoom_origin">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-100</property>
+                    <signal handler="cb_toolbtn_zoom_origin_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="btn_zoom_fit">
+                  <object class="GtkToolButton" id="toolbtn_zoom_fit">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-fit</property>
+                    <signal handler="cb_toolbtn_zoom_fit_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>
@@ -569,9 +581,10 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton17">
+                  <object class="GtkToolButton" id="toolbtn_fullscreen">
                     <property name="visible">True</property>
                     <property name="stock_id">gtk-fullscreen</property>
+                    <signal handler="cb_toolbtn_fullscreen_clicked" name="clicked"/>
                   </object>
                   <packing>
                     <property name="homogeneous">True</property>



More information about the Xfce4-commits mailing list