Author: abrander
Date: 2009-12-12 11:14:48 +0100 (Sat, 12 Dec 2009)
New Revision: 2785
Modified:
trunk/src/application.h
trunk/src/rs-actions.c
Log:
[323] Disabled lights-out in full screen mode.
Modified: trunk/src/application.h
===================================================================
--- trunk/src/application.h 2009-12-12 09:59:43 UTC (rev 2784)
+++ trunk/src/application.h 2009-12-12 10:14:48 UTC (rev 2785)
@@ -65,6 +65,7 @@
/* These should be moved to a future RS_WINDOW */
GtkWidget *window;
+ gboolean window_fullscreen;
GtkWidget *iconbox;
GtkWidget *tools;
GtkWidget *toolbox;
Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c 2009-12-12 09:59:43 UTC (rev 2784)
+++ trunk/src/rs-actions.c 2009-12-12 10:14:48 UTC (rev 2785)
@@ -109,6 +109,11 @@
g_list_free(selected);
}
+ACTION(view_menu)
+{
+ rs_core_action_group_set_sensivity("Lightsout", !rs->window_fullscreen);
+}
+
ACTION(batch_menu)
{
GList *selected = NULL;
@@ -706,14 +711,17 @@
{
if (gtk_toggle_action_get_active(toggleaction))
{
+ rs->window_fullscreen = TRUE;
gtk_window_fullscreen(GTK_WINDOW(rs->window));
- rs_conf_set_boolean(CONF_FULLSCREEN, TRUE);
}
else
{
+ rs->window_fullscreen = FALSE;
gtk_window_unfullscreen(GTK_WINDOW(rs->window));
- rs_conf_set_boolean(CONF_FULLSCREEN, FALSE);
}
+
+ rs_conf_set_boolean(CONF_FULLSCREEN, rs->window_fullscreen);
+ rs_core_action_group_set_sensivity("Lightsout", !rs->window_fullscreen);
}
TOGGLEACTION(exposure_mask)
@@ -922,7 +930,7 @@
{ "PhotoMenu", NULL, _("_Photo"), NULL, NULL, ACTION_CB(photo_menu) },
{ "PriorityMenu", NULL, _("_Set Priority") },
{ "WhiteBalanceMenu", "NULL", _("_White Balance") },
- { "ViewMenu", NULL, _("_View") },
+ { "ViewMenu", NULL, _("_View"), NULL, NULL, ACTION_CB(view_menu) },
{ "SortByMenu", NULL, _("_Sort by") },
{ "BatchMenu", NULL, _("_Batch"), NULL, NULL, ACTION_CB(batch_menu) },
{ "HelpMenu", NULL, _("_Help") },
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
