[Goodies-commits] r3384 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-10-15 20:35:56 +0000 (Mon, 15 Oct 2007)
New Revision: 3384

Modified:
   ristretto/trunk/src/main_window.c
Log:
Add open and close feature to context menu



Modified: ristretto/trunk/src/main_window.c
===================================================================
--- ristretto/trunk/src/main_window.c	2007-10-15 20:30:19 UTC (rev 3383)
+++ ristretto/trunk/src/main_window.c	2007-10-15 20:35:56 UTC (rev 3384)
@@ -114,6 +114,9 @@
 
         struct {
             GtkWidget *menu;
+            GtkWidget *menu_item_open_file;
+            GtkWidget *menu_item_close;
+            GtkWidget *menu_item_separator_1;
             GtkWidget *menu_item_zoom_in;
             GtkWidget *menu_item_zoom_out;
             GtkWidget *menu_item_zoom_fit;
@@ -458,16 +461,26 @@
 
 /* Create picture viewer menu */
     window->priv->menus._picture_viewer.menu = gtk_menu_new();
+    window->priv->menus._picture_viewer.menu_item_open_file = gtk_image_menu_item_new_from_stock(GTK_STOCK_OPEN, NULL);
+    window->priv->menus._picture_viewer.menu_item_close = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, NULL);
+
+    window->priv->menus._picture_viewer.menu_item_separator_1 = gtk_separator_menu_item_new();
+
     window->priv->menus._picture_viewer.menu_item_zoom_in = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_IN, NULL);
     window->priv->menus._picture_viewer.menu_item_zoom_out = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_OUT, NULL);
     window->priv->menus._picture_viewer.menu_item_zoom_fit = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_FIT, NULL);
     window->priv->menus._picture_viewer.menu_item_zoom_100 = gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOOM_100, NULL);
 
+    gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_open_file);
+    gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_close);
+    gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_separator_1);
+
     gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_zoom_in);
     gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_zoom_out);
     gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_zoom_fit);
     gtk_menu_shell_append(GTK_MENU_SHELL(window->priv->menus._picture_viewer.menu), window->priv->menus._picture_viewer.menu_item_zoom_100);
 
+    gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_close), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_in), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_out), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_100), FALSE);
@@ -576,6 +589,13 @@
             G_CALLBACK(cb_rstto_main_window_zoom_fit), window);
 
     /* Picture viewer menu */
+    g_signal_connect(window->priv->menus._picture_viewer.menu_item_open_file,
+            "activate",
+            G_CALLBACK(cb_rstto_main_window_open_file), window);
+    g_signal_connect(window->priv->menus._picture_viewer.menu_item_close,
+            "activate",
+            G_CALLBACK(cb_rstto_main_window_close), window);
+            
     g_signal_connect(window->priv->menus._picture_viewer.menu_item_zoom_in,
             "activate",
             G_CALLBACK(cb_rstto_main_window_zoom_in), window);
@@ -1150,6 +1170,7 @@
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_fit), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_100), TRUE);
 
+        gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_close), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_in), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_out), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_100), TRUE);
@@ -1221,6 +1242,7 @@
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_fit), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_100), FALSE);
 
+            gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_close), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_in), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_out), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->menus._picture_viewer.menu_item_zoom_100), FALSE);