Add an option named layout.home_path which modifies the behavior of the Home button.

By default, pressing this button goes to the user's home directory.
When this option is set to a path, this path is used instead.
One can change the option value through Preferences > Advanced > Navigation
or directly in .geeqierc.
Feature proposed by Colin Clark.

diff --git a/src/layout_util.c b/src/layout_util.c
index 53d7efd..30924e9 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1458,10 +1458,16 @@ static void layout_button_thumb_cb(GtkWidget *widget, gpointer data)
 
 static void layout_button_home_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = data;
-       const gchar *path = homedir();
+       const gchar *path;
+       
+       if (options->layout.home_path && *options->layout.home_path)
+               path = options->layout.home_path;
+       else
+               path = homedir();
+
        if (path)
                {
+               LayoutWindow *lw = data;
                FileData *dir_fd = file_data_new_simple(path);
                layout_set_fd(lw, dir_fd);
                file_data_unref(dir_fd);

diff --git a/src/options.c b/src/options.c
index 4b60e58..bda41aa 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -97,6 +97,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->layout.float_window.w = 260;
        options->layout.float_window.x = 0;
        options->layout.float_window.y = 0;
+       options->layout.home_path = NULL;
        options->layout.main_window.h = 400;
        options->layout.main_window.hdivider_pos = -1;
        options->layout.main_window.maximized = FALSE;

diff --git a/src/options.h b/src/options.h
index 0eda377..3aa3f5d 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -198,7 +198,8 @@ struct _ConfOptions
                gboolean tools_restore_state;
 
                gboolean toolbar_hidden;
-
+               
+               gchar *home_path;
        } layout;
 
        /* panels */

diff --git a/src/preferences.c b/src/preferences.c
index fb4a633..8b072b9 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -85,6 +85,7 @@ static gint debug_c;
 
 static GtkWidget *configwindow = NULL;
 static GtkWidget *startup_path_entry;
+static GtkWidget *home_path_entry;
 static GtkListStore *filter_store = NULL;
 static GtkWidget *editor_name_entry[GQ_EDITOR_SLOTS];
 static GtkWidget *editor_command_entry[GQ_EDITOR_SLOTS];
@@ -114,6 +115,11 @@ static void startup_path_set_current(GtkWidget *widget, gpointer data)
        gtk_entry_set_text(GTK_ENTRY(startup_path_entry), layout_get_path(NULL));
 }
 
+static void home_path_set_current(GtkWidget *widget, gpointer data)
+{
+       gtk_entry_set_text(GTK_ENTRY(home_path_entry), layout_get_path(NULL));
+}
+
 static void zoom_mode_original_cb(GtkWidget *widget, gpointer data)
 {
        if (GTK_TOGGLE_BUTTON (widget)->active)
@@ -218,6 +224,11 @@ static void config_window_apply(void)
        buf = gtk_entry_get_text(GTK_ENTRY(startup_path_entry));
        if (buf && strlen(buf) > 0) options->startup.path = remove_trailing_slash(buf);
 
+       g_free(options->layout.home_path);
+       options->layout.home_path = NULL;
+       buf = gtk_entry_get_text(GTK_ENTRY(home_path_entry));
+       if (buf && strlen(buf) > 0) options->layout.home_path = remove_trailing_slash(buf);
+
        options->file_ops.confirm_delete = c_options->file_ops.confirm_delete;
        options->file_ops.enable_delete_key = c_options->file_ops.enable_delete_key;
        options->file_ops.safe_delete_enable = c_options->file_ops.safe_delete_enable;
@@ -1494,6 +1505,18 @@ static void config_tab_advanced(GtkWidget *notebook)
        pref_checkbox_new_int(group, _("Mouse wheel scrolls image"),
                              options->mousewheel_scrolls, &c_options->mousewheel_scrolls);
 
+       pref_label_new(group, _("Home button path (empty to use your home directory)"));
+       hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+
+       tabcomp = tab_completion_new(&home_path_entry, options->layout.home_path, NULL, NULL);
+       tab_completion_add_select_button(home_path_entry, NULL, TRUE);
+       gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
+       gtk_widget_show(tabcomp);
+
+       button = pref_button_new(hbox, NULL, _("Use current"), FALSE,
+                                G_CALLBACK(home_path_set_current), NULL);
+
+
        group = pref_group_new(vbox, FALSE, _("Miscellaneous"), GTK_ORIENTATION_VERTICAL);
 
        pref_checkbox_new_int(group, _("Store metadata and cache files in source image's directory"),

diff --git a/src/rcfile.c b/src/rcfile.c
index 18257e7..3e30d87 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -389,6 +389,7 @@ static gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
        WRITE_BOOL(layout.show_marks);
        WRITE_BOOL(layout.show_thumbnails);
        WRITE_BOOL(layout.show_directory_date);
+       WRITE_CHAR(layout.home_path);
        WRITE_SEPARATOR();
 
        WRITE_BOOL(layout.save_window_positions);
@@ -773,6 +774,7 @@ static gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
                READ_BOOL(layout.show_marks);
                READ_BOOL(layout.show_thumbnails);
                READ_BOOL(layout.show_directory_date);
+               READ_CHAR(layout.home_path);
 
                /* window positions */