X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdesktop_file.c;h=e4f1a84d502ddef329c399a6b420157467a3af18;hb=e436ea53511e1dadab981af18b237fee83fde39b;hp=e622552e0d8f904a708557f1588e77618940a437;hpb=9ec7080489b3089207f5146f8d4a9f18b0275add;p=geeqie.git diff --git a/src/desktop_file.c b/src/desktop_file.c index e622552e..e4f1a84d 100644 --- a/src/desktop_file.c +++ b/src/desktop_file.c @@ -1,7 +1,7 @@ /* * Geeqie * (C) 2004 John Ellis - * Copyright (C) 2008 - 2009 The Geeqie Team + * Copyright (C) 2008 - 2012 The Geeqie Team * * Author: Vladimir Nadvornik * @@ -40,13 +40,28 @@ struct _EditorWindow gboolean modified; }; +typedef struct _EditorListWindow EditorListWindow; +struct _EditorListWindow +{ + GtkWidget *window; + GtkWidget *view; + GenericDialog *gd; /* any open confirm dialogs ? */ + GtkWidget *delete_button; + GtkWidget *edit_button; +}; -static GtkWidget *editor_list_window = NULL; -GtkWidget *editor_list_view = NULL; +typedef struct _EditorWindowDel_Data EditorWindowDel_Data; +struct _EditorWindowDel_Data +{ + EditorListWindow *ewl; + gchar *path; +}; +static EditorListWindow *editor_list_window = NULL; static gboolean editor_window_save(EditorWindow *ew) { + gchar *dir; gchar *path; gchar *text; GtkTextIter start, end; @@ -54,7 +69,7 @@ static gboolean editor_window_save(EditorWindow *ew) gboolean ret = TRUE; const gchar *name = gtk_entry_get_text(GTK_ENTRY(ew->entry)); - if (!name || !name[0]) + if (!name || !name[0]) { file_util_warning_dialog(_("Can't save"), _("Please specify file name."), GTK_STOCK_DIALOG_ERROR, NULL); return FALSE; @@ -63,9 +78,16 @@ static gboolean editor_window_save(EditorWindow *ew) gtk_text_buffer_get_bounds(ew->buffer, &start, &end); text = gtk_text_buffer_get_text(ew->buffer, &start, &end, FALSE); - path = g_build_filename(get_rc_dir(), "applications", name, NULL); + dir = g_build_filename(get_rc_dir(), "applications", NULL); + path = g_build_filename(dir, name, NULL); - if (!g_file_set_contents(path, text, -1, &error)) + if (!recursive_mkdir_if_not_exists(dir, 0755)) + { + file_util_warning_dialog(_("Can't save"), _("Could not create directory"), GTK_STOCK_DIALOG_ERROR, NULL); + ret = FALSE; + } + + if (ret && !g_file_set_contents(path, text, -1, &error)) { file_util_warning_dialog(_("Can't save"), error->message, GTK_STOCK_DIALOG_ERROR, NULL); g_error_free(error); @@ -73,8 +95,11 @@ static gboolean editor_window_save(EditorWindow *ew) } g_free(path); + g_free(dir); g_free(text); - layout_editors_reload_all(); + layout_editors_reload_start(); + /* idle function is not needed, everything should be cached */ + layout_editors_reload_finish(); return ret; } @@ -101,6 +126,10 @@ static void editor_window_save_cb(GtkWidget *widget, gpointer data) { editor_window_save(ew); } + + gtk_widget_set_sensitive(ew->save_button, FALSE); + gtk_text_buffer_set_modified(ew->buffer, FALSE); + ew->modified = FALSE; } static void editor_window_text_modified_cb(GtkWidget *widget, gpointer data) @@ -188,15 +217,15 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name) ew->save_button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE, G_CALLBACK(editor_window_save_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), ew->save_button); - GTK_WIDGET_SET_FLAGS(ew->save_button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(ew->save_button, TRUE); gtk_widget_set_sensitive(ew->save_button, FALSE); gtk_widget_show(ew->save_button); ct_button = ew->save_button; - button = pref_button_new(NULL, GTK_STOCK_CANCEL, NULL, FALSE, + button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(editor_window_close_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); if (!generic_dialog_get_alternative_button_order(ew->window)) @@ -231,9 +260,9 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name) static void editor_list_window_close_cb(GtkWidget *widget, gpointer data) { - gtk_widget_destroy(editor_list_window); + gtk_widget_destroy(editor_list_window->window); + g_free(editor_list_window); editor_list_window = NULL; - editor_list_view = NULL; } static gboolean editor_list_window_delete(GtkWidget *widget, GdkEventAny *event, gpointer data) @@ -242,21 +271,99 @@ static gboolean editor_list_window_delete(GtkWidget *widget, GdkEventAny *event, return TRUE; } +static void editor_list_window_delete_dlg_cancel(GenericDialog *gd, gpointer data); + +static void editor_list_window_delete_dlg_cancel(GenericDialog *gd, gpointer data) +{ + EditorWindowDel_Data *ewdl = data; + + ewdl->ewl->gd = NULL; + g_free(ewdl->path); + g_free(ewdl); +} + +static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data) +{ + EditorWindowDel_Data *ewdl = data; + + if (!unlink_file(ewdl->path)) + { + gchar *text = g_strdup_printf(_("Unable to delete file:\n%s"), ewdl->path); + warning_dialog(_("File deletion failed"), text, GTK_STOCK_DIALOG_WARNING, NULL); + g_free(text); + } + else + { + /* refresh list */ + layout_editors_reload_start(); + /* idle function is not needed, everything should be cached */ + layout_editors_reload_finish(); + } + + editor_list_window_delete_dlg_cancel(gd, data); +} + +static void editor_list_window_delete_cb(GtkWidget *widget, gpointer data) +{ + EditorListWindow *ewl = data; + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + { + GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); + gchar *path; + gchar *key; + gchar *text; + EditorWindowDel_Data *ewdl; + + gtk_tree_model_get(store, &iter, + DESKTOP_FILE_COLUMN_PATH, &path, + DESKTOP_FILE_COLUMN_KEY, &key, -1); + + + ewdl = g_new(EditorWindowDel_Data, 1); + ewdl->ewl = ewl; + ewdl->path = path; + + if (ewl->gd) + { + GenericDialog *gd = ewl->gd; + editor_list_window_delete_dlg_cancel(ewl->gd, ewl->gd->data); + generic_dialog_close(gd); + } + + ewl->gd = generic_dialog_new(_("Delete file"), "dlg_confirm", + NULL, TRUE, + editor_list_window_delete_dlg_cancel, ewdl); + + generic_dialog_add_button(ewl->gd, GTK_STOCK_DELETE, NULL, editor_list_window_delete_dlg_ok_cb, TRUE); + + text = g_strdup_printf(_("About to delete the file:\n %s"), path); + generic_dialog_add_message(ewl->gd, GTK_STOCK_DIALOG_QUESTION, + _("Delete file"), text); + g_free(text); + + gtk_widget_show(ewl->gd->dialog); + } +} + static void editor_list_window_edit_cb(GtkWidget *widget, gpointer data) { - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(editor_list_view)); + EditorListWindow *ewl = data; + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { - GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(editor_list_view)); + GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); gchar *path; gchar *key; gtk_tree_model_get(store, &iter, DESKTOP_FILE_COLUMN_PATH, &path, DESKTOP_FILE_COLUMN_KEY, &key, -1); - editor_window_new(path, key); + editor_window_new(path, key); g_free(key); g_free(path); } @@ -267,6 +374,27 @@ static void editor_list_window_new_cb(GtkWidget *widget, gpointer data) editor_window_new(DESKTOP_FILE_TEMPLATE, _("new.desktop")); } +static void editor_list_window_selection_changed_cb(GtkWidget *widget, gpointer data) +{ + EditorListWindow *ewl = data; + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + { + GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); + gchar *path; + + gtk_tree_model_get(store, &iter, + DESKTOP_FILE_COLUMN_PATH, &path, + -1); + + gtk_widget_set_sensitive(ewl->delete_button, access_file(path, W_OK)); + gtk_widget_set_sensitive(ewl->edit_button, TRUE); + g_free(path); + } + +} static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data) { @@ -278,6 +406,7 @@ static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkT case DESKTOP_FILE_COLUMN_KEY: case DESKTOP_FILE_COLUMN_NAME: case DESKTOP_FILE_COLUMN_PATH: + case DESKTOP_FILE_COLUMN_HIDDEN: { gchar *s1, *s2; @@ -299,22 +428,6 @@ static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkT } break; - case DESKTOP_FILE_COLUMN_HIDDEN: - { - gint *v1, *v2; - - gtk_tree_model_get(model, a, n, &v1, -1); - gtk_tree_model_get(model, b, n, &v2, -1); - - if (v1 == v2) - ret = 0; - else if (v1 < v2) - ret = 1; - else - ret = -1; - } - break; - default: g_return_val_if_reached(0); } @@ -333,17 +446,20 @@ static void editor_list_window_create(void) GtkTreeViewColumn *column; GtkTreeModel *store; GtkTreeSortable *sortable; + EditorListWindow *ewl; + + editor_list_window = ewl = g_new0(EditorListWindow, 1); - editor_list_window = window_new(GTK_WINDOW_TOPLEVEL, "editors", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Editors")); - gtk_window_set_type_hint(GTK_WINDOW(editor_list_window), GDK_WINDOW_TYPE_HINT_DIALOG); - g_signal_connect(G_OBJECT(editor_list_window), "delete_event", + ewl->window = window_new(GTK_WINDOW_TOPLEVEL, "editors", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Editors")); + gtk_window_set_type_hint(GTK_WINDOW(ewl->window), GDK_WINDOW_TYPE_HINT_DIALOG); + g_signal_connect(G_OBJECT(ewl->window), "delete_event", G_CALLBACK(editor_list_window_delete), NULL); - gtk_window_set_default_size(GTK_WINDOW(editor_list_window), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT); - gtk_window_set_resizable(GTK_WINDOW(editor_list_window), TRUE); - gtk_container_set_border_width(GTK_CONTAINER(editor_list_window), PREF_PAD_BORDER); + gtk_window_set_default_size(GTK_WINDOW(ewl->window), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT); + gtk_window_set_resizable(GTK_WINDOW(ewl->window), TRUE); + gtk_container_set_border_width(GTK_CONTAINER(ewl->window), PREF_PAD_BORDER); win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE); - gtk_container_add(GTK_CONTAINER(editor_list_window), win_vbox); + gtk_container_add(GTK_CONTAINER(ewl->window), win_vbox); gtk_widget_show(win_vbox); hbox = gtk_hbutton_box_new(); @@ -354,21 +470,31 @@ static void editor_list_window_create(void) button = pref_button_new(NULL, GTK_STOCK_NEW, NULL, FALSE, - G_CALLBACK(editor_list_window_new_cb), NULL); + G_CALLBACK(editor_list_window_new_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); button = pref_button_new(NULL, GTK_STOCK_EDIT, NULL, FALSE, - G_CALLBACK(editor_list_window_edit_cb), NULL); + G_CALLBACK(editor_list_window_edit_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); + gtk_widget_set_sensitive(button, FALSE); gtk_widget_show(button); + ewl->edit_button = button; + + button = pref_button_new(NULL, GTK_STOCK_DELETE, NULL, FALSE, + G_CALLBACK(editor_list_window_delete_cb), ewl); + gtk_container_add(GTK_CONTAINER(hbox), button); + gtk_widget_set_can_default(button, TRUE); + gtk_widget_set_sensitive(button, FALSE); + gtk_widget_show(button); + ewl->delete_button = button; button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, - G_CALLBACK(editor_list_window_close_cb), NULL); + G_CALLBACK(editor_list_window_close_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); scrolled = gtk_scrolled_window_new(NULL, NULL); @@ -378,38 +504,40 @@ static void editor_list_window_create(void) gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5); gtk_widget_show(scrolled); - editor_list_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(desktop_file_list)); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(editor_list_view)); + ewl->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(desktop_file_list)); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE); + g_signal_connect(selection, "changed", G_CALLBACK(editor_list_window_selection_changed_cb), ewl); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(editor_list_view), FALSE); + gtk_tree_view_set_enable_search(GTK_TREE_VIEW(ewl->view), FALSE); column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(column, _("Desktop file")); + gtk_tree_view_column_set_title(column, _("Name")); gtk_tree_view_column_set_resizable(column, TRUE); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_KEY); - gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column); - gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_KEY); + gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_NAME); + gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column); + gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_NAME); column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Hidden")); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - renderer = gtk_cell_renderer_toggle_new(); + renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_add_attribute(column, renderer, "active", DESKTOP_FILE_COLUMN_HIDDEN); - gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column); + gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_HIDDEN); + gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column); gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_HIDDEN); + gtk_tree_view_column_set_alignment(column, 0.5); column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title(column, _("Name")); + gtk_tree_view_column_set_title(column, _("Desktop file")); gtk_tree_view_column_set_resizable(column, TRUE); renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_NAME); - gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column); - gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_NAME); + gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_KEY); + gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column); + gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_KEY); column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Path")); @@ -417,11 +545,11 @@ static void editor_list_window_create(void) renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_PATH); - gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column); + gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column); gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_PATH); /* set up sorting */ - store = gtk_tree_view_get_model(GTK_TREE_VIEW(editor_list_view)); + store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); sortable = GTK_TREE_SORTABLE(store); gtk_tree_sortable_set_sort_func(sortable, DESKTOP_FILE_COLUMN_KEY, editor_list_window_sort_cb, GINT_TO_POINTER(DESKTOP_FILE_COLUMN_KEY), NULL); @@ -433,12 +561,12 @@ static void editor_list_window_create(void) GINT_TO_POINTER(DESKTOP_FILE_COLUMN_PATH), NULL); /* set initial sort order */ - gtk_tree_sortable_set_sort_column_id(sortable, DESKTOP_FILE_COLUMN_KEY, GTK_SORT_ASCENDING); + //gtk_tree_sortable_set_sort_column_id(sortable, DESKTOP_FILE_COLUMN_KEY, GTK_SORT_ASCENDING); - gtk_container_add(GTK_CONTAINER(scrolled), editor_list_view); - gtk_widget_show(editor_list_view); + gtk_container_add(GTK_CONTAINER(scrolled), ewl->view); + gtk_widget_show(ewl->view); - gtk_widget_show(editor_list_window); + gtk_widget_show(ewl->window); } /* @@ -457,3 +585,4 @@ void show_editor_list_window(void) editor_list_window_create(); } +/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */