-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #431: Bookmarks (shortcuts) to folders
Additional section in the folders pane to permit shortcuts (bookmarks) to commonly used folders or images.
- Loading branch information
Colin Clark
committed
Feb 24, 2017
1 parent
dcc7108
commit e45c365
Showing
6 changed files
with
285 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| /* | ||
| * Copyright (C) 2004 John Ellis | ||
| * Copyright (C) 2008 - 2016 The Geeqie Team | ||
| * | ||
| * Author: John Ellis | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with this program; if not, write to the Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| #include "main.h" | ||
| #include "shortcuts.h" | ||
|
|
||
| #include "layout.h" | ||
| #include "utilops.h" | ||
| #include "ui_bookmark.h" | ||
| #include "ui_fileops.h" | ||
| #include "ui_misc.h" | ||
|
|
||
| typedef struct _ShortcutsData ShortcutsData; | ||
| struct _ShortcutsData | ||
| { | ||
| GtkWidget *vbox; | ||
| GtkWidget *bookmarks; | ||
| LayoutWindow *lw; | ||
|
|
||
| FileDialog *dialog; | ||
| GtkWidget *dialog_name_entry; | ||
|
|
||
| GtkWidget *add_button; | ||
| }; | ||
|
|
||
| #define SHORTCUTS "shortcuts" | ||
|
|
||
| static void shortcuts_bookmark_select(const gchar *path, gpointer data) | ||
| { | ||
| ShortcutsData *scd = data; | ||
|
|
||
| layout_set_path(scd->lw, path); | ||
| } | ||
|
|
||
| static void shortcuts_add_close(ShortcutsData *scd) | ||
| { | ||
| if (scd->dialog) file_dialog_close(scd->dialog); | ||
| scd->dialog_name_entry = NULL; | ||
| scd->dialog = NULL; | ||
| } | ||
|
|
||
| static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data) | ||
| { | ||
| ShortcutsData *scd = data; | ||
| const gchar *name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry)); | ||
| gboolean empty_name = (name[0] == '\0'); | ||
|
|
||
| name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry)); | ||
|
|
||
| if (empty_name) | ||
| { | ||
| name = filename_from_path(fd->dest_path); | ||
| } | ||
|
|
||
| bookmark_list_add(scd->bookmarks, name, fd->dest_path); | ||
|
|
||
| shortcuts_add_close(scd); | ||
| } | ||
|
|
||
| static void shortcuts_add_cancel_cb(FileDialog *fd, gpointer data) | ||
| { | ||
| ShortcutsData *scd = data; | ||
|
|
||
| shortcuts_add_close(scd); | ||
| } | ||
|
|
||
| static void shortcuts_add_cb(GtkWidget *button, gpointer data) | ||
| { | ||
| ShortcutsData *scd = data; | ||
| GtkWidget *hbox; | ||
| const gchar *title; | ||
|
|
||
| if (scd->dialog) | ||
| { | ||
| gtk_window_present(GTK_WINDOW(GENERIC_DIALOG(scd->dialog)->dialog)); | ||
| return; | ||
| } | ||
|
|
||
| title = _("Add Shortcut"); | ||
| scd->dialog = file_util_file_dlg(title, | ||
| "add_shortcuts", button, | ||
| shortcuts_add_cancel_cb, scd); | ||
| file_dialog_add_button(scd->dialog, GTK_STOCK_OK, NULL, shortcuts_add_ok_cb, TRUE); | ||
|
|
||
| generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), NULL, title, NULL); | ||
|
|
||
| file_dialog_add_path_widgets(scd->dialog, NULL, NULL, "add_shortcuts", NULL, NULL); | ||
|
|
||
| hbox = pref_box_new(GENERIC_DIALOG(scd->dialog)->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); | ||
|
|
||
| pref_label_new(hbox, _("Name:")); | ||
|
|
||
| scd->dialog_name_entry = gtk_entry_new(); | ||
| gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0); | ||
| generic_dialog_attach_default(GENERIC_DIALOG(scd->dialog), scd->dialog_name_entry); | ||
| gtk_widget_show(scd->dialog_name_entry); | ||
|
|
||
| gtk_widget_show(GENERIC_DIALOG(scd->dialog)->dialog); | ||
| } | ||
|
|
||
| static void shortcuts_destroy(GtkWidget *widget, gpointer data) | ||
| { | ||
| ShortcutsData *scd = data; | ||
|
|
||
| shortcuts_add_close(scd); | ||
|
|
||
| g_free(scd); | ||
| } | ||
|
|
||
| static GtkWidget *shortcuts_new(LayoutWindow *lw) | ||
| { | ||
| ShortcutsData *scd; | ||
| GtkWidget *tbar; | ||
|
|
||
| if (!lw) return NULL; | ||
|
|
||
| scd = g_new0(ShortcutsData, 1); | ||
|
|
||
| scd->lw = lw; | ||
|
|
||
| scd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP); | ||
| g_object_set_data(G_OBJECT(scd->vbox), "shortcuts_data", scd); | ||
| g_signal_connect(G_OBJECT(scd->vbox), "destroy", | ||
| G_CALLBACK(shortcuts_destroy), scd); | ||
|
|
||
| scd->bookmarks = bookmark_list_new(SHORTCUTS, shortcuts_bookmark_select, scd); | ||
| gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0); | ||
| gtk_widget_show(scd->bookmarks); | ||
|
|
||
| tbar = pref_toolbar_new(scd->vbox, GTK_TOOLBAR_ICONS); | ||
|
|
||
| scd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, NULL, FALSE, | ||
| _("Add Shortcut"), | ||
| G_CALLBACK(shortcuts_add_cb), scd); | ||
|
|
||
| return scd->vbox; | ||
| } | ||
|
|
||
| GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values) | ||
| { | ||
| GtkWidget *shortcuts_bar; | ||
|
|
||
| shortcuts_bar = shortcuts_new(lw); | ||
| gtk_widget_show(shortcuts_bar); | ||
|
|
||
| return shortcuts_bar; | ||
| } | ||
|
|
||
| GtkWidget *shortcuts_new_default(LayoutWindow *lw) | ||
| { | ||
| return shortcuts_new_from_config(lw, NULL, NULL); | ||
| } | ||
|
|
||
| /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright (C) 2004 John Ellis | ||
| * Copyright (C) 2008 - 2016 The Geeqie Team | ||
| * | ||
| * Author: John Ellis | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along | ||
| * with this program; if not, write to the Free Software Foundation, Inc., | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| #ifndef SHORTCUTS_H | ||
| #define SHORTCUTS_H | ||
|
|
||
| GtkWidget *shortcuts_new_default(LayoutWindow *lw); | ||
|
|
||
| #endif | ||
| /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters