/*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * 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!
+ * 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 "layout_util.h"
#include "view_dir.h"
#include "window.h"
#include "metadata.h"
-#include "rcfile.h"
#include "desktop_file.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
-
+#include "keymap_template.c"
#define MENU_EDIT_ACTION_OFFSET 16
LayoutWindow *nw;
LayoutOptions lop;
gboolean tmp = options->save_window_positions;
- options->save_window_positions = FALSE; /* let the windowmanager decide for the first time */
+
+ if (!options->use_saved_window_positions_for_new_windows)
+ options->save_window_positions = FALSE; /* let the windowmanager decide for the first time */
layout_exit_fullscreen(lw);
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- dupe_window_new(DUPE_MATCH_NAME);
+ dupe_window_new();
}
static void layout_menu_pan_cb(GtkAction *action, gpointer data)
file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
}
+static void layout_menu_delete_key_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ if (options->file_ops.enable_delete_key)
+ {
+ file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
+ }
+}
+
static void layout_menu_disable_grouping_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
layout_image_alter_orientation(lw, ALTER_NONE);
}
+static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ options->image.exif_rotate_enable = gtk_toggle_action_get_active(action);
+ layout_image_reset_orientation(lw);
+}
+
static void layout_menu_config_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
layout_views_set(lw, lw->options.dir_view_type, (FileViewType) gtk_radio_action_get_current_value(action));
}
-static void layout_menu_view_dir_as_cb(GtkRadioAction *action, GtkRadioAction *current, gpointer data)
+static void layout_menu_view_dir_as_cb(GtkToggleAction *action, gpointer data)
{
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- layout_views_set(lw, (DirViewType) gtk_radio_action_get_current_value(action), lw->options.file_view_type);
+
+ if (gtk_toggle_action_get_active(action))
+ {
+ layout_views_set(lw, DIRVIEW_TREE, lw->options.file_view_type);
+ }
+ else
+ {
+ layout_views_set(lw, DIRVIEW_LIST, lw->options.file_view_type);
+ }
}
static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
}
}
+static void layout_menu_animate_cb(GtkToggleAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ if (lw->options.animate == gtk_toggle_action_get_active(action)) return;
+ layout_image_animate_toggle(lw);
+}
+
+static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ options->collections.rectangular_selection = gtk_toggle_action_get_active(action);
+}
+
static void layout_menu_histogram_toggle_channel_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- help_window_show("html_contents");
+ help_window_show("index.html");
}
static void layout_menu_help_keys_cb(GtkAction *action, gpointer data)
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- help_window_show("documentation");
+ help_window_show("GuideReferenceKeyboardShortcuts.html");
}
static void layout_menu_notes_cb(GtkAction *action, gpointer data)
help_window_show("release_notes");
}
+static char *keyboard_map_hardcoded[][2] = {
+ {"Scroll","Left"},
+ {"FastScroll", "<Shift>Left"},
+ {"Left Border", "<Primary>Left"},
+ {"Left Border", "<Primary><Shift>Left"},
+ {"Scroll", "Right"},
+ {"FastScroll", "<Shift>Right"},
+ {"Right Border", "<Primary>Right"},
+ {"Right Border", "<Primary><Shift>Right"},
+ {"Scroll", "Up"},
+ {"FastScroll", "<Shift>Up"},
+ {"Uper Border", "<Primary>Up"},
+ {"Uper Border", "<Primary><Shift>Up"},
+ {"Scroll", "Down"},
+ {"FastScroll", "<Shift>Down"},
+ {"Lower Border", "<Primary>Down"},
+ {"Lower Border", "<Primary><Shift>Down"},
+ {"Next/Drag", "M1"},
+ {"FastDrag", "<Shift>M1"},
+ {"DnD Start", "M2"},
+ {"Menu", "M3"},
+ {"PrevImage", "MW4"},
+ {"NextImage", "MW5"},
+ {"ScrollUp", "<Shift>MW4"},
+ {"ScrollDown", "<Shift>MW5"},
+ {"ZoomIn", "<Primary>MW4"},
+ {"ZoomOut", "<Primary>MW5"},
+ {NULL, NULL}
+};
+
+static void layout_menu_foreach_func(
+ gpointer data,
+ const gchar *accel_path,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ gboolean changed)
+{
+ gchar *path, *name;
+ gchar *key_name, *menu_name;
+ gchar **subset_lt_arr, **subset_gt_arr;
+ gchar *subset_lt, *converted_name;
+ GPtrArray *array = data;
+
+ path = g_strescape(accel_path, NULL);
+ name = gtk_accelerator_name(accel_key, accel_mods);
+
+ menu_name = g_strdup(g_strrstr(path, "/")+1);
+
+ if (g_strrstr(name, ">"))
+ {
+ subset_lt_arr = g_strsplit_set(name,"<", 4);
+ subset_lt = g_strjoinv("<", subset_lt_arr);
+ subset_gt_arr = g_strsplit_set(subset_lt,">", 4);
+ converted_name = g_strjoinv(">", subset_gt_arr);
+ key_name = g_strdup(converted_name);
+
+ g_free(converted_name);
+ g_free(subset_lt);
+ g_strfreev(subset_lt_arr);
+ g_strfreev(subset_gt_arr);
+ }
+ else
+ key_name = g_strdup(name);
+
+ g_ptr_array_add(array, (gpointer)menu_name);
+ g_ptr_array_add(array, (gpointer)key_name);
+
+ g_free(name);
+ g_free(path);
+}
+
+static void layout_menu_kbd_map_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint fd = -1;
+ GPtrArray *array;
+ char * tmp_file;
+ GError *error = NULL;
+ GIOChannel *channel;
+ char **pre_key, **post_key;
+ char *key_name, *converted_line;
+ int keymap_index, index;
+
+ fd = g_file_open_tmp("geeqie_keymap_XXXXXX.svg", &tmp_file, &error);
+ if (error)
+ {
+ DEBUG_0("Keyboard Map - cannot create file:%s\n",error->message);
+ g_error_free(error);
+ }
+ else
+ {
+ array = g_ptr_array_new();
+
+ gtk_accel_map_foreach(array, layout_menu_foreach_func);
+
+ channel = g_io_channel_unix_new(fd);
+
+ keymap_index = 0;
+ while (keymap_template[keymap_index])
+ {
+ if (g_strrstr(keymap_template[keymap_index], ">key:"))
+ {
+ pre_key = g_strsplit(keymap_template[keymap_index],">key:",2);
+ post_key = g_strsplit(pre_key[1],"<",2);
+
+ index=0;
+ key_name = " ";
+ for (index=0; index < array->len-2; index=index+2)
+ {
+ if (!(g_ascii_strcasecmp(g_ptr_array_index(array,index+1), post_key[0])))
+ {
+ key_name = g_ptr_array_index(array,index+0);
+ break;
+ }
+ }
+
+ index=0;
+ while (keyboard_map_hardcoded[index][0])
+ {
+ if (!(g_strcmp0(keyboard_map_hardcoded[index][1], post_key[0])))
+ {
+ key_name = keyboard_map_hardcoded[index][0];
+ break;
+ }
+ index++;
+ }
+
+ converted_line = g_strconcat(pre_key[0], ">", key_name, "<", post_key[1], "\n", NULL);
+ g_io_channel_write_chars(channel, converted_line, -1, NULL, &error);
+ if (error) {DEBUG_0("Keyboard Map:%s\n",error->message); g_error_free(error);}
+
+ g_free(converted_line);
+ g_strfreev(pre_key);
+ g_strfreev(post_key);
+ }
+ else
+ {
+ g_io_channel_write_chars(channel, keymap_template[keymap_index], -1, NULL, &error);
+ if (error) {DEBUG_0("Keyboard Map:%s\n",error->message); g_error_free(error);}
+ g_io_channel_write_chars(channel, "\n", -1, NULL, &error);
+ if (error) {DEBUG_0("Keyboard Map:%s\n",error->message); g_error_free(error);}
+ }
+ keymap_index++;
+ }
+
+ g_io_channel_flush(channel, &error);
+ if (error) {DEBUG_0("Keyboard Map:%s\n",error->message); g_error_free(error);}
+ g_io_channel_unref(channel);
+
+ index=0;
+ for (index=0; index < array->len-2; index=index+2)
+ {
+ g_free(g_ptr_array_index(array,index));
+ g_free(g_ptr_array_index(array,index+1));
+ }
+ g_ptr_array_unref(array);
+
+ view_window_new(file_data_new_simple(tmp_file));
+ g_free(tmp_file);
+ }
+}
+
static void layout_menu_about_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
layout_image_next(lw);
}
+static void layout_menu_split_pane_next_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint active_frame;
+
+ active_frame = lw->active_split_image;
+
+ if (active_frame < MAX_SPLIT_IMAGES-1 && lw->split_images[active_frame+1] )
+ {
+ active_frame++;
+ }
+ else
+ {
+ active_frame = 0;
+ }
+ layout_image_activate(lw, active_frame, FALSE);
+}
+
+static void layout_menu_split_pane_prev_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint active_frame;
+
+ active_frame = lw->active_split_image;
+
+ if (active_frame >=1 && lw->split_images[active_frame-1] )
+ {
+ active_frame--;
+ }
+ else
+ {
+ active_frame = MAX_SPLIT_IMAGES-1;
+ while (!lw->split_images[active_frame])
+ {
+ active_frame--;
+ }
+ }
+ layout_image_activate(lw, active_frame, FALSE);
+}
+
static void layout_menu_image_last_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
#define CB G_CALLBACK
static GtkActionEntry menu_entries[] = {
- { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
- { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL },
- { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
- { "SelectMenu", NULL, N_("_Select"), NULL, NULL, NULL },
- { "OrientationMenu", NULL, N_("_Orientation"), NULL, NULL, NULL },
- { "ExternalMenu", NULL, N_("E_xternal Editors"), NULL, NULL, NULL },
- { "PreferencesMenu", NULL, N_("P_references"), NULL, NULL, NULL },
- { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
- { "FileDirMenu", NULL, N_("_Files and Folders"), NULL, NULL, NULL },
- { "ZoomMenu", NULL, N_("_Zoom"), NULL, NULL, NULL },
- { "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 },
+ { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
+ { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL },
+ { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
+ { "SelectMenu", NULL, N_("_Select"), NULL, NULL, NULL },
+ { "OrientationMenu", NULL, N_("_Orientation"), NULL, NULL, NULL },
+ { "ExternalMenu", NULL, N_("E_xternal Editors"), NULL, NULL, NULL },
+ { "PreferencesMenu", NULL, N_("P_references"), NULL, NULL, NULL },
+ { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
+ { "FileDirMenu", NULL, N_("_Files and Folders"), NULL, NULL, NULL },
+ { "ZoomMenu", NULL, N_("_Zoom"), NULL, NULL, NULL },
+ { "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 },
{ "FirstImage", GTK_STOCK_GOTO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) },
- { "PrevImage", GTK_STOCK_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
- { "PrevImageAlt1", GTK_STOCK_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
- { "PrevImageAlt2", GTK_STOCK_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
+ { "PrevImage", GTK_STOCK_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
+ { "PrevImageAlt1", GTK_STOCK_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
+ { "PrevImageAlt2", GTK_STOCK_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) },
{ "NextImage", GTK_STOCK_GO_DOWN, N_("_Next Image"), "space", N_("Next Image"), CB(layout_menu_image_next_cb) },
{ "NextImageAlt1", GTK_STOCK_GO_DOWN, N_("_Next Image"), "Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) },
{ "NextImageAlt2", GTK_STOCK_GO_DOWN, N_("_Next Image"), "KP_Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) },
{ "LastImage", GTK_STOCK_GOTO_BOTTOM, N_("_Last Image"), "End", N_("Last Image"), CB(layout_menu_image_last_cb) },
{ "Back", GTK_STOCK_GO_BACK, N_("_Back"), NULL, N_("Back"), CB(layout_menu_back_cb) },
{ "Home", GTK_STOCK_HOME, N_("_Home"), NULL, N_("Home"), CB(layout_menu_home_cb) },
- { "Up", GTK_STOCK_GO_UP, N_("_Up"), NULL, N_("Up"), CB(layout_menu_up_cb) },
+ { "Up", GTK_STOCK_GO_UP, N_("_Up"), NULL, N_("Up"), CB(layout_menu_up_cb) },
{ "NewWindow", GTK_STOCK_NEW, N_("New _window"), "<control>N", N_("New window"), CB(layout_menu_new_window_cb) },
{ "NewCollection", GTK_STOCK_INDEX, N_("_New collection"), "C", N_("New collection"), CB(layout_menu_new_cb) },
{ "Move", NULL, N_("_Move..."), "<control>M", N_("Move..."), CB(layout_menu_move_cb) },
{ "Rename", NULL, N_("_Rename..."), "<control>R", N_("Rename..."), CB(layout_menu_rename_cb) },
{ "Delete", GTK_STOCK_DELETE, N_("_Delete..."), "<control>D", N_("Delete..."), CB(layout_menu_delete_cb) },
- { "DeleteAlt1", GTK_STOCK_DELETE, N_("_Delete..."), "Delete", N_("Delete..."), CB(layout_menu_delete_cb) },
- { "DeleteAlt2", GTK_STOCK_DELETE, N_("_Delete..."), "KP_Delete", N_("Delete..."), CB(layout_menu_delete_cb) },
+ { "DeleteAlt1", GTK_STOCK_DELETE, N_("_Delete..."), "Delete", N_("Delete..."), CB(layout_menu_delete_key_cb) },
+ { "DeleteAlt2", GTK_STOCK_DELETE, N_("_Delete..."), "KP_Delete", N_("Delete..."), CB(layout_menu_delete_key_cb) },
{ "EnableGrouping", NULL, N_("Enable file _grouping"), NULL, N_("Enable file grouping"), CB(layout_menu_enable_grouping_cb) },
{ "DisableGrouping", NULL, N_("Disable file groupi_ng"), NULL, N_("Disable file grouping"), CB(layout_menu_disable_grouping_cb) },
{ "CopyPath", NULL, N_("_Copy path to clipboard"), NULL, N_("Copy path to clipboard"), CB(layout_menu_copy_path_cb) },
{ "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", N_("Refresh"), CB(layout_menu_refresh_cb) },
{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Contents"), CB(layout_menu_help_cb) },
{ "HelpShortcuts", NULL, N_("_Keyboard shortcuts"), NULL, N_("Keyboard shortcuts"), CB(layout_menu_help_keys_cb) },
+ { "HelpKbd", NULL, N_("_Keyboard map"), NULL, N_("Keyboard map"), CB(layout_menu_kbd_map_cb) },
{ "HelpNotes", NULL, N_("_Release notes"), NULL, N_("Release notes"), CB(layout_menu_notes_cb) },
{ "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) },
+ { "SplitNextPane", NULL, N_("_Next Pane"), "<alt>Right", N_("Next Pane"), CB(layout_menu_split_pane_next_cb) },
+ { "SplitPreviousPane", NULL, N_("_Previous Pane"), "<alt>Left", N_("Previous Pane"), CB(layout_menu_split_pane_prev_cb) },
};
{ "Grayscale", NULL, N_("Toggle _grayscale"), "<shift>G", N_("Toggle grayscale"), CB(layout_menu_alter_desaturate_cb), FALSE},
{ "ImageOverlay", NULL, N_("Image _Overlay"), NULL, N_("Image Overlay"), CB(layout_menu_overlay_cb), FALSE },
{ "ImageHistogram", NULL, N_("_Show Histogram"), NULL, N_("Show Histogram"), CB(layout_menu_histogram_cb), FALSE },
+ { "RectangularSelection", NULL, N_("Rectangular Selection"), "<alt>R", N_("Rectangular Selection"), CB(layout_menu_rectangular_selection_cb), FALSE },
+ { "Animate", NULL, N_("GIF _animation"), "A", N_("Toggle GIF animation"), CB(layout_menu_animate_cb), FALSE },
+ { "ExifRotate", GTK_STOCK_ORIENTATION_PORTRAIT, N_("_Exif rotate"), "<alt>X", N_("Exif rotate"), CB(layout_menu_exif_rotate_cb), FALSE },
};
static GtkRadioActionEntry menu_radio_entries[] = {
{ "ViewIcons", NULL, N_("I_cons"), "<control>I", N_("View Images as Icons"), FILEVIEW_ICON }
};
-static GtkRadioActionEntry menu_view_dir_radio_entries[] = {
- { "FolderList", NULL, N_("Folder Li_st"), "<meta>L", N_("View Folders as List"), DIRVIEW_LIST },
- { "FolderTree", NULL, N_("Folder T_ree"), "<control>T", N_("View Folders as Tree"), DIRVIEW_TREE },
+static GtkToggleActionEntry menu_view_dir_toggle_entries[] = {
+ { "FolderTree", NULL, N_("T_oggle Folder View"), "<control>T", N_("Toggle Folders View"), CB(layout_menu_view_dir_as_cb),FALSE },
};
static GtkRadioActionEntry menu_split_radio_entries[] = {
" <menuitem action='SelectAll'/>"
" <menuitem action='SelectNone'/>"
" <menuitem action='SelectInvert'/>"
+" <menuitem action='RectangularSelection'/>"
" <placeholder name='SelectSection'/>"
" <separator/>"
" <menuitem action='CopyPath'/>"
" <menuitem action='Mirror'/>"
" <menuitem action='Flip'/>"
" <menuitem action='AlterNone'/>"
+" <separator/>"
+" <menuitem action='ExifRotate'/>"
+" <separator/>"
" </menu>"
" <menuitem action='SaveMetadata'/>"
" <placeholder name='PropertiesSection'/>"
" <placeholder name='WindowSection'/>"
" <separator/>"
" <menu action='FileDirMenu'>"
-" <menuitem action='FolderList'/>"
" <menuitem action='FolderTree'/>"
" <placeholder name='FolderSection'/>"
" <separator/>"
" <menuitem action='SplitVertical'/>"
" <menuitem action='SplitQuad'/>"
" <menuitem action='SplitSingle'/>"
+" <separator/>"
+" <menuitem action='SplitNextPane'/>"
+" <menuitem action='SplitPreviousPane'/>"
" </menu>"
" <menu action='StereoMenu'>"
" <menuitem action='StereoAuto'/>"
" <menuitem action='ShowInfoPixel'/>"
" <placeholder name='ToolsSection'/>"
" <separator/>"
+" <menuitem action='Animate'/>"
" <menuitem action='SlideShow'/>"
" <menuitem action='SlideShowPause'/>"
" <menuitem action='Refresh'/>"
" <separator/>"
" <menuitem action='HelpContents'/>"
" <menuitem action='HelpShortcuts'/>"
+" <menuitem action='HelpKbd'/>"
" <menuitem action='HelpNotes'/>"
" <placeholder name='HelpSection'/>"
" <separator/>"
" </menu>"
" </menubar>"
" <toolbar name='ToolBar'>"
+" <toolitem action='Thumbnails'/>"
+" <toolitem action='Back'/>"
+" <toolitem action='Up'/>"
+" <toolitem action='Home'/>"
+" <toolitem action='Refresh'/>"
+" <toolitem action='ZoomIn'/>"
+" <toolitem action='ZoomOut'/>"
+" <toolitem action='ZoomFit'/>"
+" <toolitem action='Zoom100'/>"
+" <toolitem action='Preferences'/>"
+" <toolitem action='FloatTools'/>"
" </toolbar>"
" <toolbar name='StatusBar'>"
+" <toolitem action='ExifRotate'/>"
+" <toolitem action='ShowInfoPixel'/>"
+" <toolitem action='UseColorProfiles'/>"
+" <toolitem action='SaveMetadata'/>"
" </toolbar>"
"<accelerator action='PrevImageAlt1'/>"
"<accelerator action='PrevImageAlt2'/>"
for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++)
{
- layout_actions_setup_mark(lw, mark, "Mark%d", _("Mark _%d"), NULL, NULL, NULL);
- layout_actions_setup_mark(lw, mark, "SetMark%d", _("_Set mark %d"), NULL, _("Set mark %d"), G_CALLBACK(layout_menu_set_mark_sel_cb));
- layout_actions_setup_mark(lw, mark, "ResetMark%d", _("_Reset mark %d"), NULL, _("Reset mark %d"), G_CALLBACK(layout_menu_res_mark_sel_cb));
- layout_actions_setup_mark(lw, mark, "ToggleMark%d", _("_Toggle mark %d"), "%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
- layout_actions_setup_mark(lw, mark, "ToggleMark%dAlt1", _("_Toggle mark %d"), "KP_%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
- layout_actions_setup_mark(lw, mark, "SelectMark%d", _("Se_lect mark %d"), "<control>%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
- layout_actions_setup_mark(lw, mark, "SelectMark%dAlt1", _("_Select mark %d"), "<control>KP_%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
- layout_actions_setup_mark(lw, mark, "AddMark%d", _("_Add mark %d"), NULL, _("Add mark %d"), G_CALLBACK(layout_menu_sel_mark_or_cb));
- layout_actions_setup_mark(lw, mark, "IntMark%d", _("_Intersection with mark %d"), NULL, _("Intersection with mark %d"), G_CALLBACK(layout_menu_sel_mark_and_cb));
- layout_actions_setup_mark(lw, mark, "UnselMark%d", _("_Unselect mark %d"), NULL, _("Unselect mark %d"), G_CALLBACK(layout_menu_sel_mark_minus_cb));
- layout_actions_setup_mark(lw, mark, "FilterMark%d", _("_Filter mark %d"), NULL, _("Filter mark %d"), G_CALLBACK(layout_menu_mark_filter_toggle_cb));
+ layout_actions_setup_mark(lw, mark, "Mark%d", _("Mark _%d"), NULL, NULL, NULL);
+ layout_actions_setup_mark(lw, mark, "SetMark%d", _("_Set mark %d"), NULL, _("Set mark %d"), G_CALLBACK(layout_menu_set_mark_sel_cb));
+ layout_actions_setup_mark(lw, mark, "ResetMark%d", _("_Reset mark %d"), NULL, _("Reset mark %d"), G_CALLBACK(layout_menu_res_mark_sel_cb));
+ layout_actions_setup_mark(lw, mark, "ToggleMark%d", _("_Toggle mark %d"), "%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
+ layout_actions_setup_mark(lw, mark, "ToggleMark%dAlt1", _("_Toggle mark %d"), "KP_%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
+ layout_actions_setup_mark(lw, mark, "SelectMark%d", _("Se_lect mark %d"), "<control>%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
+ layout_actions_setup_mark(lw, mark, "SelectMark%dAlt1", _("_Select mark %d"), "<control>KP_%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
+ layout_actions_setup_mark(lw, mark, "AddMark%d", _("_Add mark %d"), NULL, _("Add mark %d"), G_CALLBACK(layout_menu_sel_mark_or_cb));
+ layout_actions_setup_mark(lw, mark, "IntMark%d", _("_Intersection with mark %d"), NULL, _("Intersection with mark %d"), G_CALLBACK(layout_menu_sel_mark_and_cb));
+ layout_actions_setup_mark(lw, mark, "UnselMark%d", _("_Unselect mark %d"), NULL, _("Unselect mark %d"), G_CALLBACK(layout_menu_sel_mark_minus_cb));
+ layout_actions_setup_mark(lw, mark, "FilterMark%d", _("_Filter mark %d"), NULL, _("Filter mark %d"), G_CALLBACK(layout_menu_mark_filter_toggle_cb));
g_string_append_printf(desc,
" <menu action='Mark%d'>"
gtk_action_group_add_radio_actions(lw->action_group,
menu_split_radio_entries, G_N_ELEMENTS(menu_split_radio_entries),
0, G_CALLBACK(layout_menu_split_cb), lw);
- gtk_action_group_add_radio_actions(lw->action_group,
- menu_view_dir_radio_entries, VIEW_DIR_TYPES_COUNT,
- 0, G_CALLBACK(layout_menu_view_dir_as_cb), lw);
+ gtk_action_group_add_toggle_actions(lw->action_group,
+ menu_view_dir_toggle_entries, G_N_ELEMENTS(menu_view_dir_toggle_entries),
+ lw);
gtk_action_group_add_radio_actions(lw->action_group,
menu_color_radio_entries, COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS,
0, G_CALLBACK(layout_color_menu_input_cb), lw);
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);
return lw->toolbar[type];
}
-void layout_toolbar_clear(LayoutWindow *lw, ToolbarType 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)
- {
- case TOOLBAR_MAIN:
- path = "/ToolBar";
- break;
- case TOOLBAR_STATUS:
- path = "/StatusBar";
- break;
- 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");
- gtk_ui_manager_insert_action_group(lw->ui_manager, lw->action_group_editors, 1);
- }
- if (!gtk_action_group_get_action(lw->action_group_editors, action))
- {
- GtkActionEntry entry = { action,
- GTK_STOCK_MISSING_IMAGE,
- action,
- 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);
- lw->toolbar_actions[type] = g_list_append(lw->toolbar_actions[type], g_strdup(action));
-}
-
-
-void layout_toolbar_add_default(LayoutWindow *lw, ToolbarType type)
-{
- switch (type)
- {
- case TOOLBAR_MAIN:
- layout_toolbar_add(lw, type, "Thumbnails");
- layout_toolbar_add(lw, type, "Back");
- layout_toolbar_add(lw, type, "Up");
- layout_toolbar_add(lw, type, "Home");
- layout_toolbar_add(lw, type, "Refresh");
- layout_toolbar_add(lw, type, "ZoomIn");
- layout_toolbar_add(lw, type, "ZoomOut");
- layout_toolbar_add(lw, type, "ZoomFit");
- layout_toolbar_add(lw, type, "Zoom100");
- layout_toolbar_add(lw, type, "Preferences");
- layout_toolbar_add(lw, type, "FloatTools");
- break;
- case TOOLBAR_STATUS:
- layout_toolbar_add(lw, type, "ShowInfoPixel");
- layout_toolbar_add(lw, type, "UseColorProfiles");
- layout_toolbar_add(lw, type, "SaveMetadata");
- break;
- default:
- break;
- }
-}
-
-void layout_toolbar_write_config(LayoutWindow *lw, ToolbarType type, GString *outstr, gint indent)
-{
- const gchar *name = NULL;
- GList *work = lw->toolbar_actions[type];
-
- switch (type)
- {
- case TOOLBAR_MAIN:
- name = "toolbar";
- break;
- case TOOLBAR_STATUS:
- name = "statusbar";
- break;
- default:
- break;
- }
-
- WRITE_NL(); WRITE_STRING("<%s>", name);
- indent++;
- WRITE_NL(); WRITE_STRING("<clear/>");
- while (work)
- {
- gchar *action = work->data;
- work = work->next;
- WRITE_NL(); WRITE_STRING("<toolitem ");
- write_char_option(outstr, indent + 1, "action", action);
- WRITE_STRING("/>");
- }
- indent--;
- WRITE_NL(); WRITE_STRING("</%s>", name);
-}
-
-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++;
- const gchar *value = *attribute_values++;
-
- if (READ_CHAR_FULL("action", action)) continue;
-
- log_printf("unknown attribute %s = %s\n", option, value);
- }
-
- layout_toolbar_add(lw, type, action);
- g_free(action);
-}
-
/*
*-----------------------------------------------------------------------------
* misc
if (!lw->action_group) return;
action = gtk_action_group_get_action(lw->action_group, "FolderTree");
- gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.dir_view_type);
action = gtk_action_group_get_action(lw->action_group, "SplitSingle");
gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
action = gtk_action_group_get_action(lw->action_group, "SlideShow");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), layout_image_slideshow_active(lw));
+ action = gtk_action_group_get_action(lw->action_group, "Animate");
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.animate);
+
action = gtk_action_group_get_action(lw->action_group, "ImageOverlay");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), osd_flags != OSD_SHOW_NOTHING);
action = gtk_action_group_get_action(lw->action_group, "ImageHistogram");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), osd_flags & OSD_SHOW_HISTOGRAM);
+ action = gtk_action_group_get_action(lw->action_group, "ExifRotate");
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), options->image.exif_rotate_enable);
+
+ action = gtk_action_group_get_action(lw->action_group, "RectangularSelection");
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), options->collections.rectangular_selection);
+
if (osd_flags & OSD_SHOW_HISTOGRAM)
{
action = gtk_action_group_get_action(lw->action_group, "HistogramChanR");
projects / geeqie.git / blobdiff