Revision: 1768
http://geeqie.svn.sourceforge.net/geeqie/?rev=1768&view=rev
Author: nadvornik
Date: 2009-06-27 21:12:07 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
reordered View menu
Modified Paths:
--------------
trunk/src/layout.c
trunk/src/layout_util.c
Modified: trunk/src/layout.c
===================================================================
--- trunk/src/layout.c 2009-06-27 20:47:17 UTC (rev 1767)
+++ trunk/src/layout.c 2009-06-27 21:12:07 UTC (rev 1768)
@@ -1396,10 +1396,9 @@
image = layout_image_setup_split(lw, mode);
-// gtk_box_pack_start(GTK_BOX(lw->utility_box), image, TRUE, TRUE, 0);
-// gtk_box_reorder_child(GTK_BOX(lw->utility_box), image, 0);
gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
gtk_widget_show(image);
+ layout_util_sync(lw);
}
static void layout_grid_setup(LayoutWindow *lw)
Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c 2009-06-27 20:47:17 UTC (rev 1767)
+++ trunk/src/layout_util.c 2009-06-27 21:12:07 UTC (rev 1768)
@@ -1401,10 +1401,10 @@
static GtkToggleActionEntry menu_toggle_entries[] = {
{ "Thumbnails", PIXBUF_INLINE_ICON_THUMB,N_("Show _Thumbnails"),
"T", N_("Show Thumbnails"),
CB(layout_menu_thumb_cb), FALSE },
{ "ShowMarks", NULL, N_("Show _Marks"),
"M", N_("Show Marks"),
CB(layout_menu_marks_cb), FALSE },
- { "ShowInfoPixel", GTK_STOCK_COLOR_PICKER, N_("Show Pi_xel Info"),
NULL, N_("Show Pixel Info"),
CB(layout_menu_info_pixel_cb), FALSE },
+ { "ShowInfoPixel", GTK_STOCK_COLOR_PICKER, N_("Pi_xel Info"),
NULL, N_("Show Pixel Info"),
CB(layout_menu_info_pixel_cb), FALSE },
{ "FloatTools", PIXBUF_INLINE_ICON_FLOAT,N_("_Float file list"),
"L", N_("Float file list"),
CB(layout_menu_float_cb), FALSE },
{ "HideToolbar", NULL, N_("Hide tool_bar"),
NULL, N_("Hide toolbar"),
CB(layout_menu_toolbar_cb), FALSE },
- { "SBar", NULL, N_("_Info"),
"<control>K", N_("Info"),
CB(layout_menu_bar_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 },
{ "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},
@@ -1536,21 +1536,40 @@
" <menu action='ViewMenu'>"
" <menuitem action='ViewInNewWindow'/>"
" <menuitem action='PanView'/>"
+" <menuitem action='ExifWin'/>"
" <placeholder name='WindowSection'/>"
" <separator/>"
-" <menu action='ColorMenu'>"
-" <menuitem action='UseColorProfiles'/>"
-" <menuitem action='UseImageProfile'/>"
-" <menuitem action='ColorProfile0'/>"
-" <menuitem action='ColorProfile1'/>"
-" <menuitem action='ColorProfile2'/>"
-" <menuitem action='ColorProfile3'/>"
-" <menuitem action='ColorProfile4'/>"
-" <menuitem action='ColorProfile5'/>"
+" <menu action='FileDirMenu'>"
+" <menuitem action='FolderList'/>"
+" <menuitem action='FolderTree'/>"
+" <placeholder name='FolderSection'/>"
" <separator/>"
-" <menuitem action='Grayscale'/>"
+" <menuitem action='ViewList'/>"
+" <menuitem action='ViewIcons'/>"
+" <menuitem action='Thumbnails'/>"
+" <placeholder name='ListSection'/>"
+" <separator/>"
+" <menuitem action='FloatTools'/>"
+" <menuitem action='HideTools'/>"
+" <menuitem action='HideToolbar'/>"
" </menu>"
+" <placeholder name='DirSection'/>"
+" <separator/>"
" <menu action='ZoomMenu'>"
+" <menu action='ConnectZoomMenu'>"
+" <menuitem action='ConnectZoomIn'/>"
+" <menuitem action='ConnectZoomOut'/>"
+" <menuitem action='ConnectZoomFit'/>"
+" <menuitem action='ConnectZoomFillHor'/>"
+" <menuitem action='ConnectZoomFillVert'/>"
+" <menuitem action='ConnectZoom100'/>"
+" <menuitem action='ConnectZoom200'/>"
+" <menuitem action='ConnectZoom300'/>"
+" <menuitem action='ConnectZoom400'/>"
+" <menuitem action='ConnectZoom50'/>"
+" <menuitem action='ConnectZoom33'/>"
+" <menuitem action='ConnectZoom25'/>"
+" </menu>"
" <menuitem action='ZoomIn'/>"
" <menuitem action='ZoomOut'/>"
" <menuitem action='ZoomFit'/>"
@@ -1564,45 +1583,24 @@
" <menuitem action='Zoom33'/>"
" <menuitem action='Zoom25'/>"
" </menu>"
-" <menu action='ConnectZoomMenu'>"
-" <menuitem action='ConnectZoomIn'/>"
-" <menuitem action='ConnectZoomOut'/>"
-" <menuitem action='ConnectZoomFit'/>"
-" <menuitem action='ConnectZoomFillHor'/>"
-" <menuitem action='ConnectZoomFillVert'/>"
-" <menuitem action='ConnectZoom100'/>"
-" <menuitem action='ConnectZoom200'/>"
-" <menuitem action='ConnectZoom300'/>"
-" <menuitem action='ConnectZoom400'/>"
-" <menuitem action='ConnectZoom50'/>"
-" <menuitem action='ConnectZoom33'/>"
-" <menuitem action='ConnectZoom25'/>"
-" </menu>"
-" <placeholder name='ZoomSection'/>"
-" <separator/>"
" <menu action='SplitMenu'>"
" <menuitem action='SplitHorizontal'/>"
" <menuitem action='SplitVertical'/>"
" <menuitem action='SplitQuad'/>"
" <menuitem action='SplitSingle'/>"
" </menu>"
-" <separator/>"
-" <menu action='FileDirMenu'>"
-" <menuitem action='FolderList'/>"
-" <menuitem action='FolderTree'/>"
-" <placeholder name='FolderSection'/>"
+" <menu action='ColorMenu'>"
+" <menuitem action='UseColorProfiles'/>"
+" <menuitem action='UseImageProfile'/>"
+" <menuitem action='ColorProfile0'/>"
+" <menuitem action='ColorProfile1'/>"
+" <menuitem action='ColorProfile2'/>"
+" <menuitem action='ColorProfile3'/>"
+" <menuitem action='ColorProfile4'/>"
+" <menuitem action='ColorProfile5'/>"
" <separator/>"
-" <menuitem action='ViewList'/>"
-" <menuitem action='ViewIcons'/>"
-" <menuitem action='Thumbnails'/>"
-" <placeholder name='ListSection'/>"
-" <separator/>"
-" <menuitem action='FloatTools'/>"
-" <menuitem action='HideTools'/>"
-" <menuitem action='HideToolbar'/>"
+" <menuitem action='Grayscale'/>"
" </menu>"
-" <placeholder name='DirSection'/>"
-" <separator/>"
" <menu action='OverlayMenu'>"
" <menuitem action='ImageOverlay'/>"
" <menuitem action='ImageHistogram'/>"
@@ -1620,16 +1618,13 @@
" <menuitem action='HistogramModeCycle'/>"
" </menu>"
" <menuitem action='FullScreen'/>"
-" <placeholder name='OverlaySection'/>"
+" <placeholder name='ViewSection'/>"
" <separator/>"
+" <menuitem action='SBar'/>"
+" <menuitem action='SBarSort'/>"
" <menuitem action='ShowInfoPixel'/>"
" <placeholder name='ToolsSection'/>"
" <separator/>"
-" <menuitem action='SBar'/>"
-" <menuitem action='ExifWin'/>"
-" <menuitem action='SBarSort'/>"
-" <placeholder name='SideBarSection'/>"
-" <separator/>"
" <menuitem action='SlideShow'/>"
" <menuitem action='SlideShowPause'/>"
" <menuitem action='Refresh'/>"
@@ -2313,12 +2308,18 @@
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,
"HistogramChanR");
- radio_action_set_current_value(GTK_RADIO_ACTION(action),
image_osd_histogram_get_channel(lw->image));
+ 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));
- 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));
+ 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));
+ }
+ action = gtk_action_group_get_action(lw->action_group,
"ConnectZoomMenu");
+ gtk_action_set_sensitive(action, lw->split_mode != SPLIT_NONE);
+
layout_util_sync_color(lw);
}
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
