AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

if action is SELECT_FOLDER, then return the currentd folder if none is

Browse Source 
Sun Mar  7 03:03:57 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtkfilechooserdefault.c
        (gtk_file_chooser_default_get_paths): if action is
        SELECT_FOLDER, then return the currentd folder if none is
        selected.
        (gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
        no directory is selected in SELECT_FOLDER mode.
This commit is contained in:
Jonathan Blandford 2004-03-07 08:15:09 +00:00 committed by Jonathan Blandford
parent 3157eb326a
commit eb258fe24c
6 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sun Mar 7 03:03:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): if action is
SELECT_FOLDER, then return the currentd folder if none is
selected.
(gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
no directory is selected in SELECT_FOLDER mode.
Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org> Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Sun Mar 7 03:03:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): if action is
SELECT_FOLDER, then return the currentd folder if none is
selected.
(gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
no directory is selected in SELECT_FOLDER mode.
Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org> Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Sun Mar 7 03:03:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): if action is
SELECT_FOLDER, then return the currentd folder if none is
selected.
(gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
no directory is selected in SELECT_FOLDER mode.
Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org> Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Sun Mar 7 03:03:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): if action is
SELECT_FOLDER, then return the currentd folder if none is
selected.
(gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
no directory is selected in SELECT_FOLDER mode.
Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org> Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Sun Mar 7 03:03:57 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_paths): if action is
SELECT_FOLDER, then return the currentd folder if none is
selected.
(gtk_file_chooser_default_should_respond): Allow 'Ok' to be hit if
no directory is selected in SELECT_FOLDER mode.
Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org> Sat Mar 6 23:31:18 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault):

23
gtk/gtkfilechooserdefault.c
View File

@ -3059,6 +3059,14 @@ gtk_file_chooser_default_get_paths (GtkFileChooser *chooser)
if (info.path_from_entry) if (info.path_from_entry)
info.result = g_slist_prepend (info.result, info.path_from_entry); info.result = g_slist_prepend (info.result, info.path_from_entry);
/* If there's no folder selected, and we're in SELECT_FOLDER mode, then we
* fall back to the current directory */
if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
info.result == NULL)
{
info.result = g_slist_prepend (info.result, gtk_file_path_copy (impl->current_folder));
}
return g_slist_reverse (info.result); return g_slist_reverse (info.result);
} }
@ -3438,12 +3446,15 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
return FALSE; return FALSE;
} }
/* Second, do we have an empty selection? */ /* Second, do we have an empty selection */
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view)); || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
num_selected = gtk_tree_selection_count_selected_rows (selection); {
if (num_selected == 0) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
return FALSE; num_selected = gtk_tree_selection_count_selected_rows (selection);
if (num_selected == 0)
return FALSE;
}
/* Third, should we return file names or folder names? */ /* Third, should we return file names or folder names? */