callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a keybinding to toggle the visibility of the location entry. (#383354,

Browse Source 
2007-03-23  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilechooserdefault.c: Add a keybinding to
        toggle the visibility of the location entry.  (#383354,
        John Pye, patch by Carlos Garnacho)



svn path=/trunk/; revision=17555
This commit is contained in:
Matthias Clasen
2007-03-23 05:06:00 +00:00
committed by Matthias Clasen
parent 229999d8a9
commit dabf04423b
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-03-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserdefault.c: Add a keybinding to
toggle the visibility of the location entry. (#383354,
John Pye, patch by Carlos Garnacho)
2007-03-22 Matthias Clasen <mclasen@redhat.com> 2007-03-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksettings.c (merge_color_scheme): Freeze property * gtk/gtksettings.c (merge_color_scheme): Freeze property

49
gtk/gtkfilechooserdefault.c
View File

@ -161,6 +161,7 @@ enum {
HOME_FOLDER, HOME_FOLDER,
DESKTOP_FOLDER, DESKTOP_FOLDER,
QUICK_BOOKMARK, QUICK_BOOKMARK,
LOCATION_TOGGLE_POPUP,
LAST_SIGNAL LAST_SIGNAL
}; };
@ -316,6 +317,7 @@ static void gtk_file_chooser_default_initial_focus (GtkFileCh
static void location_popup_handler (GtkFileChooserDefault *impl, static void location_popup_handler (GtkFileChooserDefault *impl,
const gchar *path); const gchar *path);
static void location_popup_on_paste_handler (GtkFileChooserDefault *impl); static void location_popup_on_paste_handler (GtkFileChooserDefault *impl);
static void location_toggle_popup_handler (GtkFileChooserDefault *impl);
static void up_folder_handler (GtkFileChooserDefault *impl); static void up_folder_handler (GtkFileChooserDefault *impl);
static void down_folder_handler (GtkFileChooserDefault *impl); static void down_folder_handler (GtkFileChooserDefault *impl);
static void home_folder_handler (GtkFileChooserDefault *impl); static void home_folder_handler (GtkFileChooserDefault *impl);
@ -497,6 +499,14 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
NULL, NULL, NULL, NULL,
_gtk_marshal_VOID__VOID, _gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[LOCATION_TOGGLE_POPUP] =
_gtk_binding_signal_new (I_("location-toggle-popup"),
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
G_CALLBACK (location_toggle_popup_handler),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[UP_FOLDER] = signals[UP_FOLDER] =
_gtk_binding_signal_new (I_("up-folder"), _gtk_binding_signal_new (I_("up-folder"),
G_OBJECT_CLASS_TYPE (class), G_OBJECT_CLASS_TYPE (class),
@ -542,8 +552,8 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_l, GDK_CONTROL_MASK, GDK_l, GDK_CONTROL_MASK,
"location-popup", "location-toggle-popup",
1, G_TYPE_STRING, ""); 0);
gtk_binding_entry_add_signal (binding_set, gtk_binding_entry_add_signal (binding_set,
GDK_slash, 0, GDK_slash, 0,
@ -4550,28 +4560,40 @@ location_mode_set (GtkFileChooserDefault *impl,
impl->location_mode = new_mode; impl->location_mode = new_mode;
} }
static void
toggle_location_mode (GtkFileChooserDefault *impl,
gboolean set_button)
{
LocationMode new_mode;
/* toggle value */
new_mode = (impl->location_mode == LOCATION_MODE_PATH_BAR) ?
LOCATION_MODE_FILENAME_ENTRY : LOCATION_MODE_PATH_BAR;
location_mode_set (impl, new_mode, set_button);
}
static void
location_toggle_popup_handler (GtkFileChooserDefault *impl)
{
toggle_location_mode (impl, TRUE);
}
/* Callback used when one of the location mode buttons is toggled */ /* Callback used when one of the location mode buttons is toggled */
static void static void
location_button_toggled_cb (GtkToggleButton *toggle, location_button_toggled_cb (GtkToggleButton *toggle,
GtkFileChooserDefault *impl) GtkFileChooserDefault *impl)
{ {
gboolean is_active; gboolean is_active;
LocationMode new_mode;
is_active = gtk_toggle_button_get_active (toggle); is_active = gtk_toggle_button_get_active (toggle);
if (is_active) if (is_active)
{ g_assert (impl->location_mode == LOCATION_MODE_PATH_BAR);
g_assert (impl->location_mode == LOCATION_MODE_PATH_BAR);
new_mode = LOCATION_MODE_FILENAME_ENTRY;
}
else else
{ g_assert (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY);
g_assert (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY);
new_mode = LOCATION_MODE_PATH_BAR;
}
location_mode_set (impl, new_mode, FALSE); toggle_location_mode (impl, FALSE);
} }
/* Creates a toggle button for the location entry. */ /* Creates a toggle button for the location entry. */
@ -8296,7 +8318,8 @@ list_selection_changed (GtkTreeSelection *selection,
out: out:
update_chooser_entry (impl); if (impl->location_entry)
update_chooser_entry (impl);
check_preview_change (impl); check_preview_change (impl);
bookmarks_check_add_sensitivity (impl); bookmarks_check_add_sensitivity (impl);