Author: moon
Date: 2006-06-30 08:18:10 -0700 (Fri, 30 Jun 2006)
New Revision: 3078
Modified:
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/plugins/fs/upload.c
Log:
remember last user choice for filechooser
changed 'Browse' icon
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-06-30 15:07:11 UTC (rev 3077)
+++ gnunet-gtk/gnunet-gtk.glade 2006-06-30 15:18:10 UTC (rev 3078)
@@ -1983,7 +1983,7 @@
<signal name="clicked"
handler="on_mainFileSharingInsertBrowseButton_clicked"
object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005
17:09:36 GMT"/>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <widget class="GtkAlignment" id="alignment24">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1995,15 +1995,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <widget class="GtkHBox" id="hbox60">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image7">
+ <widget class="GtkImage" id="image46">
<property name="visible">True</property>
- <property name="stock">gtk-home</property>
+ <property name="stock">gtk-open</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -2018,7 +2018,7 @@
</child>
<child>
- <widget class="GtkLabel" id="label70">
+ <widget class="GtkLabel" id="label143">
<property name="visible">True</property>
<property name="label"
translatable="yes">_Browse</property>
<property
name="use_underline">True</property>
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2006-06-30 15:07:11 UTC (rev 3077)
+++ gnunet-gtk/src/plugins/fs/upload.c 2006-06-30 15:18:10 UTC (rev 3078)
@@ -419,7 +419,7 @@
DEBUG_END();
}
-static char * selectFile() {
+static char * selectFile(const char *oldfilename) {
#ifndef MINGW
GtkWidget *dialog;
GladeXML * uploadXML;
@@ -437,6 +437,10 @@
recBut = glade_xml_get_widget(getMainXML(),
"scopeRecursiveButton");
+ /* show the user last used dir */
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
+ oldfilename);
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(recBut)))
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@@ -472,16 +476,17 @@
void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton,
gpointer dummy) {
- char *filename;
+ char *filename, *oldfilename;
GtkWidget * uploadLine;
GtkWidget * entry;
GtkListStore * model;
GtkTreeIter iter;
- if ((filename = selectFile())) {
- uploadLine = glade_xml_get_widget(getMainXML(),
- "uploadFilenameComboBoxEntry");
- entry = gtk_bin_get_child(GTK_BIN(uploadLine));
+ uploadLine = glade_xml_get_widget(getMainXML(),
+ "uploadFilenameComboBoxEntry");
+ entry = gtk_bin_get_child(GTK_BIN(uploadLine));
+ oldfilename = gtk_entry_get_text(GTK_ENTRY(entry));
+ if ((filename = selectFile(oldfilename))) {
gtk_entry_set_text(GTK_ENTRY(entry),
filename);
model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine)));
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
