[Goodies-commits] r3011 - in ristretto/trunk: po src

Stephan Arts stephan at xfce.org
Mon Aug 20 01:28:31 CEST 2007


Author: stephan
Date: 2007-08-19 23:28:31 +0000 (Sun, 19 Aug 2007)
New Revision: 3011

Modified:
   ristretto/trunk/po/fr.po
   ristretto/trunk/po/nl.po
   ristretto/trunk/po/ristretto.pot
   ristretto/trunk/src/main.c
Log:
fix accelerators

Modified: ristretto/trunk/po/fr.po
===================================================================
--- ristretto/trunk/po/fr.po	2007-08-19 22:47:00 UTC (rev 3010)
+++ ristretto/trunk/po/fr.po	2007-08-19 23:28:31 UTC (rev 3011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ristretto\n"
 "Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-08-12 01:07+0200\n"
+"POT-Creation-Date: 2007-08-20 00:48+0200\n"
 "PO-Revision-Date: 2007-07-03 00:59:21+0200\n"
 "Last-Translator: Mike Massonnet <mmassonnet at xfce.org>\n"
 "Language-Team: French\n"
@@ -15,75 +15,75 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/main.c:146
+#: ../src/main.c:184
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/main.c:148
+#: ../src/main.c:186
 msgid "O_pen Folder"
 msgstr "O_uvrir un répertoire"
 
-#: ../src/main.c:159
+#: ../src/main.c:197
 msgid "_Edit"
 msgstr "_Editer"
 
-#: ../src/main.c:160
+#: ../src/main.c:198
 msgid "Rotate _Left"
 msgstr ""
 
-#: ../src/main.c:161
+#: ../src/main.c:199
 msgid "Rotate _Right"
 msgstr ""
 
-#: ../src/main.c:162
+#: ../src/main.c:200
 msgid "Flip _Vertically"
 msgstr ""
 
-#: ../src/main.c:163
+#: ../src/main.c:201
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: ../src/main.c:172
+#: ../src/main.c:210
 msgid "_View"
 msgstr "A_fficher"
 
-#: ../src/main.c:173
+#: ../src/main.c:211
 msgid "Thumbnail Viewer"
 msgstr ""
 
-#: ../src/main.c:183
+#: ../src/main.c:221
 msgid "Show Horizontally"
 msgstr ""
 
-#: ../src/main.c:184
+#: ../src/main.c:222
 msgid "Show Vertically"
 msgstr ""
 
-#: ../src/main.c:185
+#: ../src/main.c:223
 msgid "Hide"
 msgstr ""
 
-#: ../src/main.c:191
+#: ../src/main.c:229
 msgid "_Go"
 msgstr ""
 
-#: ../src/main.c:213
+#: ../src/main.c:251
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/main.c:346
+#: ../src/main.c:382
 msgid "Open image"
 msgstr "Ouvrir une image"
 
-#: ../src/main.c:374
+#: ../src/main.c:419
 msgid "Open folder"
 msgstr "Ouvrir un répertoire"
 
-#: ../src/main.c:401
+#: ../src/main.c:465
 msgid "Developer:"
 msgstr "Développeur :"
 
-#: ../src/main.c:410
+#: ../src/main.c:474
 msgid ""
 "Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
 "environment."
@@ -91,7 +91,7 @@
 "Ristretto est un visualiseur d'images léger et rapide pour l'environnement "
 "de bureau Xfce."
 
-#: ../src/main.c:417
+#: ../src/main.c:481
 msgid "translator-credits"
 msgstr ""
 

Modified: ristretto/trunk/po/nl.po
===================================================================
--- ristretto/trunk/po/nl.po	2007-08-19 22:47:00 UTC (rev 3010)
+++ ristretto/trunk/po/nl.po	2007-08-19 23:28:31 UTC (rev 3011)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ristretto 0.0.1-svn-r02537\n"
 "Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-08-12 01:07+0200\n"
+"POT-Creation-Date: 2007-08-20 00:48+0200\n"
 "PO-Revision-Date: 2007-07-13 00:48+0200\n"
 "Last-Translator: Stephan Arts <stephan at xfce.org>\n"
 "Language-Team: Dutch\n"
@@ -16,75 +16,75 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/main.c:146
+#: ../src/main.c:184
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../src/main.c:148
+#: ../src/main.c:186
 msgid "O_pen Folder"
 msgstr "Map o_penen"
 
-#: ../src/main.c:159
+#: ../src/main.c:197
 msgid "_Edit"
 msgstr "B_ewerken"
 
-#: ../src/main.c:160
+#: ../src/main.c:198
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
-#: ../src/main.c:161
+#: ../src/main.c:199
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
-#: ../src/main.c:162
+#: ../src/main.c:200
 msgid "Flip _Vertically"
 msgstr "_Verticaal spiegelen"
 
-#: ../src/main.c:163
+#: ../src/main.c:201
 msgid "Flip _Horizontally"
 msgstr "_Horizontaal spiegelen"
 
-#: ../src/main.c:172
+#: ../src/main.c:210
 msgid "_View"
 msgstr "_Beeld"
 
-#: ../src/main.c:173
+#: ../src/main.c:211
 msgid "Thumbnail Viewer"
-msgstr ""
+msgstr "Miniatuur Weergave"
 
-#: ../src/main.c:183
+#: ../src/main.c:221
 msgid "Show Horizontally"
 msgstr "Horizontaal tonen"
 
-#: ../src/main.c:184
+#: ../src/main.c:222
 msgid "Show Vertically"
 msgstr "Verticaal tonen"
 
-#: ../src/main.c:185
+#: ../src/main.c:223
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../src/main.c:191
+#: ../src/main.c:229
 msgid "_Go"
 msgstr "_Ga"
 
-#: ../src/main.c:213
+#: ../src/main.c:251
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/main.c:346
+#: ../src/main.c:382
 msgid "Open image"
 msgstr "Afbeelding openen"
 
-#: ../src/main.c:374
+#: ../src/main.c:419
 msgid "Open folder"
 msgstr "Map openen"
 
-#: ../src/main.c:401
+#: ../src/main.c:465
 msgid "Developer:"
 msgstr "Ontwikkelaar:"
 
-#: ../src/main.c:410
+#: ../src/main.c:474
 msgid ""
 "Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
 "environment."
@@ -92,7 +92,7 @@
 "Ristretto is een snelle en lichtgewicht afbeeldingsweergave-programma voor "
 "de Xfce-desktop omgeving"
 
-#: ../src/main.c:417
+#: ../src/main.c:481
 msgid "translator-credits"
 msgstr "Stephan Arts <stephan at xfce.org>"
 

Modified: ristretto/trunk/po/ristretto.pot
===================================================================
--- ristretto/trunk/po/ristretto.pot	2007-08-19 22:47:00 UTC (rev 3010)
+++ ristretto/trunk/po/ristretto.pot	2007-08-19 23:28:31 UTC (rev 3011)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-08-12 01:07+0200\n"
+"POT-Creation-Date: 2007-08-20 00:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,80 +16,80 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/main.c:146
+#: ../src/main.c:184
 msgid "_File"
 msgstr ""
 
-#: ../src/main.c:148
+#: ../src/main.c:186
 msgid "O_pen Folder"
 msgstr ""
 
-#: ../src/main.c:159
+#: ../src/main.c:197
 msgid "_Edit"
 msgstr ""
 
-#: ../src/main.c:160
+#: ../src/main.c:198
 msgid "Rotate _Left"
 msgstr ""
 
-#: ../src/main.c:161
+#: ../src/main.c:199
 msgid "Rotate _Right"
 msgstr ""
 
-#: ../src/main.c:162
+#: ../src/main.c:200
 msgid "Flip _Vertically"
 msgstr ""
 
-#: ../src/main.c:163
+#: ../src/main.c:201
 msgid "Flip _Horizontally"
 msgstr ""
 
-#: ../src/main.c:172
+#: ../src/main.c:210
 msgid "_View"
 msgstr ""
 
-#: ../src/main.c:173
+#: ../src/main.c:211
 msgid "Thumbnail Viewer"
 msgstr ""
 
-#: ../src/main.c:183
+#: ../src/main.c:221
 msgid "Show Horizontally"
 msgstr ""
 
-#: ../src/main.c:184
+#: ../src/main.c:222
 msgid "Show Vertically"
 msgstr ""
 
-#: ../src/main.c:185
+#: ../src/main.c:223
 msgid "Hide"
 msgstr ""
 
-#: ../src/main.c:191
+#: ../src/main.c:229
 msgid "_Go"
 msgstr ""
 
-#: ../src/main.c:213
+#: ../src/main.c:251
 msgid "_Help"
 msgstr ""
 
-#: ../src/main.c:346
+#: ../src/main.c:382
 msgid "Open image"
 msgstr ""
 
-#: ../src/main.c:374
+#: ../src/main.c:419
 msgid "Open folder"
 msgstr ""
 
-#: ../src/main.c:401
+#: ../src/main.c:465
 msgid "Developer:"
 msgstr ""
 
-#: ../src/main.c:410
+#: ../src/main.c:474
 msgid ""
 "Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
 "environment."
 msgstr ""
 
-#: ../src/main.c:417
+#: ../src/main.c:481
 msgid "translator-credits"
 msgstr ""

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-08-19 22:47:00 UTC (rev 3010)
+++ ristretto/trunk/src/main.c	2007-08-19 23:28:31 UTC (rev 3011)
@@ -78,7 +78,6 @@
 
 static void
 cb_rstto_key_press_event(GtkWidget *widget, GdkEventKey *event, RsttoNavigator *navigator);
-
 static void
 cb_rstto_nav_file_changed(RsttoNavigator *navigator, GtkWindow *window);
 
@@ -117,8 +116,10 @@
     gtk_window_set_default_icon_name("ristretto");
 
     GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkAccelGroup *accel_group = gtk_accel_group_new();
 
     gtk_window_set_title(GTK_WINDOW(window), PACKAGE_STRING);
+    gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 
 
     g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
@@ -127,6 +128,8 @@
     viewer = rstto_picture_viewer_new(navigator);
     thumbnail_viewer = rstto_thumbnail_viewer_new(navigator);
 
+    g_signal_connect(window , "key-press-event", G_CALLBACK(cb_rstto_key_press_event) , navigator);
+
     if(argc == 2)
         path = thunar_vfs_path_new(argv[1], NULL);
     if (path)
@@ -168,7 +171,6 @@
     }
 
 
