/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
*/
static guint tree_key_overrides[] = {
- GDK_Page_Up, GDK_KP_Page_Up,
- GDK_Page_Down, GDK_KP_Page_Down,
- GDK_Home, GDK_KP_Home,
- GDK_End, GDK_KP_End
+ GDK_KEY_Page_Up, GDK_KEY_KP_Page_Up,
+ GDK_KEY_Page_Down, GDK_KEY_KP_Page_Down,
+ GDK_KEY_Home, GDK_KEY_KP_Home,
+ GDK_KEY_End, GDK_KEY_KP_End
};
static gboolean layout_key_match(guint keyval)
gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
LayoutWindow *lw = data;
+ GtkWidget *focused;
gboolean stop_signal = FALSE;
gint x = 0;
gint y = 0;
- if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
+ if (lw->path_entry && gtk_widget_has_focus(lw->path_entry))
{
- if (event->keyval == GDK_Escape && lw->dir_fd)
+ if (event->keyval == GDK_KEY_Escape && lw->dir_fd)
{
gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
}
return TRUE;
}
}
- if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) &&
+ if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && gtk_widget_has_focus(lw->vd->view) &&
!layout_key_match(event->keyval) &&
gtk_widget_event(lw->vd->view, (GdkEvent *)event))
{
return TRUE;
}
-/*
- if (event->type == GDK_KEY_PRESS && lw->full_screen &&
- gtk_accel_groups_activate(G_OBJECT(lw->window), event->keyval, event->state))
- return TRUE;
-*/
-
+ focused = gtk_container_get_focus_child(GTK_CONTAINER(lw->image->widget));
if (lw->image &&
- (GTK_WIDGET_HAS_FOCUS(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) )
+ ((focused && gtk_widget_has_focus(focused)) || (lw->tools && widget == lw->window) || lw->full_screen) )
{
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Left: case GDK_KP_Left:
+ case GDK_KEY_Left: case GDK_KEY_KP_Left:
x -= 1;
break;
- case GDK_Right: case GDK_KP_Right:
+ case GDK_KEY_Right: case GDK_KEY_KP_Right:
x += 1;
break;
- case GDK_Up: case GDK_KP_Up:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
y -= 1;
break;
- case GDK_Down: case GDK_KP_Down:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
y += 1;
break;
default:
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Menu:
+ case GDK_KEY_Menu:
layout_image_menu_popup(lw);
break;
default:
static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
{
LayoutWindow *lw = data;
-
+
layout_exit_fullscreen(lw);
layout_views_set(lw, lw->options.dir_view_type, (FileViewType) gtk_radio_action_get_current_value(action));
}
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
-
- /* FIXME:interrupting thumbs no longer allowed */
-#if 0
- interrupt_thumbs();
-#endif
}
static void layout_menu_overlay_toggle_cb(GtkAction *action, gpointer data)
static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data)
{
LayoutWindow *lw = data;
- GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
if (gtk_toggle_action_get_active(action))
{
OsdShowFlags flags = image_osd_get(lw->image);
-
+
if ((flags | OSD_SHOW_INFO | OSD_SHOW_STATUS) != flags)
image_osd_set(lw->image, flags | OSD_SHOW_INFO | OSD_SHOW_STATUS);
}
else
{
+ GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
+
image_osd_set(lw->image, OSD_SHOW_NOTHING);
gtk_toggle_action_set_active(histogram_action, FALSE); /* this calls layout_menu_histogram_cb */
}
static void layout_menu_histogram_cb(GtkToggleAction *action, gpointer data)
{
LayoutWindow *lw = data;
- GtkToggleAction *overlay_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageOverlay"));
if (gtk_toggle_action_get_active(action))
{
GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
if (channel < 0 || channel >= HCHAN_COUNT) return;
-
+
gtk_toggle_action_set_active(histogram_action, TRUE); /* this calls layout_menu_histogram_cb */
image_osd_histogram_set_channel(lw->image, channel);
}
GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
if (mode < 0 || mode > 1) return;
-
+
gtk_toggle_action_set_active(histogram_action, TRUE); /* this calls layout_menu_histogram_cb */
image_osd_histogram_set_mode(lw->image, mode);
}
static void layout_menu_bar_exif_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
-
+
layout_exit_fullscreen(lw);
layout_exif_window_new(lw);
}
layout_image_slideshow_pause_toggle(lw);
}
+
+static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint mode = layout_image_stereo_pixbuf_get(lw);
+
+ /* 0->1, 1->2, 2->3, 3->1 - disable auto, then cycle */
+ mode = mode % 3 + 1;
+
+ GtkAction *radio = gtk_action_group_get_action(lw->action_group, "StereoAuto");
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(radio), mode);
+
+ /*
+ this is called via fallback in layout_menu_stereo_mode_cb
+ layout_image_stereo_pixbuf_set(lw, mode);
+ */
+
+}
+
+static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint mode = gtk_radio_action_get_current_value(action);
+ layout_image_stereo_pixbuf_set(lw, mode);
+}
+
static void layout_menu_help_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
static void layout_menu_notes_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
-
+
layout_exit_fullscreen(lw);
help_window_show("release_notes");
}
}
if (!path) return;
-
+
/* Open previous path */
- dir_fd = file_data_new_simple(path);
+ dir_fd = file_data_new_dir(path);
layout_set_fd(lw, dir_fd);
file_data_unref(dir_fd);
}
{
LayoutWindow *lw = data;
const gchar *path;
-
+
if (lw->options.home_path && *lw->options.home_path)
path = lw->options.home_path;
else
if (path)
{
- FileData *dir_fd = file_data_new_simple(path);
+ FileData *dir_fd = file_data_new_dir(path);
layout_set_fd(lw, dir_fd);
file_data_unref(dir_fd);
}
{
LayoutWindow *lw = data;
const gchar *key = gtk_action_get_name(action);
-
+
if (!editor_window_flag_set(key))
layout_exit_fullscreen(lw);
{ "ColorMenu", NULL, N_("_Color Management"), NULL, NULL, NULL },
{ "ConnectZoomMenu", NULL, N_("_Connected Zoom"), NULL, NULL, NULL },
{ "SplitMenu", NULL, N_("Spli_t"), NULL, NULL, NULL },
+ { "StereoMenu", NULL, N_("Stere_o"), NULL, NULL, NULL },
{ "OverlayMenu", NULL, N_("Image _Overlay"), NULL, NULL, NULL },
{ "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL },
{ "About", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("About"), CB(layout_menu_about_cb) },
{ "LogWindow", NULL, N_("_Log Window"), NULL, N_("Log Window"), CB(layout_menu_log_window_cb) },
{ "ExifWin", NULL, N_("_Exif window"), "<control>E", N_("Exif window"), CB(layout_menu_bar_exif_cb) },
+ { "StereoCycle", NULL, N_("_Cycle through stereo modes"), NULL, N_("Cycle through stereo modes"), CB(layout_menu_stereo_mode_next_cb) },
};
{ "HistogramModeLog", NULL, N_("_Log Histogram"), NULL, N_("Log Histogram"), 1 },
};
+static GtkRadioActionEntry menu_stereo_mode_entries[] = {
+ { "StereoAuto", NULL, N_("_Auto"), NULL, N_("Stereo Auto"), STEREO_PIXBUF_DEFAULT },
+ { "StereoSBS", NULL, N_("_Side by Side"), NULL, N_("Stereo Side by Side"), STEREO_PIXBUF_SBS },
+ { "StereoCross", NULL, N_("_Cross"), NULL, N_("Stereo Cross"), STEREO_PIXBUF_CROSS },
+ { "StereoOff", NULL, N_("_Off"), NULL, N_("Stereo Off"), STEREO_PIXBUF_NONE }
+};
+
#undef CB
" <menuitem action='SplitQuad'/>"
" <menuitem action='SplitSingle'/>"
" </menu>"
+" <menu action='StereoMenu'>"
+" <menuitem action='StereoAuto'/>"
+" <menuitem action='StereoSBS'/>"
+" <menuitem action='StereoCross'/>"
+" <menuitem action='StereoOff'/>"
+" <separator/>"
+" <menuitem action='StereoCycle'/>"
+" </menu>"
" <menu action='ColorMenu'>"
" <menuitem action='UseColorProfiles'/>"
" <menuitem action='UseImageProfile'/>"
g_snprintf(name, sizeof(name), name_tmpl, mark);
g_snprintf(label, sizeof(label), label_tmpl, mark);
-
+
if (accel_tmpl)
g_snprintf(accel, sizeof(accel), accel_tmpl, mark % 10);
else
g_snprintf(tooltip, sizeof(tooltip), tooltip_tmpl, mark);
else
entry.tooltip = NULL;
-
+
gtk_action_group_add_actions(lw->action_group, &entry, 1, lw);
action = gtk_action_group_get_action(lw->action_group, name);
g_object_set_data(G_OBJECT(action), "mark_num", GINT_TO_POINTER(mark));
gchar **split = g_strsplit(editor->menu_path, "/", 0);
gint i = 0;
GList *ret = NULL;
-
- if (split[0] == NULL)
+
+ if (split[0] == NULL)
{
g_strfreev(split);
return NULL;
}
-
+
while (split[i])
{
ret = g_list_prepend(ret, g_strdup(split[i]));
i++;
}
-
+
g_strfreev(split);
-
+
ret = g_list_prepend(ret, g_strdup(editor->key));
-
+
return g_list_reverse(ret);
}
}
to_open = g_list_length(path) - 1;
to_close = g_list_length(old_path) - 1;
-
+
if (to_close > 0)
{
old_path = g_list_last(old_path);
old_path = old_path->prev;
}
-
+
for (i = 0; i < to_close; i++)
{
gchar *name = old_path->data;
}
path = path->next;
}
-
+
if (path)
g_string_append_printf(desc, " <menuitem action='%s'/>", (gchar *)path->data);
}
GList *work;
GList *old_path;
GString *desc;
-
+
+ if (lw->ui_editors_id)
+ {
+ gtk_ui_manager_remove_ui(lw->ui_manager, lw->ui_editors_id);
+ }
+
if (lw->action_group_editors)
{
gtk_ui_manager_remove_action_group(lw->ui_manager, lw->action_group_editors);
" <menubar name='MainMenu'>");
editors_list = editor_list_get();
-
+
old_path = NULL;
work = editors_list;
while (work)
{
GList *path;
EditorDescription *editor = work->data;
- GtkActionEntry entry = { editor->key,
+ GtkActionEntry entry = { editor->key,
NULL,
editor->name,
- editor->hotkey,
+ editor->hotkey,
editor->comment ? editor->comment : editor->name,
G_CALLBACK(layout_menu_edit_cb) };
-
+
if (editor->icon)
{
entry.stock_id = editor->key;
}
gtk_action_group_add_actions(lw->action_group_editors, &entry, 1, lw);
-
+
path = layout_actions_editor_menu_path(editor);
layout_actions_editor_add(desc, path, old_path);
-
+
string_list_free(old_path);
old_path = path;
work = work->next;
"</ui>" );
error = NULL;
-
+
lw->ui_editors_id = gtk_ui_manager_add_ui_from_string(lw->ui_manager, desc->str, -1, &error);
if (!lw->ui_editors_id)
{
gtk_action_group_add_radio_actions(lw->action_group,
menu_histogram_mode, G_N_ELEMENTS(menu_histogram_mode),
0, G_CALLBACK(layout_menu_histogram_mode_cb), lw);
+ gtk_action_group_add_radio_actions(lw->action_group,
+ menu_stereo_mode_entries, G_N_ELEMENTS(menu_stereo_mode_entries),
+ 0, G_CALLBACK(layout_menu_stereo_mode_cb), lw);
lw->ui_manager = gtk_ui_manager_new();
g_error_free(error);
exit(EXIT_FAILURE);
}
-
+
DEBUG_1("%s layout_actions_setup: add toolbar", get_exec_time());
for (i = 0; i < TOOLBAR_COUNT; i++)
{
layout_toolbar_clear(lw, i);
layout_toolbar_add_default(lw, i);
}
-
+
DEBUG_1("%s layout_actions_setup: marks", get_exec_time());
layout_actions_setup_marks(lw);
DEBUG_1("%s layout_actions_setup: status_update_write", get_exec_time());
layout_util_status_update_write(lw);
-
+
DEBUG_1("%s layout_actions_setup: actions_add_window", get_exec_time());
layout_actions_add_window(lw, lw->window);
DEBUG_1("%s layout_actions_setup: end", get_exec_time());
layout_editors_desktop_files = editor_get_desktop_files();
return TRUE;
}
-
+
editor_read_desktop_file(layout_editors_desktop_files->data);
g_free(layout_editors_desktop_files->data);
layout_editors_desktop_files = g_list_delete_link(layout_editors_desktop_files, layout_editors_desktop_files);
-
-
+
+
if (!layout_editors_desktop_files)
{
GList *work;
}
DEBUG_1("%s layout_editors_reload_idle_cb: setup_editors done", get_exec_time());
-
+
layout_editors_reload_idle_id = -1;
return FALSE;
}
void layout_editors_reload_start(void)
{
- GList *work;
-
DEBUG_1("%s layout_editors_reload_start", get_exec_time());
if (layout_editors_reload_idle_id != -1)
string_list_free(layout_editors_desktop_files);
}
- work = layout_window_list;
- while (work)
- {
- LayoutWindow *lw = work->data;
- work = work->next;
-
- gtk_ui_manager_remove_ui(lw->ui_manager, lw->ui_editors_id);
- gtk_ui_manager_remove_action_group(lw->ui_manager, lw->action_group_editors);
- g_object_unref(lw->action_group_editors);
- lw->action_group_editors = NULL;
- }
editor_table_clear();
layout_editors_reload_idle_id = g_idle_add(layout_editors_reload_idle_cb, NULL);
}
-
+
void layout_editors_reload_finish(void)
{
if (layout_editors_reload_idle_id != -1)
void layout_toolbar_clear(LayoutWindow *lw, ToolbarType type)
{
- if (lw->toolbar_merge_id[type])
+ if (lw->toolbar_merge_id[type])
{
gtk_ui_manager_remove_ui(lw->ui_manager, lw->toolbar_merge_id[type]);
gtk_ui_manager_ensure_update(lw->ui_manager);
}
string_list_free(lw->toolbar_actions[type]);
lw->toolbar_actions[type] = NULL;
-
+
lw->toolbar_merge_id[type] = gtk_ui_manager_new_merge_id(lw->ui_manager);
}
-
+
void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action)
{
const gchar *path = NULL;
if (!action || !lw->ui_manager) return;
-
+
if (g_list_find_custom(lw->toolbar_actions[type], action, (GCompareFunc)strcmp)) return;
switch (type)
default:
break;
}
-
-
+
+
if (g_str_has_suffix(action, ".desktop"))
{
/* this may be called before the external editors are read
create a dummy action for now */
-
+
if (!lw->action_group_editors)
{
lw->action_group_editors = gtk_action_group_new("MenuActionsExternal");
}
if (!gtk_action_group_get_action(lw->action_group_editors, action))
{
- GtkActionEntry entry = { action,
+ GtkActionEntry entry = { action,
GTK_STOCK_MISSING_IMAGE,
action,
- NULL,
+ NULL,
NULL,
NULL };
DEBUG_1("Creating temporary action %s", action);
gtk_action_group_add_actions(lw->action_group_editors, &entry, 1, lw);
}
}
- gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action, action, GTK_UI_MANAGER_TOOLITEM, FALSE);
+ gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action, action, GTK_UI_MANAGER_TOOLITEM, FALSE);
lw->toolbar_actions[type] = g_list_append(lw->toolbar_actions[type], g_strdup(action));
}
void layout_toolbar_add_from_config(LayoutWindow *lw, ToolbarType type, const gchar **attribute_names, const gchar **attribute_values)
{
gchar *action = NULL;
-
+
while (*attribute_names)
{
const gchar *option = *attribute_names++;
}
layout_toolbar_add(lw, type, action);
- g_free(action);
+ g_free(action);
}
/*
if (!lw->action_group) return;
if (!layout_image_color_profile_get(lw, &input, &use_image)) return;
-
+
use_color = layout_image_color_profile_get_use(lw);
action = gtk_action_group_get_action(lw->action_group, "UseColorProfiles");
{
sprintf(action_name, "ColorProfile%d", i);
action = gtk_action_group_get_action(lw->action_group, action_name);
-
+
if (i >= COLOR_PROFILE_FILE)
{
const gchar *name = options->color_profile.input_name[i - COLOR_PROFILE_FILE];
if (!lw->action_group) return;
action = gtk_action_group_get_action(lw->action_group, "FolderTree");
- radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
action = gtk_action_group_get_action(lw->action_group, "SplitSingle");
- radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
action = gtk_action_group_get_action(lw->action_group, "ViewIcons");
- radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type);
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type);
action = gtk_action_group_get_action(lw->action_group, "FloatTools");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.tools_float);
action = gtk_action_group_get_action(lw->action_group, "HideToolbar");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.toolbar_hidden);
-
+
action = gtk_action_group_get_action(lw->action_group, "ShowInfoPixel");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_info_pixel);
if (osd_flags & OSD_SHOW_HISTOGRAM)
{
action = gtk_action_group_get_action(lw->action_group, "HistogramChanR");
- radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image));
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image));
action = gtk_action_group_get_action(lw->action_group, "HistogramModeLin");
- radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image));
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image));
}
action = gtk_action_group_get_action(lw->action_group, "ConnectZoomMenu");
gtk_action_set_sensitive(action, lw->split_mode != SPLIT_NONE);
+ action = gtk_action_group_get_action(lw->action_group, "StereoAuto");
+ gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), layout_image_stereo_pixbuf_get(lw));
+
layout_util_sync_color(lw);
}
static gboolean layout_bar_enabled(LayoutWindow *lw)
{
- return lw->bar && GTK_WIDGET_VISIBLE(lw->bar);
+ return lw->bar && gtk_widget_get_visible(lw->bar);
}
static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
LayoutWindow *lw = data;
lw->bar = NULL;
-/*
+/*
do not call layout_util_sync_views(lw) here
this is called either when whole layout is destroyed - no need for update
or when the bar is replaced - sync is called by upper function at the end of whole operation
static void layout_bar_set_default(LayoutWindow *lw)
{
GtkWidget *bar;
-
+
if (!lw->utility_box) return;
bar = bar_new(lw);
-
+
layout_bar_set(lw, bar);
-
+
bar_populate_default(bar);
}
// gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->bar, FALSE, FALSE, 0);
- gtk_paned_pack2(GTK_PANED(lw->utility_paned), lw->bar, FALSE, TRUE);
+ gtk_paned_pack2(GTK_PANED(lw->utility_paned), lw->bar, FALSE, TRUE);
bar_set_fd(lw->bar, layout_image_get_fd(lw));
}
static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
{
- return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort);
+ return lw->bar_sort && gtk_widget_get_visible(lw->bar_sort);
}
lw->bar_sort = NULL;
-/*
+/*
do not call layout_util_sync_views(lw) here
this is called either when whole layout is destroyed - no need for update
or when the bar is replaced - sync is called by upper function at the end of whole operation
static void layout_bar_sort_set_default(LayoutWindow *lw)
{
GtkWidget *bar;
-
+
if (!lw->utility_box) return;
bar = bar_sort_new_default(lw);
-
+
layout_bar_sort_set(lw, bar);
}
lw->utility_paned = gtk_hpaned_new();
gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
- gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
+ gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
gtk_widget_show(lw->utility_paned);
-
+
gtk_widget_show(image);
g_object_ref(lw->utility_box);
void layout_exif_window_new(LayoutWindow *lw)
{
- if (lw->exif_window) return;
-
+ if (lw->exif_window) return;
+
lw->exif_window = advanced_exif_new();
if (!lw->exif_window) return;
g_signal_connect(G_OBJECT(lw->exif_window), "destroy",
projects / geeqie.git / blobdiff