[Goodies-commits] r3771 - in thunar-svn-plugin/trunk: po tsp-svn-helper
Peter de Ridder
peter at xfce.org
Wed Jan 2 21:49:00 CET 2008
Author: peter
Date: 2008-01-02 20:49:00 +0000 (Wed, 02 Jan 2008)
New Revision: 3771
Modified:
thunar-svn-plugin/trunk/po/fr.po
thunar-svn-plugin/trunk/po/hu.po
thunar-svn-plugin/trunk/po/lv.po
thunar-svn-plugin/trunk/po/nl.po
thunar-svn-plugin/trunk/po/pt_BR.po
thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot
thunar-svn-plugin/trunk/po/ur.po
thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c
Log:
gtk/gtkfilechooserprivate.h doesn't seem to exist everywhere, so removed gtkfilechooserentry (until a "clean" replacement is made)
changed the gtkfilechooserentry to an entry and a browse button
Modified: thunar-svn-plugin/trunk/po/fr.po
===================================================================
--- thunar-svn-plugin/trunk/po/fr.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/fr.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2007-10-24 13:04+0100\n"
"Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
"Language-Team: French\n"
@@ -601,20 +601,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/hu.po
===================================================================
--- thunar-svn-plugin/trunk/po/hu.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/hu.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Thunar SVN plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2007-06-04 08:37+0100\n"
"Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
"Language-Team: Hungarian\n"
@@ -596,20 +596,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/lv.po
===================================================================
--- thunar-svn-plugin/trunk/po/lv.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/lv.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2007-11-15 21:18+0300\n"
"Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
"Language-Team: Latvian <rprieditis at inbox.lv>\n"
@@ -599,20 +599,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/nl.po
===================================================================
--- thunar-svn-plugin/trunk/po/nl.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/nl.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2008-01-01 22:45+0100\n"
"Last-Translator: Peter de Ridder <peter at xfce.org>\n"
"Language-Team: Dutch <xfce-i18n at xfce.org>\n"
@@ -565,20 +565,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr "Selecteer een map"
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr "_Map:"
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/pt_BR.po
===================================================================
--- thunar-svn-plugin/trunk/po/pt_BR.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/pt_BR.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2007-11-09 15:08-0300\n"
"Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -600,20 +600,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot
===================================================================
--- thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot 2008-01-02 20:49:00 UTC (rev 3771)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\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"
@@ -566,20 +566,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/ur.po
===================================================================
--- thunar-svn-plugin/trunk/po/ur.po 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/po/ur.po 2008-01-02 20:49:00 UTC (rev 3771)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-01 22:42+0100\n"
+"POT-Creation-Date: 2008-01-02 21:52+0100\n"
"PO-Revision-Date: 2007-10-26 15:12+0500\n"
"Last-Translator: Muhammad Ali Makki <makk.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -602,20 +602,20 @@
msgid "Check Repository"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:65
+#: tsp-svn-helper/tsh-transfer-dialog.c:71
msgid "_Repository:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:72
-#: tsp-svn-helper/tsh-transfer-dialog.c:92
+#: tsp-svn-helper/tsh-transfer-dialog.c:80
+#: tsp-svn-helper/tsh-transfer-dialog.c:118
msgid "Select a folder"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:85
+#: tsp-svn-helper/tsh-transfer-dialog.c:111
msgid "_Directory:"
msgstr ""
-#: tsp-svn-helper/tsh-transfer-dialog.c:104
+#: tsp-svn-helper/tsh-transfer-dialog.c:130
msgid "Transfer"
msgstr ""
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am 2008-01-02 20:49:00 UTC (rev 3771)
@@ -46,15 +46,6 @@
tsh-unlock.c \
tsh-update.h \
tsh-update.c \
- gtkfilechooserentry.h \
- gtkfilechooserentry.c \
- gtkfilechooserutils.h \
- gtkfilechooserutils.c \
- gtkfilechooser.h \
- gtkfilechooser.c \
- gtkfilechooserdefault.c \
- gtkprivate.h \
- gtkintl.h \
tsh-dialog-common.h \
tsh-dialog-common.c \
tsh-login-dialog.h \
@@ -73,6 +64,16 @@
tsh-log-message-dialog.c \
tsh-transfer-dialog.h \
tsh-transfer-dialog.c
+# gtkfilechooserentry.h \
+# gtkfilechooserentry.c \
+# gtkfilechooserutils.h \
+# gtkfilechooserutils.c \
+# gtkfilechooser.h \
+# gtkfilechooser.c \
+# gtkfilechooserdefault.c \
+# gtkprivate.h \
+# gtkintl.h \
+#
tsp_svn_helper_CPPFLAGS = \
-DG_LOG_DOMAIN=\"tsp-svn-helper\"
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c 2008-01-02 17:41:19 UTC (rev 3770)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c 2008-01-02 20:49:00 UTC (rev 3771)
@@ -26,17 +26,20 @@
#include <dirent.h>
//#include "tsh-file-chooser-entry.h"
-#include "gtkfilechooserentry.h"
+//#include "gtkfilechooserentry.h"
//#include <gtk/gtkfilechooserentry.h>
#include "tsh-transfer-dialog.h"
+static void browse_callback(GtkButton *, TshTransferDialog *);
+
struct _TshTransferDialog
{
GtkDialog dialog;
GtkWidget *repository;
GtkWidget *path;
+ GtkWidget *filechooser;
};
struct _TshTransferDialogClass
@@ -56,6 +59,9 @@
{
GtkWidget *table;
GtkWidget *label;
+ GtkWidget *box;
+ GtkWidget *button;
+ GtkWidget *image;
table = gtk_table_new (2, 2, FALSE);
@@ -69,9 +75,29 @@
GTK_FILL,
0, 0);
- dialog->repository = gtk_file_chooser_entry_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);//tsh_file_chooser_entry_new ();
+ box = gtk_hbox_new(FALSE, 0);
+ dialog->repository = gtk_entry_new();
+ dialog->filechooser = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+ //tsh_file_chooser_entry_new ();
//dialog->repository = _gtk_file_chooser_entry_new(FALSE);
- gtk_table_attach (GTK_TABLE (table), dialog->repository,
+
+ image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
+ GTK_ICON_SIZE_MENU);
+ button = gtk_button_new();
+ gtk_button_set_image(GTK_BUTTON(button), image);
+ g_signal_connect(button, "clicked", G_CALLBACK(browse_callback), dialog);
+
+ gtk_box_pack_start(GTK_BOX(box), dialog->repository, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0);
+
+ gtk_widget_show(dialog->repository);
+ gtk_widget_show(button);
+
+ gtk_table_attach (GTK_TABLE (table), box,
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL,
GTK_FILL,
@@ -79,7 +105,7 @@
gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->repository);
gtk_widget_show(label);
- gtk_widget_show(dialog->repository);
+ gtk_widget_show(box);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog->repository), FALSE);
label = gtk_label_new_with_mnemonic (_("_Directory:"));
@@ -184,7 +210,7 @@
{
g_return_val_if_fail (TSH_IS_TRANSFER_DIALOG (dialog), NULL);
- return gtk_file_chooser_entry_get_uri(GTK_FILE_CHOOSER_ENTRY(dialog->repository));
+ return g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->repository)));
}
gchar* tsh_transfer_dialog_get_directory (TshTransferDialog *dialog)
@@ -194,3 +220,16 @@
return gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->path));
}
+static void
+browse_callback(GtkButton *button, TshTransferDialog *dialog)
+{
+ gtk_widget_show(dialog->filechooser);
+ if(gtk_dialog_run(GTK_DIALOG(dialog->filechooser)) == GTK_RESPONSE_OK)
+ {
+ gchar *url = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->filechooser));
+ gtk_entry_set_text(GTK_ENTRY(dialog->repository), url);
+ g_free(url);
+ }
+ gtk_widget_hide(dialog->filechooser);
+}
+
More information about the Goodies-commits
mailing list