-    g_signal_connect(window , "key-press-event", G_CALLBACK(cb_rstto_key_press_event) , navigator);
     g_signal_connect(G_OBJECT(navigator), "file_changed", G_CALLBACK(cb_rstto_nav_file_changed), window);
 
     GtkWidget *s_window = gtk_scrolled_window_new(NULL,NULL);
@@ -182,10 +184,10 @@
     status_bar = gtk_statusbar_new();
 
     GtkWidget *menu_item_file = gtk_menu_item_new_with_mnemonic(_("_File"));
-    GtkWidget *menu_item_open = gtk_image_menu_item_new_from_stock(GTK_STOCK_OPEN, NULL);
+    GtkWidget *menu_item_open = gtk_image_menu_item_new_from_stock(GTK_STOCK_OPEN, accel_group);
     GtkWidget *menu_item_open_dir = gtk_menu_item_new_with_mnemonic(_("O_pen Folder"));
     GtkWidget *menu_item_separator = gtk_separator_menu_item_new();
-    GtkWidget *menu_item_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
+    GtkWidget *menu_item_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, accel_group);
 
     GtkWidget *menu_file = gtk_menu_new();
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_file), menu_file);
@@ -210,6 +212,7 @@
     GtkWidget *menu_item_view = gtk_menu_item_new_with_mnemonic(_("_View"));
     GtkWidget *menu_item_tv = gtk_menu_item_new_with_mnemonic(_("Thumbnail Viewer"));
     GtkWidget *menu_item_view_fs = gtk_image_menu_item_new_from_stock(GTK_STOCK_FULLSCREEN, NULL);
