[Xfce4-commits] <ristretto:devel> Add callback functions to several tool-buttons and menu-items

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


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

commit ca95eab31a090a496999fdde39d81e653c3778d4
Author: Stephan Arts <stephan at xfce.org>
Date:   Sat Aug 22 10:46:35 2009 +0200

    Add callback functions to several tool-buttons and menu-items

 src/main.c            |   20 ++++++--
 src/main_window.glade |  145 +++++++++++++++++++++++++------------------------
 src/main_window.ui    |  145 +++++++++++++++++++++++++------------------------
 3 files changed, 162 insertions(+), 148 deletions(-)

diff --git a/src/main.c b/src/main.c
index 7c5b039..af6908a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,6 +47,7 @@ gboolean start_fullscreen = FALSE;
 gboolean start_slideshow = FALSE;
 
 GtkBuilder *builder;
+GtkRecentManager *manager;
 RsttoSettings *settings;
 
 static GOptionEntry entries[] =
@@ -68,16 +69,19 @@ static GOptionEntry entries[] =
 
 
 void
-rstto_main_window_configure_widgets (GtkBuilder *builder)
+rstto_main_window_configure_widgets ()
 {
     gint location = BOTTOM;
     gboolean show_file_toolbar = FALSE;
     gboolean show_nav_toolbar = FALSE;
 
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
-    GtkWidget *menuitem_open_recent = GTK_WIDGET (gtk_builder_get_object (builder, "menuitem_open_recent"));
+    //GtkWidget *menuitem_open_recent = GTK_WIDGET (gtk_builder_get_object (builder, "menu_open_recent"));
     GtkWidget *menu = GTK_WIDGET (gtk_builder_get_object (builder, "navbar_popup_menu"));
 
+    //GtkWidget *recent_chooser_menu = gtk_recent_chooser_menu_new_for_manager (manager);
+    //gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem_open_recent), recent_chooser_menu);
+
 
     gtk_menu_attach_to_widget (GTK_MENU (menu), nav_bar, NULL);
 
@@ -138,13 +142,14 @@ main(int argc, char **argv)
     settings = rstto_settings_new();
 
     builder = gtk_builder_new();
+    manager = gtk_recent_manager_new();
     
     if (gtk_builder_add_from_string (builder, main_window_ui,
                                      main_window_ui_length, &error) != 0)
     {
         window = GTK_WIDGET (gtk_builder_get_object (builder, "main_window"));
         gtk_builder_connect_signals (builder, NULL);  
-        rstto_main_window_configure_widgets (builder);
+        rstto_main_window_configure_widgets ();
         g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
     }
 
@@ -347,7 +352,14 @@ cb_menuitem_navbar_pos_right_toggled (GtkWidget *widget, gpointer user_data)
 
 /* */
 void
-cb_open_file_activate (GtkWidget *widget, gpointer user_data)
+cb_menu_open_file_activate (GtkWidget *widget, gpointer user_data)
+{
+    g_debug ("%s",__FUNCTION__);
+
+}
+
+void
+cb_menu_open_folder_activate (GtkWidget *widget, gpointer user_data)
 {
     g_debug ("%s",__FUNCTION__);
 
diff --git a/src/main_window.glade b/src/main_window.glade
index b664940..8338653 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 Thu Aug 20 00:14:02 2009 -->
+<!--Generated with glade3 3.4.5 on Sat Aug 22 10:22:18 2009 -->
 <glade-interface>
   <requires lib="xfce4"/>
   <widget class="GtkWindow" id="main_window">
@@ -26,7 +26,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Open</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="cb_open_file_activate"/>
+                        <signal name="activate" handler="cb_menu_open_file_activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="menu-item-image1">
                             <property name="visible">True</property>
@@ -40,6 +40,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">Open _Folder</property>
                         <property name="use_underline">True</property>
+                        <signal name="activate" handler="cb_menu_open_folder_activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="menu-item-image2">
                             <property name="visible">True</property>
@@ -505,6 +506,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="nav_toolbar">
                 <property name="visible">True</property>
                 <property name="no_show_all">True</property>
@@ -654,76 +725,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 de9c871..1a90573 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 Thu Aug 20 00:14:02 2009 -->
+<!--Generated with glade3 3.4.5 on Sat Aug 22 10:22:18 2009 -->
 <interface>
   <object class="GtkUIManager" id="uimanager1">
     <child>
@@ -14,13 +14,14 @@
           <object class="GtkAction" id="menu_open_file">
             <property name="name">menu_open_file</property>
             <property name="label" translatable="yes">_Open</property>
-            <signal handler="cb_open_file_activate" name="activate"/>
+            <signal handler="cb_menu_open_file_activate" name="activate"/>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="menu_open_folder">
             <property name="name">menu_open_folder</property>
             <property name="label" translatable="yes">Open _Folder</property>
+            <signal handler="cb_menu_open_folder_activate" name="activate"/>
           </object>
         </child>
         <child>
@@ -447,6 +448,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="nav_toolbar">
                 <property name="visible">True</property>
                 <property name="no_show_all">True</property>
@@ -596,76 +667,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