From 366943bed806cb3e2e3b330f7748e6f56527dfd7 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sat, 4 Apr 1998 14:19:21 +0000 Subject: [PATCH] Reflect the fact that you can't move a non-alpha layer up or down in the menu- and button-sensitivity. --Sven --- app/core/gimpprojection.c | 6 +++--- app/display/gimpdisplay.c | 6 +++--- app/gdisplay.c | 6 +++--- app/gui/layers-dialog.c | 10 +++++----- app/layers_dialog.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c index a04dbdd373..a303d2ac1a 100644 --- a/app/core/gimpprojection.c +++ b/app/core/gimpprojection.c @@ -997,12 +997,12 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) type = drawable_type (drawable); } - menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp); + menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp && alpha); + menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp && alpha); menus_set_sensitive ("/Layers/Anchor Layer", fs && !aux && lp); menus_set_sensitive ("/Layers/Merge Visible Layers", !fs && !aux && lp); menus_set_sensitive ("/Layers/Flatten Image", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp); + menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp && alpha); menus_set_sensitive ("/Layers/Mask To Selection", !aux && lm && lp); menus_set_sensitive ("/Layers/Add Alpha Channel", !fs && !aux && lp && !lm && !alpha); diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index a04dbdd373..a303d2ac1a 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -997,12 +997,12 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) type = drawable_type (drawable); } - menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp); + menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp && alpha); + menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp && alpha); menus_set_sensitive ("/Layers/Anchor Layer", fs && !aux && lp); menus_set_sensitive ("/Layers/Merge Visible Layers", !fs && !aux && lp); menus_set_sensitive ("/Layers/Flatten Image", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp); + menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp && alpha); menus_set_sensitive ("/Layers/Mask To Selection", !aux && lm && lp); menus_set_sensitive ("/Layers/Add Alpha Channel", !fs && !aux && lp && !lm && !alpha); diff --git a/app/gdisplay.c b/app/gdisplay.c index a04dbdd373..a303d2ac1a 100644 --- a/app/gdisplay.c +++ b/app/gdisplay.c @@ -997,12 +997,12 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) type = drawable_type (drawable); } - menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp); + menus_set_sensitive ("/Layers/Raise Layer", !fs && !aux && lp && alpha); + menus_set_sensitive ("/Layers/Lower Layer", !fs && !aux && lp && alpha); menus_set_sensitive ("/Layers/Anchor Layer", fs && !aux && lp); menus_set_sensitive ("/Layers/Merge Visible Layers", !fs && !aux && lp); menus_set_sensitive ("/Layers/Flatten Image", !fs && !aux && lp); - menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp); + menus_set_sensitive ("/Layers/Alpha To Selection", !aux && lp && alpha); menus_set_sensitive ("/Layers/Mask To Selection", !aux && lm && lp); menus_set_sensitive ("/Layers/Add Alpha Channel", !fs && !aux && lp && !lm && !alpha); diff --git a/app/gui/layers-dialog.c b/app/gui/layers-dialog.c index 57c7e431b4..ff909b9950 100644 --- a/app/gui/layers-dialog.c +++ b/app/gui/layers-dialog.c @@ -1165,11 +1165,11 @@ layers_dialog_set_menu_sensitivity () gtk_widget_set_sensitive (layers_ops[0].widget, gimage); ops_button_set_sensitive (layers_ops_buttons[0], gimage); /* raise layer */ - gtk_widget_set_sensitive (layers_ops[1].widget, fs && ac && gimage && lp); - ops_button_set_sensitive (layers_ops_buttons[1], fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[1].widget, fs && ac && gimage && lp && alpha); + ops_button_set_sensitive (layers_ops_buttons[1], fs && ac && gimage && lp && alpha); /* lower layer */ - gtk_widget_set_sensitive (layers_ops[2].widget, fs && ac && gimage && lp); - ops_button_set_sensitive (layers_ops_buttons[2], fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[2].widget, fs && ac && gimage && lp && alpha); + ops_button_set_sensitive (layers_ops_buttons[2], fs && ac && gimage && lp && alpha); /* duplicate layer */ gtk_widget_set_sensitive (layers_ops[3].widget, fs && ac && gimage && lp); ops_button_set_sensitive (layers_ops_buttons[3], fs && ac && gimage && lp); @@ -1192,7 +1192,7 @@ layers_dialog_set_menu_sensitivity () /* flatten image */ gtk_widget_set_sensitive (layers_ops[11].widget, fs && ac && gimage && lp); /* alpha select */ - gtk_widget_set_sensitive (layers_ops[12].widget, fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[12].widget, fs && ac && gimage && lp && alpha); /* mask select */ gtk_widget_set_sensitive (layers_ops[13].widget, fs && ac && gimage && lm && lp); /* add alpha */ diff --git a/app/layers_dialog.c b/app/layers_dialog.c index 57c7e431b4..ff909b9950 100644 --- a/app/layers_dialog.c +++ b/app/layers_dialog.c @@ -1165,11 +1165,11 @@ layers_dialog_set_menu_sensitivity () gtk_widget_set_sensitive (layers_ops[0].widget, gimage); ops_button_set_sensitive (layers_ops_buttons[0], gimage); /* raise layer */ - gtk_widget_set_sensitive (layers_ops[1].widget, fs && ac && gimage && lp); - ops_button_set_sensitive (layers_ops_buttons[1], fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[1].widget, fs && ac && gimage && lp && alpha); + ops_button_set_sensitive (layers_ops_buttons[1], fs && ac && gimage && lp && alpha); /* lower layer */ - gtk_widget_set_sensitive (layers_ops[2].widget, fs && ac && gimage && lp); - ops_button_set_sensitive (layers_ops_buttons[2], fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[2].widget, fs && ac && gimage && lp && alpha); + ops_button_set_sensitive (layers_ops_buttons[2], fs && ac && gimage && lp && alpha); /* duplicate layer */ gtk_widget_set_sensitive (layers_ops[3].widget, fs && ac && gimage && lp); ops_button_set_sensitive (layers_ops_buttons[3], fs && ac && gimage && lp); @@ -1192,7 +1192,7 @@ layers_dialog_set_menu_sensitivity () /* flatten image */ gtk_widget_set_sensitive (layers_ops[11].widget, fs && ac && gimage && lp); /* alpha select */ - gtk_widget_set_sensitive (layers_ops[12].widget, fs && ac && gimage && lp); + gtk_widget_set_sensitive (layers_ops[12].widget, fs && ac && gimage && lp && alpha); /* mask select */ gtk_widget_set_sensitive (layers_ops[13].widget, fs && ac && gimage && lm && lp); /* add alpha */