+    gtk_widget_add_accelerator(menu_item_view_fs, "activate", accel_group, GDK_F11, 0,GTK_ACCEL_VISIBLE);
 
     GtkWidget *menu_view = gtk_menu_new();
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_view), menu_view);
@@ -232,9 +235,15 @@
     GtkWidget *menu_item_last = gtk_image_menu_item_new_from_stock(GTK_STOCK_GOTO_LAST, NULL);
     GtkWidget *menu_item_forward = gtk_image_menu_item_new_from_stock(GTK_STOCK_GO_FORWARD, NULL);
     GtkWidget *menu_item_back = gtk_image_menu_item_new_from_stock(GTK_STOCK_GO_BACK, NULL);
+    gtk_widget_add_accelerator(menu_item_first, "activate", accel_group, GDK_Home, 0,GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(menu_item_last, "activate", accel_group, GDK_End, 0,GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(menu_item_forward, "activate", accel_group, GDK_Page_Down, 0,GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(menu_item_back, "activate", accel_group, GDK_Page_Up, 0,GTK_ACCEL_VISIBLE);
 
-    menu_item_play = gtk_image_menu_item_new_from_stock(GTK_STOCK_MEDIA_PLAY, NULL);
-    menu_item_pause = gtk_image_menu_item_new_from_stock(GTK_STOCK_MEDIA_PAUSE, NULL);
+    menu_item_play = gtk_image_menu_item_new_from_stock(GTK_STOCK_MEDIA_PLAY, accel_group);
+    menu_item_pause = gtk_image_menu_item_new_from_stock(GTK_STOCK_MEDIA_PAUSE, accel_group);
+    gtk_widget_add_accelerator(menu_item_play, "activate", accel_group, GDK_F5, 0,GTK_ACCEL_VISIBLE);
+    gtk_widget_add_accelerator(menu_item_pause, "activate", accel_group, GDK_F5, 0,GTK_ACCEL_VISIBLE);
 
     menu_item_separator = gtk_separator_menu_item_new();
 
@@ -249,7 +258,7 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_pause);
 
     GtkWidget *menu_item_help = gtk_menu_item_new_with_mnemonic(_("_Help"));
-    GtkWidget *menu_item_help_about = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
+    GtkWidget *menu_item_help_about = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, accel_group);
 
     GtkWidget *menu_help = gtk_menu_new();
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_help), menu_help);
@@ -586,34 +595,6 @@
 }
 
 static void
