Revision: 1575
http://geeqie.svn.sourceforge.net/geeqie/?rev=1575&view=rev
Author: nadvornik
Date: 2009-03-27 08:05:14 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
added simple desktop file editor
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/editors.c
trunk/src/editors.h
trunk/src/layout_util.c
trunk/src/main.h
Added Paths:
-----------
trunk/src/desktop_file.c
trunk/src/desktop_file.h
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-03-26 21:49:20 UTC (rev 1574)
+++ trunk/src/Makefile.am 2009-03-27 08:05:14 UTC (rev 1575)
@@ -112,6 +112,8 @@
compat.h \
debug.c \
debug.h \
+ desktop_file.c \
+ desktop_file.h \
dnd.c \
dnd.h \
dupe.c \
Added: trunk/src/desktop_file.c
===================================================================
--- trunk/src/desktop_file.c (rev 0)
+++ trunk/src/desktop_file.c 2009-03-27 08:05:14 UTC (rev 1575)
@@ -0,0 +1,353 @@
+/*
+ * Geeqie
+ * (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2009 The Geeqie Team
+ *
+ * Author: Vladimir Nadvornik
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+#include "main.h"
+#include "desktop_file.h"
+
+#include "editors.h"
+#include "filedata.h"
+#include "misc.h"
+#include "ui_misc.h"
+#include "ui_fileops.h"
+#include "ui_utildlg.h"
+#include "pixbuf_util.h"
+#include "window.h"
+#include "utilops.h"
+#include "layout_util.h"
+
+#define CONFIG_WINDOW_DEF_WIDTH 700
+#define CONFIG_WINDOW_DEF_HEIGHT 400
+
+
+
+typedef struct _EditorWindow EditorWindow;
+struct _EditorWindow
+{
+ GtkWidget *window;
+ GtkWidget *entry;
+ GtkTextBuffer *buffer;
+};
+
+
+static GtkWidget *editor_list_window = NULL;
+GtkWidget *editor_list_view = NULL;
+
+
+static gboolean editor_window_save(EditorWindow *ew)
+{
+ gchar *path;
+ gchar *text;
+ GtkTextIter start, end;
+ GError *error = NULL;
+ gboolean ret = TRUE;
+ const gchar *name = gtk_entry_get_text(GTK_ENTRY(ew->entry));
+
+ if (!name || !name[0])
+ {
+ file_util_warning_dialog(_("Can't save"), _("Please specify
file name."), GTK_STOCK_DIALOG_ERROR, NULL);
+ return FALSE;
+ }
+
+ 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);
+
+ if (!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);
+ ret = FALSE;
+ }
+
+ g_free(path);
+ g_free(text);
+ layout_editors_reload_all();
+ return ret;
+}
+
+static void editor_window_close_cb(GtkWidget *widget, gpointer data)
+{
+ EditorWindow *ew = data;
+
+ gtk_widget_destroy(ew->window);
+ g_free(ew);
+}
+
+static gint editor_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer
data)
+{
+ editor_window_close_cb(w, data);
+ return TRUE;
+}
+
+static void editor_window_apply_cb(GtkWidget *widget, gpointer data)
+{
+ EditorWindow *ew = data;
+ editor_window_save(ew);
+}
+static void editor_window_ok_cb(GtkWidget *widget, gpointer data)
+{
+ EditorWindow *ew = data;
+ if (!editor_window_save(ew)) return;
+ editor_window_close_cb(widget, ew);
+}
+
+static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
+{
+ EditorWindow *ew;
+ GtkWidget *win_vbox;
+ GtkWidget *hbox;
+ GtkWidget *button;
+ GtkWidget *ct_button;
+ GtkWidget *button_hbox;
+ GtkWidget *scrolled;
+ GtkWidget *text_view;
+ gchar *text;
+ gsize size;
+
+ ew = g_new0(EditorWindow, 1);
+
+
+ ew->window = window_new(GTK_WINDOW_TOPLEVEL, "Desktop",
PIXBUF_INLINE_ICON_CONFIG, NULL, _("Desktop file"));
+ gtk_window_set_type_hint(GTK_WINDOW(ew->window),
GDK_WINDOW_TYPE_HINT_DIALOG);
+
+ g_signal_connect(G_OBJECT(ew->window), "delete_event",
+ G_CALLBACK(editor_window_delete_cb), ew);
+
+ gtk_window_set_default_size(GTK_WINDOW(ew->window),
CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT);
+ gtk_window_set_resizable(GTK_WINDOW(ew->window), TRUE);
+ gtk_container_set_border_width(GTK_CONTAINER(ew->window),
PREF_PAD_BORDER);
+
+ win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ gtk_container_add(GTK_CONTAINER(ew->window), win_vbox);
+ gtk_widget_show(win_vbox);
+
+ hbox = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+ gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show(hbox);
+
+ ew->entry = gtk_entry_new();
+ gtk_box_pack_start(GTK_BOX(hbox), ew->entry, TRUE, TRUE, 0);
+ if (desktop_name)
+ {
+ gtk_entry_set_text(GTK_ENTRY(ew->entry), desktop_name);
+ }
+ gtk_widget_show(ew->entry);
+
+
+ button_hbox = gtk_hbutton_box_new();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(button_hbox),
GTK_BUTTONBOX_END);
+ gtk_box_set_spacing(GTK_BOX(button_hbox), PREF_PAD_BUTTON_GAP);
+ gtk_box_pack_end(GTK_BOX(hbox), button_hbox, FALSE, FALSE, 0);
+ gtk_widget_show(button_hbox);
+
+ button = pref_button_new(NULL, GTK_STOCK_OK, NULL, FALSE,
+ G_CALLBACK(editor_window_ok_cb), ew);
+ gtk_container_add(GTK_CONTAINER(button_hbox), button);
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_grab_default(button);
+ gtk_widget_show(button);
+
+ ct_button = button;
+
+ button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE,
+ G_CALLBACK(editor_window_apply_cb), ew);
+ gtk_container_add(GTK_CONTAINER(button_hbox), button);
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_show(button);
+
+ button = pref_button_new(NULL, GTK_STOCK_CANCEL, 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_show(button);
+
+ if (!generic_dialog_get_alternative_button_order(ew->window))
+ {
+ gtk_box_reorder_child(GTK_BOX(button_hbox), ct_button, -1);
+ }
+
+
+ scrolled = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+ GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5);
+ gtk_widget_show(scrolled);
+
+ text_view = gtk_text_view_new();
+ gtk_container_add(GTK_CONTAINER(scrolled), text_view);
+ gtk_widget_show(text_view);
+
+ ew->buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view));
+ if (g_file_get_contents(src_path, &text, &size, NULL))
+ {
+ gtk_text_buffer_set_text(ew->buffer, text, size);
+ }
+
+
+ gtk_widget_show(ew->window);
+}
+
+
+static void editor_list_window_close_cb(GtkWidget *widget, gpointer data)
+{
+ gtk_widget_destroy(editor_list_window);
+ editor_list_window = NULL;
+ editor_list_view = NULL;
+}
+
+static gboolean editor_list_window_delete(GtkWidget *widget, GdkEventAny
*event, gpointer data)
+{
+ editor_list_window_close_cb(NULL, NULL);
+ return TRUE;
+}
+
+static void editor_list_window_edit_cb(GtkWidget *widget, gpointer data)
+{
+ GtkTreeSelection *sel =
gtk_tree_view_get_selection(GTK_TREE_VIEW(editor_list_view));
+ GtkTreeIter iter;
+
+ if (gtk_tree_selection_get_selected(sel, NULL, &iter))
+ {
+ GtkTreeModel *store =
gtk_tree_view_get_model(GTK_TREE_VIEW(editor_list_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);
+ g_free(key);
+ g_free(path);
+ }
+}
+
+static void editor_list_window_new_cb(GtkWidget *widget, gpointer data)
+{
+ editor_window_new(DESKTOP_FILE_TEMPLATE, _("new.desktop"));
+}
+
+static void editor_list_window_create(void)
+{
+ GtkWidget *win_vbox;
+ GtkWidget *hbox;
+ GtkWidget *button;
+ GtkWidget *scrolled;
+ GtkCellRenderer *renderer;
+ GtkTreeSelection *selection;
+ GtkTreeViewColumn *column;
+
+ 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",
+ 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);
+
+ win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ gtk_container_add(GTK_CONTAINER(editor_list_window), win_vbox);
+ gtk_widget_show(win_vbox);
+
+ hbox = gtk_hbutton_box_new();
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+ gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
+ gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show(hbox);
+
+
+ button = pref_button_new(NULL, GTK_STOCK_NEW, NULL, FALSE,
+ G_CALLBACK(editor_list_window_new_cb), NULL);
+ gtk_container_add(GTK_CONTAINER(hbox), button);
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_show(button);
+
+ button = pref_button_new(NULL, GTK_STOCK_EDIT, NULL, FALSE,
+ G_CALLBACK(editor_list_window_edit_cb), NULL);
+ gtk_container_add(GTK_CONTAINER(hbox), button);
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_show(button);
+
+ button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE,
+ G_CALLBACK(editor_list_window_close_cb), NULL);
+ gtk_container_add(GTK_CONTAINER(hbox), button);
+ GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+ gtk_widget_show(button);
+
+ scrolled = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
+ GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ 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));
+ gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection),
GTK_SELECTION_SINGLE);
+
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(editor_list_view), FALSE);
+
+ column = gtk_tree_view_column_new();
+ 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_KEY);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column);
+
+ 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();
+ 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);
+
+ column = gtk_tree_view_column_new();
+ 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_NAME);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column);
+
+ column = gtk_tree_view_column_new();
+ gtk_tree_view_column_set_title(column, _("Path"));
+ 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_PATH);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(editor_list_view), column);
+
+ gtk_container_add(GTK_CONTAINER(scrolled), editor_list_view);
+ gtk_widget_show(editor_list_view);
+
+ gtk_widget_show(editor_list_window);
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ * config window show (public)
+ *-----------------------------------------------------------------------------
+ */
+
+void show_editor_list_window(void)
+{
+ if (editor_list_window)
+ {
+ gtk_window_present(GTK_WINDOW(editor_list_window));
+ return;
+ }
+
+ editor_list_window_create();
+}
Added: trunk/src/desktop_file.h
===================================================================
--- trunk/src/desktop_file.h (rev 0)
+++ trunk/src/desktop_file.h 2009-03-27 08:05:14 UTC (rev 1575)
@@ -0,0 +1,20 @@
+/*
+ * Geeqie
+ * (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2009 The Geeqie Team
+ *
+ * Author: Vladimir Nadvornik
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+
+#ifndef DESKTOP_FILE_H
+#define DESKTOP_FILE_H
+
+void show_editor_list_window(void);
+
+#endif
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
Modified: trunk/src/editors.c
===================================================================
--- trunk/src/editors.c 2009-03-26 21:49:20 UTC (rev 1574)
+++ trunk/src/editors.c 2009-03-27 08:05:14 UTC (rev 1575)
@@ -67,7 +67,9 @@
*/
GHashTable *editors = NULL;
+GtkListStore *desktop_file_list;
+
#ifdef G_KEY_FILE_DESKTOP_GROUP
#define DESKTOP_GROUP G_KEY_FILE_DESKTOP_GROUP
#else
@@ -183,6 +185,7 @@
const gchar *key = filename_from_path(path);
gchar **categories, **only_show_in, **not_show_in;
gchar *try_exec;
+ GtkTreeIter iter;
if (g_hash_table_lookup(editors, key)) return FALSE; /* the file found
earlier wins */
@@ -229,12 +232,12 @@
found = TRUE;
break;
}
- if (!found) editor->hidden = TRUE;
+ if (!found) editor->ignored = TRUE;
g_strfreev(categories);
}
else
{
- editor->hidden = TRUE;
+ editor->ignored = TRUE;
}
only_show_in = g_key_file_get_string_list(key_file, DESKTOP_GROUP,
"OnlyShowIn", NULL, NULL);
@@ -248,7 +251,7 @@
found = TRUE;
break;
}
- if (!found) editor->hidden = TRUE;
+ if (!found) editor->ignored = TRUE;
g_strfreev(only_show_in);
}
@@ -263,23 +266,23 @@
found = TRUE;
break;
}
- if (found) editor->hidden = TRUE;
+ if (found) editor->ignored = TRUE;
g_strfreev(not_show_in);
}
try_exec = g_key_file_get_string(key_file, DESKTOP_GROUP, "TryExec",
NULL);
- if (try_exec && !editor->hidden)
+ if (try_exec && !editor->hidden && !editor->ignored)
{
gchar *try_exec_res = g_find_program_in_path(try_exec);
if (!try_exec_res) editor->hidden = TRUE;
g_free(try_exec_res);
g_free(try_exec);
}
-
- if (editor->hidden)
+
+ if (editor->ignored)
{
- /* hidden editors will be deleted, no need to parse the rest */
+ /* ignored editors will be deleted, no need to parse the rest */
g_key_file_free(key_file);
return TRUE;
}
@@ -337,14 +340,24 @@
editor->flags |= editor_command_parse(editor, NULL, NULL);
g_key_file_free(key_file);
+
+ if (editor->ignored) return TRUE;
+ gtk_list_store_append(desktop_file_list, &iter);
+ gtk_list_store_set(desktop_file_list, &iter,
+ DESKTOP_FILE_COLUMN_KEY, key,
+ DESKTOP_FILE_COLUMN_NAME, editor->name,
+ DESKTOP_FILE_COLUMN_HIDDEN, editor->hidden,
+ DESKTOP_FILE_COLUMN_WRITABLE, access_file(path,
W_OK),
+ DESKTOP_FILE_COLUMN_PATH, path, -1);
+
return TRUE;
}
static gboolean editor_remove_desktop_file_cb(gpointer key, gpointer value,
gpointer user_data)
{
EditorDescription *editor = value;
- return editor->hidden;
+ return editor->hidden || editor->ignored;
}
static void editor_read_desktop_dir(const gchar *path)
@@ -385,6 +398,14 @@
gchar **split_dirs;
gint i;
+ if (desktop_file_list)
+ {
+ gtk_list_store_clear(desktop_file_list);
+ }
+ else
+ {
+ desktop_file_list =
gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING);
+ }
if (editors)
{
g_hash_table_destroy(editors);
Modified: trunk/src/editors.h
===================================================================
--- trunk/src/editors.h 2009-03-26 21:49:20 UTC (rev 1574)
+++ trunk/src/editors.h 2009-03-27 08:05:14 UTC (rev 1575)
@@ -47,7 +47,8 @@
gchar *file;
gchar *comment; /* .desktop Comment key, used to show a tooltip
*/
EditorFlags flags;
- gboolean hidden;
+ gboolean hidden; /* explicitly hidden, shown in configuration
dialog */
+ gboolean ignored; /* not interesting, do not show at all */
};
#define EDITOR_ERRORS(flags) ((flags) & EDITOR_ERROR_MASK)
@@ -62,6 +63,18 @@
must be called later */
};
+enum {
+ DESKTOP_FILE_COLUMN_KEY,
+ DESKTOP_FILE_COLUMN_NAME,
+ DESKTOP_FILE_COLUMN_HIDDEN,
+ DESKTOP_FILE_COLUMN_WRITABLE,
+ DESKTOP_FILE_COLUMN_PATH,
+ DESKTOP_FILE_COLUMN_COUNT
+};
+
+extern GtkListStore *desktop_file_list;
+
+
extern GHashTable *editors;
void editor_load_descriptions(void);
Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c 2009-03-26 21:49:20 UTC (rev 1574)
+++ trunk/src/layout_util.c 2009-03-27 08:05:14 UTC (rev 1575)
@@ -44,6 +44,7 @@
#include "window.h"
#include "metadata.h"
#include "rcfile.h"
+#include "desktop_file.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
@@ -369,6 +370,14 @@
show_config_window();
}
+static void layout_menu_editors_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_exit_fullscreen(lw);
+ show_editor_list_window();
+}
+
static void layout_menu_layout_config_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
@@ -1221,6 +1230,7 @@
{ "SelectInvert", NULL, N_("_Invert Selection"),
"<control><shift>I", NULL, CB(layout_menu_invert_selection_cb) },
{ "Preferences",GTK_STOCK_PREFERENCES,N_("P_references..."), "<control>O",
NULL, CB(layout_menu_config_cb) },
+ { "Editors",GTK_STOCK_PREFERENCES,N_("Configure _Editors..."), NULL,
NULL, CB(layout_menu_editors_cb) },
{ "LayoutConfig",GTK_STOCK_PREFERENCES,N_("_Configure this window..."),
NULL, NULL, CB(layout_menu_layout_config_cb) },
{ "Maintenance", NULL, N_("_Thumbnail maintenance..."),NULL,
NULL, CB(layout_menu_remove_thumb_cb) },
{ "Wallpaper", NULL, N_("Set as _wallpaper"),NULL,
NULL, CB(layout_menu_wallpaper_cb) },
@@ -1379,6 +1389,7 @@
" <placeholder name='PropertiesSection'/>"
" <separator/>"
" <menuitem action='Preferences'/>"
+" <menuitem action='Editors'/>"
" <menuitem action='LayoutConfig'/>"
" <menuitem action='Maintenance'/>"
" <placeholder name='PreferencesSection'/>"
Modified: trunk/src/main.h
===================================================================
--- trunk/src/main.h 2009-03-26 21:49:20 UTC (rev 1574)
+++ trunk/src/main.h 2009-03-27 08:05:14 UTC (rev 1575)
@@ -121,6 +121,7 @@
#include "debug.h"
#include "options.h"
+#define DESKTOP_FILE_TEMPLATE GQ_APP_DIR "/template.desktop"
/*
*----------------------------------------------------------------------------
* main.c
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
