[Goodies-commits] r2969 - in ristretto/trunk: po src
Stephan Arts
stephan at xfce.org
Tue Aug 7 20:21:30 CEST 2007
Author: stephan
Date: 2007-08-07 18:21:30 +0000 (Tue, 07 Aug 2007)
New Revision: 2969
Modified:
ristretto/trunk/po/fr.po
ristretto/trunk/po/nl.po
ristretto/trunk/po/ristretto.pot
ristretto/trunk/src/main.c
Log:
Add slideshow support
Add menu-items to navigate the images
Update the dutch translations (and the po(t) files)
Modified: ristretto/trunk/po/fr.po
===================================================================
--- ristretto/trunk/po/fr.po 2007-08-07 17:36:41 UTC (rev 2968)
+++ ristretto/trunk/po/fr.po 2007-08-07 18:21:30 UTC (rev 2969)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ristretto\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2007-08-05 00:55+0200\n"
+"POT-Creation-Date: 2007-08-07 19:53+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,39 +15,43 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/main.c:117
+#: ../src/main.c:119
msgid "_File"
msgstr "_Fichier"
-#: ../src/main.c:119
+#: ../src/main.c:121
msgid "O_pen Folder"
msgstr "O_uvrir un répertoire"
-#: ../src/main.c:130
+#: ../src/main.c:132
msgid "_Edit"
msgstr "_Editer"
-#: ../src/main.c:135
+#: ../src/main.c:137
msgid "_View"
msgstr "A_fficher"
-#: ../src/main.c:142
+#: ../src/main.c:144
+msgid "_Go"
+msgstr ""
+
+#: ../src/main.c:163
msgid "_Help"
msgstr "_Aide"
-#: ../src/main.c:257
+#: ../src/main.c:280
msgid "Open image"
msgstr "Ouvrir une image"
-#: ../src/main.c:285
+#: ../src/main.c:308
msgid "Open folder"
msgstr "Ouvrir un répertoire"
-#: ../src/main.c:312
+#: ../src/main.c:335
msgid "Developer:"
msgstr "Développeur :"
-#: ../src/main.c:321
+#: ../src/main.c:344
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
@@ -55,7 +59,7 @@
"Ristretto est un visualiseur d'images léger et rapide pour l'environnement "
"de bureau Xfce."
-#: ../src/main.c:328
+#: ../src/main.c:351
msgid "translator-credits"
msgstr ""
Modified: ristretto/trunk/po/nl.po
===================================================================
--- ristretto/trunk/po/nl.po 2007-08-07 17:36:41 UTC (rev 2968)
+++ ristretto/trunk/po/nl.po 2007-08-07 18:21:30 UTC (rev 2969)
@@ -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-05 00:55+0200\n"
+"POT-Creation-Date: 2007-08-07 19:53+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,45 +16,49 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../src/main.c:117
+#: ../src/main.c:119
msgid "_File"
msgstr "_Bestand"
-#: ../src/main.c:119
+#: ../src/main.c:121
msgid "O_pen Folder"
msgstr "Map o_penen"
-#: ../src/main.c:130
+#: ../src/main.c:132
msgid "_Edit"
msgstr "B_ewerken"
-#: ../src/main.c:135
+#: ../src/main.c:137
msgid "_View"
msgstr "_Beeld"
-#: ../src/main.c:142
+#: ../src/main.c:144
+msgid "_Go"
+msgstr "_Ga"
+
+#: ../src/main.c:163
msgid "_Help"
msgstr "_Help"
-#: ../src/main.c:257
+#: ../src/main.c:280
msgid "Open image"
msgstr "Afbeelding openen"
-#: ../src/main.c:285
+#: ../src/main.c:308
msgid "Open folder"
msgstr "Map openen"
-#: ../src/main.c:312
+#: ../src/main.c:335
msgid "Developer:"
msgstr "Ontwikkelaar:"
-#: ../src/main.c:321
+#: ../src/main.c:344
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr ""
-#: ../src/main.c:328
+#: ../src/main.c:351
msgid "translator-credits"
msgstr "Stephan Arts <stephan at xfce.org>"
Modified: ristretto/trunk/po/ristretto.pot
===================================================================
--- ristretto/trunk/po/ristretto.pot 2007-08-07 17:36:41 UTC (rev 2968)
+++ ristretto/trunk/po/ristretto.pot 2007-08-07 18:21:30 UTC (rev 2969)
@@ -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-05 00:55+0200\n"
+"POT-Creation-Date: 2007-08-07 19:53+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,44 +16,48 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/main.c:117
+#: ../src/main.c:119
msgid "_File"
msgstr ""
-#: ../src/main.c:119
+#: ../src/main.c:121
msgid "O_pen Folder"
msgstr ""
-#: ../src/main.c:130
+#: ../src/main.c:132
msgid "_Edit"
msgstr ""
-#: ../src/main.c:135
+#: ../src/main.c:137
msgid "_View"
msgstr ""
-#: ../src/main.c:142
+#: ../src/main.c:144
+msgid "_Go"
+msgstr ""
+
+#: ../src/main.c:163
msgid "_Help"
msgstr ""
-#: ../src/main.c:257
+#: ../src/main.c:280
msgid "Open image"
msgstr ""
-#: ../src/main.c:285
+#: ../src/main.c:308
msgid "Open folder"
msgstr ""
-#: ../src/main.c:312
+#: ../src/main.c:335
msgid "Developer:"
msgstr ""
-#: ../src/main.c:321
+#: ../src/main.c:344
msgid ""
"Ristretto is a fast and lightweight picture-viewer for the Xfce desktop "
"environment."
msgstr ""
-#: ../src/main.c:328
+#: ../src/main.c:351
msgid "translator-credits"
msgstr ""
Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c 2007-08-07 17:36:41 UTC (rev 2968)
+++ ristretto/trunk/src/main.c 2007-08-07 18:21:30 UTC (rev 2969)
@@ -39,12 +39,16 @@
static void
cb_rstto_fullscreen(GtkWidget *, GdkEventWindowState *event, RsttoPictureViewer *viewer);
static void
-cb_rstto_toggle_play(GtkToolItem *item, RsttoNavigator *navigator);
+cb_rstto_toggle_play(GtkImageMenuItem *item, RsttoNavigator *navigator);
static void
cb_rstto_previous(GtkToolItem *item, RsttoNavigator *);
static void
cb_rstto_forward(GtkToolItem *item, RsttoNavigator *);
+static void
+cb_rstto_first(GtkToolItem *item, RsttoNavigator *);
+static void
+cb_rstto_last(GtkToolItem *item, RsttoNavigator *);
static void
cb_rstto_open(GtkToolItem *item, RsttoNavigator *);
@@ -68,6 +72,9 @@
static GtkWidget *image_tool_bar;
static GtkWidget *app_tool_bar;
static GtkWidget *status_bar;
+static gboolean playing = FALSE;
+static GtkWidget *menu_item_play;
+static GtkWidget *menu_item_pause;
int main(int argc, char **argv)
{
@@ -135,14 +142,34 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_edit), menu_edit);
GtkWidget *menu_item_view = gtk_menu_item_new_with_mnemonic(_("_View"));
- GtkWidget *menu_item_play = gtk_image_menu_item_new_from_stock(GTK_STOCK_MEDIA_PLAY, NULL);
GtkWidget *menu_item_view_fs = gtk_image_menu_item_new_from_stock(GTK_STOCK_FULLSCREEN, NULL);
GtkWidget *menu_view = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_view), menu_view);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu_view), menu_item_play);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_view), menu_item_view_fs);
+ GtkWidget *menu_item_go = gtk_menu_item_new_with_mnemonic(_("_Go"));
+
+ GtkWidget *menu_item_first = gtk_image_menu_item_new_from_stock(GTK_STOCK_GOTO_FIRST, NULL);
+ 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);
+
+ 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_separator = gtk_separator_menu_item_new();
+
+ GtkWidget *menu_go = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_go), menu_go);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_first);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_last);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_forward);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_back);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_separator);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_go), menu_item_play);
+ 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);
@@ -154,6 +181,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_file);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_edit);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_view);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_go);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_help);
GtkToolItem *zoom_fit= gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_FIT);
@@ -213,7 +241,13 @@
g_signal_connect(G_OBJECT(menu_item_open_dir), "activate", G_CALLBACK(cb_rstto_open_dir), navigator);
g_signal_connect(G_OBJECT(menu_item_help_about), "activate", G_CALLBACK(cb_rstto_help_about), window);
+ g_signal_connect(G_OBJECT(menu_item_forward), "activate", G_CALLBACK(cb_rstto_forward), navigator);
+ g_signal_connect(G_OBJECT(menu_item_back), "activate", G_CALLBACK(cb_rstto_previous), navigator);
+ g_signal_connect(G_OBJECT(menu_item_first), "activate", G_CALLBACK(cb_rstto_first), navigator);
+ g_signal_connect(G_OBJECT(menu_item_last), "activate", G_CALLBACK(cb_rstto_last), navigator);
+
g_signal_connect(G_OBJECT(menu_item_play), "activate", G_CALLBACK(cb_rstto_toggle_play), navigator);
+ g_signal_connect(G_OBJECT(menu_item_pause), "activate", G_CALLBACK(cb_rstto_toggle_play), navigator);
g_signal_connect(G_OBJECT(menu_item_view_fs), "activate", G_CALLBACK(cb_rstto_toggle_fullscreen), window);
g_signal_connect(G_OBJECT(window), "window-state-event", G_CALLBACK(cb_rstto_fullscreen), viewer);
@@ -221,6 +255,7 @@
gtk_container_add(GTK_CONTAINER(window), main_vbox);
gtk_widget_show_all(window);
+ gtk_widget_hide(menu_item_pause);
gtk_widget_show(viewer);
@@ -342,6 +377,18 @@
}
static void
+cb_rstto_first(GtkToolItem *item, RsttoNavigator *navigator)
+{
+ rstto_navigator_first(navigator);
+}
+
+static void
+cb_rstto_last(GtkToolItem *item, RsttoNavigator *navigator)
+{
+ rstto_navigator_last(navigator);
+}
+
+static void
cb_rstto_forward(GtkToolItem *item, RsttoNavigator *navigator)
{
rstto_navigator_forward(navigator);
@@ -398,9 +445,21 @@
}
static void
-cb_rstto_toggle_play(GtkToolItem *item, RsttoNavigator *navigator)
+cb_rstto_toggle_play(GtkImageMenuItem *item, RsttoNavigator *navigator)
{
- rstto_navigator_set_running(navigator, TRUE);
+ if(playing == TRUE)
+ {
+ gtk_widget_show(menu_item_play);
+ gtk_widget_hide(menu_item_pause);
+ playing = FALSE;
+ }
+ else
+ {
+ gtk_widget_hide(menu_item_play);
+ gtk_widget_show(menu_item_pause);
+ playing = TRUE;
+ }
+ rstto_navigator_set_running(navigator, playing);
}
static void
More information about the Goodies-commits
mailing list