-cb_rstto_key_press_event(GtkWidget *widget, GdkEventKey *event, RsttoNavigator *navigator)
-{
-    GtkWindow *window = GTK_WINDOW(widget);
-    switch(event->keyval)
-    {
-        case GDK_F11:
-            if(window_fullscreen)
-                gtk_window_unfullscreen(window);
-            else
-                gtk_window_fullscreen(window);
-            break;
-        case GDK_Home:
-            rstto_navigator_jump_first(navigator);
-            break;
-        case GDK_End:
-            rstto_navigator_jump_last(navigator);
-            break;
-        case GDK_Page_Down:
-            rstto_navigator_jump_forward(navigator);
-            break;
-        case GDK_Page_Up:
-            rstto_navigator_jump_back(navigator);
-            break;
-    }
-}
-
-
-static void
 cb_rstto_show_tv_v(GtkWidget *widget, RsttoThumbnailViewer *viewer)
 {
     GtkWidget *parent = gtk_widget_get_parent(GTK_WIDGET(viewer));
@@ -702,3 +683,34 @@
 
     //rstto_navigator_set_entry_rotation(navigator, entry, rotation);
 }
+
+static void
+cb_rstto_key_press_event(GtkWidget *widget, GdkEventKey *event, RsttoNavigator *navigator)
+{
+    GtkWindow *window = GTK_WINDOW(widget);
+    if(!gtk_window_activate_key(window, event))
+    {
+        g_debug("A");
+        switch(event->keyval)
+        {
+            case GDK_F11:
+                if(window_fullscreen)
+                    gtk_window_unfullscreen(window);
+                else
+                    gtk_window_fullscreen(window);
+                break;
+            case GDK_Home:
+                rstto_navigator_jump_first(navigator);
+                break;
+            case GDK_End:
+                rstto_navigator_jump_last(navigator);
+                break;
+            case GDK_Page_Down:
+                rstto_navigator_jump_forward(navigator);
+                break;
+            case GDK_Page_Up:
+                rstto_navigator_jump_back(navigator);
+                break;
+        }
+    }
+}




More information about the Goodies-commits mailing list