#include "preferences.h"
#include "print.h"
#include "search.h"
+#include "slideshow.h"
#include "ui_fileops.h"
#include "ui_menu.h"
#include "ui_misc.h"
#include "ui_tabcomp.h"
#include "utilops.h"
#include "view_dir.h"
+#include "view_file.h"
#include "window.h"
#include "metadata.h"
#include "desktop_file.h"
#include "keymap_template.c"
#define MENU_EDIT_ACTION_OFFSET 16
+#define FILE_COLUMN_POINTER 0
static gboolean layout_bar_enabled(LayoutWindow *lw);
static gboolean layout_bar_sort_enabled(LayoutWindow *lw);
+static void layout_bars_hide_toggle(LayoutWindow *lw);
static void layout_util_sync_views(LayoutWindow *lw);
/*
layout_image_alter_orientation(lw, ALTER_ROTATE_90);
}
+static void layout_menu_rating_0_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "0");
+}
+
+static void layout_menu_rating_1_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "1");
+}
+
+static void layout_menu_rating_2_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "2");
+}
+
+static void layout_menu_rating_3_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "3");
+}
+
+static void layout_menu_rating_4_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "4");
+}
+
+static void layout_menu_rating_5_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "5");
+}
+
+static void layout_menu_rating_m1_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_image_rating(lw, "-1");
+}
+
static void layout_menu_alter_90cc_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_write_rotate(GtkToggleAction *action, gpointer data, gboolean keep_date)
+{
+ LayoutWindow *lw = data;
+ GtkTreeModel *store;
+ GList *work;
+ GtkTreeSelection *selection;
+ GtkTreePath *tpath;
+ FileData *fd_n;
+ GtkTreeIter iter;
+ gchar *rotation;
+ gchar *command;
+ gint run_result;
+ GenericDialog *gd;
+ GString *message;
+
+ if (!layout_valid(&lw)) return;
+
+ if (!lw || !lw->vf) return;
+
+ if (lw->vf->type == FILEVIEW_ICON)
+ {
+ if (!VFICON(lw->vf)->selection) return;
+ work = VFICON(lw->vf)->selection;
+ }
+ else
+ {
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(lw->vf->listview));
+ work = gtk_tree_selection_get_selected_rows(selection, &store);
+ }
+
+ while (work)
+ {
+ if (lw->vf->type == FILEVIEW_ICON)
+ {
+ fd_n = work->data;
+ work = work->next;
+ }
+ else
+ {
+ tpath = work->data;
+ gtk_tree_model_get_iter(store, &iter, tpath);
+ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
+ work = work->next;
+ }
+
+ rotation = g_strdup_printf("%d", fd_n->user_orientation);
+ command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
+ keep_date ? " -t " : " ", fd_n->path, NULL);
+
+ run_result = WEXITSTATUS(runcmd(command));
+ if (!run_result)
+ {
+ fd_n->user_orientation = 0;
+ }
+ else
+ {
+ message = g_string_new("");
+ message = g_string_append(message, _("Operation failed:\n"));
+
+ if (run_result == 3)
+ message = g_string_append(message, _("Cannot create tmp file"));
+ else
+ {
+ message = g_string_append(message, _("File: "));
+ message = g_string_append(message, fd_n->name);
+ }
+
+ gd = generic_dialog_new(_("Image orientation"),
+ "Image orientation", NULL, TRUE, NULL, NULL);
+ generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR,
+ "Image orientation", message->str, TRUE);
+ generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
+
+ gtk_widget_show(gd->dialog);
+
+ g_string_free(message, TRUE);
+ }
+
+ g_free(rotation);
+ g_free(command);
+ }
+}
+
+static void layout_menu_write_rotate_keep_date_cb(GtkToggleAction *action, gpointer data)
+{
+ layout_menu_write_rotate(action, data, TRUE);
+}
+
+static void layout_menu_write_rotate_cb(GtkToggleAction *action, gpointer data)
+{
+ layout_menu_write_rotate(action, data, FALSE);
+}
+
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_rectangular_selection_cb(GtkToggleAction *action, gpointer data)
{
- LayoutWindow *lw = data;
-
options->collections.rectangular_selection = gtk_toggle_action_get_active(action);
}
layout_bar_sort_toggle(lw);
}
+static void layout_menu_hide_bars_cb(GtkToggleAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_bars_hide_toggle(lw);
+}
+
static void layout_menu_slideshow_cb(GtkToggleAction *action, gpointer data)
{
LayoutWindow *lw = data;
layout_image_slideshow_pause_toggle(lw);
}
+static void layout_menu_slideshow_slower_cb(GtkAction *action, gpointer data)
+{
+ options->slideshow.delay = options->slideshow.delay + 5;
+ if (options->slideshow.delay > SLIDESHOW_MAX_SECONDS)
+ options->slideshow.delay = SLIDESHOW_MAX_SECONDS;
+}
+
+static void layout_menu_slideshow_faster_cb(GtkAction *action, gpointer data)
+{
+ options->slideshow.delay = options->slideshow.delay - 5;
+ if (options->slideshow.delay < SLIDESHOW_MIN_SECONDS * 10)
+ options->slideshow.delay = SLIDESHOW_MIN_SECONDS * 10;
+}
+
static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
{
help_window_show("release_notes");
}
+static void layout_menu_changelog_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ layout_exit_fullscreen(lw);
+ help_window_show("changelog");
+}
+
static char *keyboard_map_hardcoded[][2] = {
{"Scroll","Left"},
{"FastScroll", "<Shift>Left"},
static void layout_menu_kbd_map_cb(GtkAction *action, gpointer data)
{
- LayoutWindow *lw = data;
gint fd = -1;
GPtrArray *array;
char * tmp_file;
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);
+ log_printf("Error: Keyboard Map - cannot create file:%s\n",error->message);
g_error_free(error);
}
else
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);}
+ if (error) {log_printf("Warning: Keyboard Map:%s\n",error->message); g_error_free(error);}
g_free(converted_line);
g_strfreev(pre_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);}
+ if (error) {log_printf("Warning: 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);}
+ if (error) {log_printf("Warning: 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);}
+ if (error) {log_printf("Warning: Keyboard Map:%s\n",error->message); g_error_free(error);}
g_io_channel_unref(channel);
index=0;
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- show_about_window();
+ show_about_window(lw);
}
static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
LayoutWindow *lw = data;
layout_exit_fullscreen(lw);
- log_window_new();
+ log_window_new(lw);
}
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_split_pane_updown_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint active_frame;
+
+ active_frame = lw->active_split_image;
+
+ if (lw->split_images[MAX_SPLIT_IMAGES-1] )
+ {
+ active_frame = active_frame ^ 2;
+ }
+ else
+ {
+ active_frame = active_frame ^ 1;
+ }
+ layout_image_activate(lw, active_frame, FALSE);
+}
+
static void layout_menu_image_last_cb(GtkAction *action, gpointer data)
{
LayoutWindow *lw = data;
{
LayoutWindow *lw = data;
FileData *dir_fd;
- gchar *path = NULL;
- GList *list = history_list_get_by_key("path_list");
- gint n = 0;
- while (list)
- {
- if (n == 1) {
- /* Previous path from history */
- path = (gchar *)list->data;
- break;
- }
- list = list->next;
- n++;
- }
+ /* Obtain previous path */
+ dir_fd = file_data_new_dir(history_chain_back());
+ layout_set_fd(lw, dir_fd);
+ file_data_unref(dir_fd);
+}
- if (!path) return;
+static void layout_menu_forward_cb(GtkAction *action, gpointer data)
+{
+ LayoutWindow *lw = data;
+ FileData *dir_fd;
- /* Open previous path */
- dir_fd = file_data_new_dir(path);
+ /* Obtain next path */
+ dir_fd = file_data_new_dir(history_chain_forward());
layout_set_fd(lw, dir_fd);
file_data_unref(dir_fd);
}
{ "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
{ "SelectMenu", NULL, N_("_Select"), NULL, NULL, NULL },
{ "OrientationMenu", NULL, N_("_Orientation"), NULL, NULL, NULL },
+ { "RatingMenu", NULL, N_("_Rating"), 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 },
{ "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) },
+ { "Forward", GTK_STOCK_GO_FORWARD, N_("_Forward"), NULL, N_("Forward"), CB(layout_menu_forward_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) },
{ "CloseWindow", GTK_STOCK_CLOSE, N_("C_lose window"), "<control>W", N_("Close window"), CB(layout_menu_close_cb) },
{ "Quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", N_("Quit"), CB(layout_menu_exit_cb) },
{ "RotateCW", NULL, N_("_Rotate clockwise"), "bracketright", N_("Rotate clockwise"), CB(layout_menu_alter_90_cb) },
+ { "Rating0", NULL, N_("_Rating 0"), "<alt>KP_0", N_("Rating 0"), CB(layout_menu_rating_0_cb) },
+ { "Rating1", NULL, N_("_Rating 1"), "<alt>KP_1", N_("Rating 1"), CB(layout_menu_rating_1_cb) },
+ { "Rating2", NULL, N_("_Rating 2"), "<alt>KP_2", N_("Rating 2"), CB(layout_menu_rating_2_cb) },
+ { "Rating3", NULL, N_("_Rating 3"), "<alt>KP_3", N_("Rating 3"), CB(layout_menu_rating_3_cb) },
+ { "Rating4", NULL, N_("_Rating 4"), "<alt>KP_4", N_("Rating 4"), CB(layout_menu_rating_4_cb) },
+ { "Rating5", NULL, N_("_Rating 5"), "<alt>KP_5", N_("Rating 5"), CB(layout_menu_rating_5_cb) },
+ { "RatingM1", NULL, N_("_Rating -1"), "<alt>KP_Subtract", N_("Rating -1"), CB(layout_menu_rating_m1_cb) },
{ "RotateCCW", NULL, N_("Rotate _counterclockwise"), "bracketleft", N_("Rotate counterclockwise"), CB(layout_menu_alter_90cc_cb) },
{ "Rotate180", NULL, N_("Rotate 1_80"), "<shift>R", N_("Rotate 180"), CB(layout_menu_alter_180_cb) },
{ "Mirror", NULL, N_("_Mirror"), "<shift>M", N_("Mirror"), CB(layout_menu_alter_mirror_cb) },
{ "HistogramModeCycle",NULL, N_("Cycle through histogram mo_des"), "J", N_("Cycle through histogram modes"), CB(layout_menu_histogram_toggle_mode_cb) },
{ "HideTools", NULL, N_("_Hide file list"), "<control>H", N_("Hide file list"), CB(layout_menu_hide_cb) },
{ "SlideShowPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) },
+ { "SlideShowFaster", NULL, N_("Faster"), "<control>KP_Add", N_("Faster"), CB(layout_menu_slideshow_faster_cb) },
+ { "SlideShowSlower", NULL, N_("Slower"), "<control>KP_Subtract", N_("Slower"), CB(layout_menu_slideshow_slower_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) },
+ { "HelpChangeLog", NULL, N_("_ChangeLog"), NULL, N_("ChangeLog notes"), CB(layout_menu_changelog_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) },
+ { "SplitUpPane", NULL, N_("_Up Pane"), "<alt>Up", N_("Up Pane"), CB(layout_menu_split_pane_updown_cb) },
+ { "SplitDownPane", NULL, N_("_Down Pane"), "<alt>Down", N_("Down Pane"), CB(layout_menu_split_pane_updown_cb) },
+ { "WriteRotation", NULL, N_("_Write orientation to file"), NULL, N_("Write orientation to file"), CB(layout_menu_write_rotate_cb) },
+ { "WriteRotationKeepDate", NULL, N_("_Write orientation to file (preserve timestamp)"), NULL, N_("Write orientation to file (preserve timestamp)"), CB(layout_menu_write_rotate_keep_date_cb) },
};
{ "HideToolbar", NULL, N_("Hide tool_bar"), NULL, N_("Hide toolbar"), CB(layout_menu_toolbar_cb), FALSE },
{ "SBar", NULL, N_("_Info sidebar"), "<control>K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE },
{ "SBarSort", NULL, N_("Sort _manager"), "<shift>S", N_("Sort manager"), CB(layout_menu_bar_sort_cb), FALSE },
+ { "HideBars", NULL, N_("Hide Bars"), "grave", N_("Hide Bars"), CB(layout_menu_hide_bars_cb), FALSE },
{ "SlideShow", GTK_STOCK_MEDIA_PLAY, N_("Toggle _slideshow"), "S", N_("Toggle slideshow"), CB(layout_menu_slideshow_cb), FALSE },
{ "UseColorProfiles", GTK_STOCK_SELECT_COLOR, N_("Use _color profiles"), NULL, N_("Use color profiles"), CB(layout_color_menu_enable_cb), FALSE},
{ "UseImageProfile", NULL, N_("Use profile from _image"), NULL, N_("Use profile from image"), CB(layout_color_menu_use_image_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='LastImage'/>"
" <separator/>"
" <menuitem action='Back'/>"
+" <menuitem action='Forward'/>"
" <menuitem action='Up'/>"
" <menuitem action='Home'/>"
" <separator/>"
" <menuitem action='Mirror'/>"
" <menuitem action='Flip'/>"
" <menuitem action='AlterNone'/>"
+" <separator/>"
+" <menuitem action='ExifRotate'/>"
+" <separator/>"
+" <menuitem action='WriteRotation'/>"
+" <menuitem action='WriteRotationKeepDate'/>"
+" <separator/>"
+" </menu>"
+" <menu action='RatingMenu'>"
+" <menuitem action='Rating0'/>"
+" <menuitem action='Rating1'/>"
+" <menuitem action='Rating2'/>"
+" <menuitem action='Rating3'/>"
+" <menuitem action='Rating4'/>"
+" <menuitem action='Rating5'/>"
+" <menuitem action='RatingM1'/>"
+" <separator/>"
" </menu>"
" <menuitem action='SaveMetadata'/>"
" <placeholder name='PropertiesSection'/>"
" </menu>"
" <placeholder name='PreferencesSection'/>"
" <separator/>"
+#if !GTK_CHECK_VERSION(3,0,0)
" <menuitem action='Wallpaper'/>"
+#endif
" <separator/>"
" </menu>"
" <menu action='ViewMenu'>"
" <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'/>"
+" <menuitem action='SplitUpPane'/>"
+" <menuitem action='SplitDownPane'/>"
" </menu>"
" <menu action='StereoMenu'>"
" <menuitem action='StereoAuto'/>"
" <separator/>"
" <menuitem action='SBar'/>"
" <menuitem action='SBarSort'/>"
+" <menuitem action='HideBars'/>"
" <menuitem action='ShowInfoPixel'/>"
" <placeholder name='ToolsSection'/>"
" <separator/>"
" <menuitem action='Animate'/>"
" <menuitem action='SlideShow'/>"
" <menuitem action='SlideShowPause'/>"
+" <menuitem action='SlideShowFaster'/>"
+" <menuitem action='SlideShowSlower'/>"
+" <separator/>"
" <menuitem action='Refresh'/>"
" <placeholder name='SlideShowSection'/>"
" <separator/>"
" <menuitem action='HelpShortcuts'/>"
" <menuitem action='HelpKbd'/>"
" <menuitem action='HelpNotes'/>"
+" <menuitem action='HelpChangeLog'/>"
" <placeholder name='HelpSection'/>"
" <separator/>"
" <menuitem action='About'/>"
" <toolbar name='ToolBar'>"
" <toolitem action='Thumbnails'/>"
" <toolitem action='Back'/>"
+" <toolitem action='Forward'/>"
" <toolitem action='Up'/>"
" <toolitem action='Home'/>"
" <toolitem action='Refresh'/>"
" <toolitem action='FloatTools'/>"
" </toolbar>"
" <toolbar name='StatusBar'>"
+" <toolitem action='ExifRotate'/>"
" <toolitem action='ShowInfoPixel'/>"
" <toolitem action='UseColorProfiles'/>"
" <toolitem action='SaveMetadata'/>"
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));
+ g_object_set_data(G_OBJECT(action), "mark_num", GINT_TO_POINTER(mark > 0 ? mark : 10));
}
static void layout_actions_setup_marks(LayoutWindow *lw)
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));
+ gint i = (mark < 10 ? mark : 0);
+
+ layout_actions_setup_mark(lw, i, "Mark%d", _("Mark _%d"), NULL, NULL, NULL);
+ layout_actions_setup_mark(lw, i, "SetMark%d", _("_Set mark %d"), NULL, _("Set mark %d"), G_CALLBACK(layout_menu_set_mark_sel_cb));
+ layout_actions_setup_mark(lw, i, "ResetMark%d", _("_Reset mark %d"), NULL, _("Reset mark %d"), G_CALLBACK(layout_menu_res_mark_sel_cb));
+ layout_actions_setup_mark(lw, i, "ToggleMark%d", _("_Toggle mark %d"), "%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
+ layout_actions_setup_mark(lw, i, "ToggleMark%dAlt1", _("_Toggle mark %d"), "KP_%d", _("Toggle mark %d"), G_CALLBACK(layout_menu_toggle_mark_sel_cb));
+ layout_actions_setup_mark(lw, i, "SelectMark%d", _("Se_lect mark %d"), "<control>%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
+ layout_actions_setup_mark(lw, i, "SelectMark%dAlt1", _("_Select mark %d"), "<control>KP_%d", _("Select mark %d"), G_CALLBACK(layout_menu_sel_mark_cb));
+ layout_actions_setup_mark(lw, i, "AddMark%d", _("_Add mark %d"), NULL, _("Add mark %d"), G_CALLBACK(layout_menu_sel_mark_or_cb));
+ layout_actions_setup_mark(lw, i, "IntMark%d", _("_Intersection with mark %d"), NULL, _("Intersection with mark %d"), G_CALLBACK(layout_menu_sel_mark_and_cb));
+ layout_actions_setup_mark(lw, i, "UnselMark%d", _("_Unselect mark %d"), NULL, _("Unselect mark %d"), G_CALLBACK(layout_menu_sel_mark_minus_cb));
+ layout_actions_setup_mark(lw, i, "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'>"
" <separator/>"
" <menuitem action='FilterMark%d'/>"
" </menu>",
- mark, mark, mark, mark, mark, mark, mark, mark, mark);
+ i, i, i, i, i, i, i, i, i);
}
g_string_append(desc,
" </menubar>");
for (mark = 1; mark <= FILEDATA_MARKS_SIZE; mark++)
{
+ gint i = (mark < 10 ? mark : 0);
+
g_string_append_printf(desc,
"<accelerator action='ToggleMark%dAlt1'/>"
"<accelerator action='SelectMark%dAlt1'/>",
- mark, mark);
+ i, i);
}
g_string_append(desc, "</ui>" );
void layout_actions_setup(LayoutWindow *lw)
{
GError *error;
- gint i;
DEBUG_1("%s layout_actions_setup: start", get_exec_time());
if (lw->ui_manager) return;
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);
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), layout_image_get_desaturate(lw));
}
+void layout_util_sync_marks(LayoutWindow *lw)
+{
+ GtkAction *action;
+
+ if (!lw->action_group) return;
+
+ action = gtk_action_group_get_action(lw->action_group, "ShowMarks");
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_marks);
+}
+
static void layout_util_sync_views(LayoutWindow *lw)
{
GtkAction *action;
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, "SplitNextPane");
+ gtk_action_set_sensitive(action, !(lw->split_mode == SPLIT_NONE));
+ action = gtk_action_group_get_action(lw->action_group, "SplitPreviousPane");
+ gtk_action_set_sensitive(action, !(lw->split_mode == SPLIT_NONE));
+ action = gtk_action_group_get_action(lw->action_group, "SplitUpPane");
+ gtk_action_set_sensitive(action, !(lw->split_mode == SPLIT_NONE));
+ action = gtk_action_group_get_action(lw->action_group, "SplitDownPane");
+ gtk_action_set_sensitive(action, !(lw->split_mode == SPLIT_NONE));
+
action = gtk_action_group_get_action(lw->action_group, "ViewIcons");
gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type);
action = gtk_action_group_get_action(lw->action_group, "ShowInfoPixel");
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_info_pixel);
- action = gtk_action_group_get_action(lw->action_group, "ShowMarks");
- gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_marks);
-
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, "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");
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, "WriteRotation");
+ gtk_action_set_sensitive(action, !(runcmd("which exiftran >/dev/null 2>&1") ||
+ runcmd("which mogrify >/dev/null 2>&1") || options->metadata.write_orientation));
+ action = gtk_action_group_get_action(lw->action_group, "WriteRotationKeepDate");
+ gtk_action_set_sensitive(action, !(runcmd("which exiftran >/dev/null 2>&1") ||
+ runcmd("which mogrify >/dev/null 2>&1") || options->metadata.write_orientation));
+
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_marks(lw);
layout_util_sync_color(lw);
}
layout_util_sync_views(lw);
}
+static void layout_bars_hide_toggle(LayoutWindow *lw)
+{
+ if (lw->options.bars_state.hidden)
+ {
+ lw->options.bars_state.hidden = FALSE;
+ if (lw->options.bars_state.sort)
+ {
+ gtk_widget_show(lw->bar_sort);
+ }
+ if (lw->options.bars_state.info)
+ {
+ gtk_widget_show(lw->bar);
+ }
+ layout_tools_float_set(lw, lw->options.tools_float,
+ lw->options.bars_state.tools_hidden);
+ }
+ else
+ {
+ lw->options.bars_state.hidden = TRUE;
+ lw->options.bars_state.sort = layout_bar_sort_enabled(lw);
+ lw->options.bars_state.info = layout_bar_enabled(lw);
+ lw->options.bars_state.tools_float = lw->options.tools_float;
+ lw->options.bars_state.tools_hidden = lw->options.tools_hidden;
+
+ gtk_widget_hide(lw->bar);
+ if (lw->bar_sort)
+ gtk_widget_hide(lw->bar_sort);
+ layout_tools_float_set(lw, lw->options.tools_float, TRUE);
+ }
+
+ layout_util_sync_views(lw);
+}
+
void layout_bars_new_image(LayoutWindow *lw)
{
layout_bar_new_image(lw);