Author: post
Date: 2010-10-24 20:29:20 +0200 (Sun, 24 Oct 2010)
New Revision: 3585
Modified:
trunk/src/gtk-interface.c
trunk/src/rs-actions.c
trunk/src/ui.xml
Log:
Move "Show Filenames" and "Load 8 bit images" to from preferences to top menu
for better visibility.
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2010-10-24 14:56:38 UTC (rev 3584)
+++ trunk/src/gtk-interface.c 2010-10-24 18:29:20 UTC (rev 3585)
@@ -56,7 +56,7 @@
static void gui_preview_bg_color_changed(GtkColorButton *widget, RS_BLOB *rs);
static gboolean gui_fullscreen_iconbox_callback(GtkWidget *widget,
GdkEventWindowState *event, GtkWidget *iconbox);
static gboolean gui_fullscreen_toolbox_callback(GtkWidget *widget,
GdkEventWindowState *event, GtkWidget *toolbox);
-static void gui_preference_iconview_show_filenames_changed(GtkToggleButton
*togglebutton, gpointer user_data);
+//static void gui_preference_iconview_show_filenames_changed(GtkToggleButton
*togglebutton, gpointer user_data);
static GtkWidget *gui_make_menubar(RS_BLOB *rs);
static void drag_data_received(GtkWidget *widget, GdkDragContext
*drag_context, gint x, gint y, GtkSelectionData *selection_data, guint info,
guint t, RS_BLOB *rs);
static gboolean gui_window_delete(GtkWidget *widget, GdkEvent *event,
gpointer user_data);
@@ -367,16 +367,6 @@
}
static void
-gui_preference_iconview_show_filenames_changed(GtkToggleButton *togglebutton,
gpointer user_data)
-{
- RS_BLOB *rs = (RS_BLOB *)user_data;
-
- rs_store_set_show_filenames(rs->store, togglebutton->active);
-
- return;
-}
-
-static void
gui_preference_use_system_theme(GtkToggleButton *togglebutton, gpointer
user_data)
{
if (togglebutton->active)
@@ -587,8 +577,6 @@
gint histogram_height;
GtkWidget *local_cache_check;
GtkWidget *system_theme_check;
- GtkWidget *load_gdk_check;
- GtkWidget *show_filenames;
/*
GtkWidget *batch_page;
@@ -644,24 +632,13 @@
gtk_box_pack_start (GTK_BOX (histsize_hbox), histsize, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (preview_page), histsize_hbox, FALSE, TRUE,
0);
- show_filenames = checkbox_from_conf(CONF_SHOW_FILENAMES, _("Show
filenames in iconview"), DEFAULT_CONF_SHOW_FILENAMES);
- gtk_box_pack_start (GTK_BOX (preview_page), show_filenames, FALSE,
TRUE, 0);
- g_signal_connect ((gpointer) show_filenames, "toggled",
- G_CALLBACK (gui_preference_iconview_show_filenames_changed),
rs);
-
system_theme_check = checkbox_from_conf(CONF_USE_SYSTEM_THEME, _("Use
system theme"), DEFAULT_CONF_USE_SYSTEM_THEME);
gtk_box_pack_start (GTK_BOX (preview_page), system_theme_check, FALSE,
TRUE, 0);
g_signal_connect ((gpointer) system_theme_check, "toggled",
G_CALLBACK (gui_preference_use_system_theme), rs);
- gtk_box_pack_start (GTK_BOX (preview_page), gtk_hseparator_new(),
FALSE, TRUE, 0);
-
local_cache_check = checkbox_from_conf(CONF_CACHEDIR_IS_LOCAL, _("Place
cache in home directory"), FALSE);
gtk_box_pack_start (GTK_BOX (preview_page), local_cache_check, FALSE,
TRUE, 0);
-
- load_gdk_check = checkbox_from_conf(CONF_LOAD_GDK, _("Load 8 bit photos
(jpeg, png, etc)"), FALSE);
- gtk_box_pack_start (GTK_BOX (preview_page), load_gdk_check, FALSE,
TRUE, 0);
-
/*
batch_page = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (batch_page), 6);
Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c 2010-10-24 14:56:38 UTC (rev 3584)
+++ trunk/src/rs-actions.c 2010-10-24 18:29:20 UTC (rev 3585)
@@ -861,6 +861,17 @@
gui_widget_show(rs->toolbox,
gtk_toggle_action_get_active(toggleaction), CONF_SHOW_TOOLBOX_FULLSCREEN,
CONF_SHOW_TOOLBOX);
}
+TOGGLEACTION(show_filenames)
+{
+ rs_store_set_show_filenames(rs->store,
gtk_toggle_action_get_active(toggleaction));
+ rs_conf_set_boolean(CONF_SHOW_FILENAMES,
gtk_toggle_action_get_active(toggleaction));
+}
+
+TOGGLEACTION(load_8bit)
+{
+ rs_conf_set_boolean(CONF_LOAD_GDK,
gtk_toggle_action_get_active(toggleaction));
+}
+
TOGGLEACTION(fullscreen)
{
if (gtk_toggle_action_get_active(toggleaction))
@@ -1149,6 +1160,12 @@
GtkActionGroup *
rs_get_core_action_group(RS_BLOB *rs)
{
+ gboolean show_filenames;
+ gboolean load_8bit = FALSE;
+
+ rs_conf_get_boolean_with_default(CONF_SHOW_FILENAMES, &show_filenames,
DEFAULT_CONF_SHOW_FILENAMES);
+ rs_conf_get_boolean_with_default(CONF_LOAD_GDK, &load_8bit, FALSE);
+
/* FIXME: This should be static */
GtkActionEntry actionentries[] = {
{ "FileMenu", NULL, _("_File"), NULL, NULL, ACTION_CB(file_menu) },
@@ -1227,6 +1244,8 @@
{ "Iconbox", NULL, _("_Iconbox"), "<control>I", NULL,
ACTION_CB(iconbox), TRUE },
{ "Toolbox", NULL, _("_Toolbox"), "<control>T", NULL,
ACTION_CB(toolbox), TRUE },
{ "Fullscreen", GTK_STOCK_FULLSCREEN, _("_Fullscreen"), "F11", NULL,
ACTION_CB(fullscreen), FALSE },
+ { "ShowFilenames", NULL, _("Show Filenames in Iconbox"), NULL, NULL,
ACTION_CB(show_filenames), show_filenames },
+ { "Load8Bit", NULL, _("Load non-RAW images"), NULL, NULL,
ACTION_CB(load_8bit), load_8bit },
{ "ExposureMask", NULL, _("_Exposure mask"), "<control>E", NULL,
ACTION_CB(exposure_mask), FALSE },
{ "Split", NULL, _("_Split"), "<control>D", NULL, ACTION_CB(split),
FALSE },
#if GTK_CHECK_VERSION(2,12,0)
Modified: trunk/src/ui.xml
===================================================================
--- trunk/src/ui.xml 2010-10-24 14:56:38 UTC (rev 3584)
+++ trunk/src/ui.xml 2010-10-24 18:29:20 UTC (rev 3585)
@@ -69,6 +69,9 @@
<menuitem action="Toolbox" />
<menuitem action="Fullscreen" />
<separator />
+ <menuitem action="ShowFilenames" />
+ <menuitem action="Load8Bit" />
+ <separator />
<menuitem action="ExposureMask" />
<menuitem action="Split" />
<menuitem action="Lightsout" />
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
