[Goodies-commits] r2934 - in ristretto/trunk: po src
Stephan Arts
stephan at xfce.org
Tue Jul 31 00:14:37 CEST 2007
Author: stephan
Date: 2007-07-30 22:14:37 +0000 (Mon, 30 Jul 2007)
New Revision: 2934
Modified:
ristretto/trunk/po/nl.po
ristretto/trunk/po/ristretto.pot
ristretto/trunk/src/main.c
ristretto/trunk/src/navigator.c
Log:
Update Dutch translation
Add Open Folder button to file menu.
Add image media filter to navigator class.
Modified: ristretto/trunk/po/nl.po
===================================================================
--- ristretto/trunk/po/nl.po 2007-07-30 22:00:07 UTC (rev 2933)
+++ ristretto/trunk/po/nl.po 2007-07-30 22:14:37 UTC (rev 2934)
@@ -6,16 +6,28 @@
msgid ""
msgstr ""
"Project-Id-Version: ristretto 0.0.1-svn-r02537\n"
-"Report-Msgid-Bugs-To: psybsd at gmail.com\n"
-"POT-Creation-Date: 2007-07-13 00:46+0200\n"
+"Report-Msgid-Bugs-To: stephan at xfce.org\n"
+"POT-Creation-Date: 2007-07-31 00:13+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"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../src/main.c:131
+#: ../src/main.c:90
+msgid "_File"
+msgstr "_Bestand"
+
+#: ../src/main.c:92
+msgid "O_pen Folder"
+msgstr "Map o_penen"
+
+#: ../src/main.c:200
msgid "Open image"
msgstr "Afbeelding openen"
+
+#: ../src/main.c:228
+msgid "Open folder"
+msgstr "Map openen"
Modified: ristretto/trunk/po/ristretto.pot
===================================================================
--- ristretto/trunk/po/ristretto.pot 2007-07-30 22:00:07 UTC (rev 2933)
+++ ristretto/trunk/po/ristretto.pot 2007-07-30 22:14:37 UTC (rev 2934)
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: psybsd at gmail.com\n"
-"POT-Creation-Date: 2007-07-13 00:46+0200\n"
+"Report-Msgid-Bugs-To: stephan at xfce.org\n"
+"POT-Creation-Date: 2007-07-31 00:13+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,6 +16,18 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/main.c:131
+#: ../src/main.c:90
+msgid "_File"
+msgstr ""
+
+#: ../src/main.c:92
+msgid "O_pen Folder"
+msgstr ""
+
+#: ../src/main.c:200
msgid "Open image"
msgstr ""
+
+#: ../src/main.c:228
+msgid "Open folder"
+msgstr ""
Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c 2007-07-30 22:00:07 UTC (rev 2933)
+++ ristretto/trunk/src/main.c 2007-07-30 22:14:37 UTC (rev 2934)
@@ -42,6 +42,8 @@
static void
cb_rstto_open(GtkToolItem *item, RsttoNavigator *);
static void
+cb_rstto_open_dir(GtkToolItem *item, RsttoNavigator *);
+static void
cb_rstto_nav_file_changed(RsttoNavigator *navigator, GtkWindow *window);
int main(int argc, char **argv)
@@ -86,11 +88,17 @@
GtkWidget *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_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_file = gtk_menu_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), menu_item_file);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item_file), menu_file);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_open);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_open_dir);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_separator);
gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_quit);
GtkToolItem *zoom_fit= gtk_tool_button_new_from_stock(GTK_STOCK_ZOOM_FIT);
@@ -143,6 +151,8 @@
g_signal_connect(G_OBJECT(open), "clicked", G_CALLBACK(cb_rstto_open), navigator);
g_signal_connect(G_OBJECT(menu_item_quit), "activate", G_CALLBACK(gtk_main_quit), NULL);
+ g_signal_connect(G_OBJECT(menu_item_open), "activate", G_CALLBACK(cb_rstto_open), NULL);
+ g_signal_connect(G_OBJECT(menu_item_open_dir), "activate", G_CALLBACK(cb_rstto_open_dir), NULL);
/* g_signal_connect(G_OBJECT(window), "window-state-event", G_CALLBACK(cb_rstto_fullscreen), viewer);*/
@@ -211,6 +221,34 @@
}
static void
+cb_rstto_open_dir(GtkToolItem *item, RsttoNavigator *navigator)
+{
+ GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(item));
+
+ GtkWidget *dialog = gtk_file_chooser_dialog_new(_("Open folder"),
+ GTK_WINDOW(window),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+
+ gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+ if(response == GTK_RESPONSE_OK)
+ {
+ const gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+ ThunarVfsPath *path = thunar_vfs_path_new(filename, NULL);
+
+ rstto_navigator_set_path(navigator, path);
+
+ thunar_vfs_path_unref(path);
+
+ }
+
+ gtk_widget_destroy(dialog);
+}
+
+static void
cb_rstto_forward(GtkToolItem *item, RsttoNavigator *navigator)
{
rstto_navigator_forward(navigator);
Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c 2007-07-30 22:00:07 UTC (rev 2933)
+++ ristretto/trunk/src/navigator.c 2007-07-30 22:14:37 UTC (rev 2934)
@@ -157,7 +157,8 @@
{
ThunarVfsPath *file_path = thunar_vfs_path_relative(navigator->path, filename);
ThunarVfsInfo *file_info = thunar_vfs_info_new_for_path(file_path, NULL);
- if(strcmp(thunar_vfs_mime_info_get_name(file_info->mime_info), "inode/directory"))
+ gchar *file_media = thunar_vfs_mime_info_get_media(file_info->mime_info);
+ if(!strcmp(file_media, "image"))
{
navigator->file_list = g_list_prepend(navigator->file_list, file_info);
@@ -173,6 +174,7 @@
thunar_vfs_path_unref(file_path);
filename = g_dir_read_name(dir);
+ g_free(file_media);
}
g_free(dir_name);
if(!navigator->file_iter)
More information about the Goodies-commits
mailing list