[gimp/wip/Jehan/layers-dockable-refresh: 56/58] app: remove the "Linked" switch from the item options dialog.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/layers-dockable-refresh: 56/58] app: remove the "Linked" switch from the item options dialog.
- Date: Fri, 22 Oct 2021 21:36:51 +0000 (UTC)
commit dc25c176ecde7dd1ef99b5f5babbe3cf6b51491c
Author: Jehan <jehan girinstud io>
Date: Thu Oct 21 18:59:36 2021 +0200
app: remove the "Linked" switch from the item options dialog.
app/actions/channels-commands.c | 11 -----------
app/actions/layers-commands.c | 11 -----------
app/actions/quick-mask-commands.c | 3 ---
app/actions/vectors-commands.c | 11 -----------
app/dialogs/channel-options-dialog.c | 5 -----
app/dialogs/channel-options-dialog.h | 2 --
app/dialogs/item-options-dialog.c | 13 -------------
app/dialogs/item-options-dialog.h | 2 --
app/dialogs/layer-options-dialog.c | 5 -----
app/dialogs/layer-options-dialog.h | 2 --
app/dialogs/vectors-options-dialog.c | 5 -----
app/dialogs/vectors-options-dialog.h | 2 --
12 files changed, 72 deletions(-)
---
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 463d3b9177..54014fc8ee 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -68,7 +68,6 @@ static void channels_new_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -81,7 +80,6 @@ static void channels_edit_attributes_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -124,7 +122,6 @@ channels_edit_attributes_cmd_callback (GimpAction *action,
gimp_object_get_name (channel),
&channel->color,
gimp_item_get_visible (item),
- gimp_item_get_linked (item),
gimp_item_get_color_tag (item),
gimp_item_get_lock_content (item),
gimp_item_get_lock_position (item),
@@ -170,7 +167,6 @@ channels_new_cmd_callback (GimpAction *action,
config->channel_new_name,
&config->channel_new_color,
TRUE,
- FALSE,
GIMP_COLOR_TAG_NONE,
FALSE,
FALSE,
@@ -612,7 +608,6 @@ channels_new_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -649,7 +644,6 @@ channels_new_callback (GtkWidget *dialog,
}
gimp_item_set_visible (GIMP_ITEM (channel), channel_visible, FALSE);
- gimp_item_set_linked (GIMP_ITEM (channel), channel_linked, FALSE);
gimp_item_set_color_tag (GIMP_ITEM (channel), channel_color_tag, FALSE);
gimp_item_set_lock_content (GIMP_ITEM (channel), channel_lock_content, FALSE);
gimp_item_set_lock_position (GIMP_ITEM (channel), channel_lock_position, FALSE);
@@ -670,7 +664,6 @@ channels_edit_attributes_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -681,7 +674,6 @@ channels_edit_attributes_callback (GtkWidget *dialog,
if (strcmp (channel_name, gimp_object_get_name (channel)) ||
gimp_rgba_distance (channel_color, &channel->color) > RGBA_EPSILON ||
channel_visible != gimp_item_get_visible (item) ||
- channel_linked != gimp_item_get_linked (item) ||
channel_color_tag != gimp_item_get_color_tag (item) ||
channel_lock_content != gimp_item_get_lock_content (item) ||
channel_lock_position != gimp_item_get_lock_position (item))
@@ -699,9 +691,6 @@ channels_edit_attributes_callback (GtkWidget *dialog,
if (channel_visible != gimp_item_get_visible (item))
gimp_item_set_visible (item, channel_visible, TRUE);
- if (channel_linked != gimp_item_get_linked (item))
- gimp_item_set_linked (item, channel_linked, TRUE);
-
if (channel_color_tag != gimp_item_get_color_tag (item))
gimp_item_set_color_tag (item, channel_color_tag, TRUE);
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index c3b6bc2a34..6d0339bd92 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -105,7 +105,6 @@ static void layers_new_callback (GtkWidget *dialog,
gint layer_offset_x,
gint layer_offset_y,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_pixels,
gboolean layer_lock_position,
@@ -128,7 +127,6 @@ static void layers_edit_attributes_callback (GtkWidget *dialog,
gint layer_offset_x,
gint layer_offset_y,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_pixels,
gboolean layer_lock_position,
@@ -279,7 +277,6 @@ layers_edit_attributes_cmd_callback (GimpAction *action,
gimp_layer_get_opacity (layer),
0 /* unused */,
gimp_item_get_visible (item),
- gimp_item_get_linked (item),
gimp_item_get_color_tag (item),
gimp_item_get_lock_content (item),
gimp_item_get_lock_position (item),
@@ -364,7 +361,6 @@ layers_new_cmd_callback (GimpAction *action,
config->layer_new_opacity,
config->layer_new_fill_type,
TRUE,
- FALSE,
GIMP_COLOR_TAG_NONE,
FALSE,
FALSE,
@@ -2226,7 +2222,6 @@ layers_new_callback (GtkWidget *dialog,
gint layer_offset_x,
gint layer_offset_y,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_pixels,
gboolean layer_lock_position,
@@ -2294,7 +2289,6 @@ layers_new_callback (GtkWidget *dialog,
gimp_drawable_fill (GIMP_DRAWABLE (layer), context,
config->layer_new_fill_type);
gimp_item_set_visible (GIMP_ITEM (layer), layer_visible, FALSE);
- gimp_item_set_linked (GIMP_ITEM (layer), layer_linked, FALSE);
gimp_item_set_color_tag (GIMP_ITEM (layer), layer_color_tag, FALSE);
gimp_item_set_lock_content (GIMP_ITEM (layer), layer_lock_pixels,
FALSE);
@@ -2341,7 +2335,6 @@ layers_edit_attributes_callback (GtkWidget *dialog,
gint layer_offset_x,
gint layer_offset_y,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_pixels,
gboolean layer_lock_position,
@@ -2360,7 +2353,6 @@ layers_edit_attributes_callback (GtkWidget *dialog,
layer_offset_x != gimp_item_get_offset_x (item) ||
layer_offset_y != gimp_item_get_offset_y (item) ||
layer_visible != gimp_item_get_visible (item) ||
- layer_linked != gimp_item_get_linked (item) ||
layer_color_tag != gimp_item_get_color_tag (item) ||
layer_lock_pixels != gimp_item_get_lock_content (item) ||
layer_lock_position != gimp_item_get_lock_position (item) ||
@@ -2410,9 +2402,6 @@ layers_edit_attributes_callback (GtkWidget *dialog,
if (layer_visible != gimp_item_get_visible (item))
gimp_item_set_visible (item, layer_visible, TRUE);
- if (layer_linked != gimp_item_get_linked (item))
- gimp_item_set_linked (item, layer_linked, TRUE);
-
if (layer_color_tag != gimp_item_get_color_tag (item))
gimp_item_set_color_tag (item, layer_color_tag, TRUE);
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
index 3ea9d01ca7..f8e244821d 100644
--- a/app/actions/quick-mask-commands.c
+++ b/app/actions/quick-mask-commands.c
@@ -55,7 +55,6 @@ static void quick_mask_configure_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -135,7 +134,6 @@ quick_mask_configure_cmd_callback (GimpAction *action,
NULL,
&color,
FALSE,
- FALSE,
GIMP_COLOR_TAG_NONE,
FALSE,
FALSE,
@@ -162,7 +160,6 @@ quick_mask_configure_callback (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 2cb3872ed8..43f524bcec 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -77,7 +77,6 @@ static void vectors_new_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -88,7 +87,6 @@ static void vectors_edit_attributes_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -168,7 +166,6 @@ vectors_edit_attributes_cmd_callback (GimpAction *action,
GIMP_HELP_PATH_EDIT,
gimp_object_get_name (vectors),
gimp_item_get_visible (item),
- gimp_item_get_linked (item),
gimp_item_get_color_tag (item),
gimp_item_get_lock_content (item),
gimp_item_get_lock_position (item),
@@ -210,7 +207,6 @@ vectors_new_cmd_callback (GimpAction *action,
GIMP_HELP_PATH_NEW,
config->vectors_new_name,
FALSE,
- FALSE,
GIMP_COLOR_TAG_NONE,
FALSE,
FALSE,
@@ -693,7 +689,6 @@ vectors_new_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -707,7 +702,6 @@ vectors_new_callback (GtkWidget *dialog,
vectors = gimp_vectors_new (image, config->vectors_new_name);
gimp_item_set_visible (GIMP_ITEM (vectors), vectors_visible, FALSE);
- gimp_item_set_linked (GIMP_ITEM (vectors), vectors_linked, FALSE);
gimp_item_set_color_tag (GIMP_ITEM (vectors), vectors_color_tag, FALSE);
gimp_item_set_lock_content (GIMP_ITEM (vectors), vectors_lock_content, FALSE);
gimp_item_set_lock_position (GIMP_ITEM (vectors), vectors_lock_position, FALSE);
@@ -726,7 +720,6 @@ vectors_edit_attributes_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -736,7 +729,6 @@ vectors_edit_attributes_callback (GtkWidget *dialog,
if (strcmp (vectors_name, gimp_object_get_name (vectors)) ||
vectors_visible != gimp_item_get_visible (item) ||
- vectors_linked != gimp_item_get_linked (item) ||
vectors_color_tag != gimp_item_get_color_tag (item) ||
vectors_lock_content != gimp_item_get_lock_content (item) ||
vectors_lock_position != gimp_item_get_lock_position (item))
@@ -751,9 +743,6 @@ vectors_edit_attributes_callback (GtkWidget *dialog,
if (vectors_visible != gimp_item_get_visible (item))
gimp_item_set_visible (item, vectors_visible, TRUE);
- if (vectors_linked != gimp_item_get_linked (item))
- gimp_item_set_linked (item, vectors_linked, TRUE);
-
if (vectors_color_tag != gimp_item_get_color_tag (item))
gimp_item_set_color_tag (item, vectors_color_tag, TRUE);
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 4a6cd3c014..368cdefa94 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -60,7 +60,6 @@ static void channel_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -89,7 +88,6 @@ channel_options_dialog_new (GimpImage *image,
const gchar *channel_name,
const GimpRGB *channel_color,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -129,7 +127,6 @@ channel_options_dialog_new (GimpImage *image,
_("Lock position and _size"),
channel_name,
channel_visible,
- channel_linked,
channel_color_tag,
channel_lock_content,
channel_lock_position,
@@ -192,7 +189,6 @@ channel_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -217,7 +213,6 @@ channel_options_dialog_callback (GtkWidget *dialog,
&color,
save_selection,
item_visible,
- item_linked,
item_color_tag,
item_lock_content,
item_lock_position,
diff --git a/app/dialogs/channel-options-dialog.h b/app/dialogs/channel-options-dialog.h
index a1de49075a..ae40e8cf8e 100644
--- a/app/dialogs/channel-options-dialog.h
+++ b/app/dialogs/channel-options-dialog.h
@@ -27,7 +27,6 @@ typedef void (* GimpChannelOptionsCallback) (GtkWidget *dialog,
const GimpRGB *channel_color,
gboolean save_selection,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
@@ -49,7 +48,6 @@ GtkWidget * channel_options_dialog_new (GimpImage *image,
const gchar *channel_name,
const GimpRGB *channel_color,
gboolean channel_visible,
- gboolean channel_linked,
GimpColorTag channel_color_tag,
gboolean channel_lock_content,
gboolean channel_lock_position,
diff --git a/app/dialogs/item-options-dialog.c b/app/dialogs/item-options-dialog.c
index cc7e7389f7..46f4a8ea57 100644
--- a/app/dialogs/item-options-dialog.c
+++ b/app/dialogs/item-options-dialog.c
@@ -48,7 +48,6 @@ struct _ItemOptionsDialog
GimpItem *item;
GimpContext *context;
gboolean visible;
- gboolean linked;
GimpColorTag color_tag;
gboolean lock_content;
gboolean lock_position;
@@ -94,7 +93,6 @@ item_options_dialog_new (GimpImage *image,
const gchar *lock_position_label,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -125,7 +123,6 @@ item_options_dialog_new (GimpImage *image,
private->item = item;
private->context = context;
private->visible = item_visible;
- private->linked = item_linked;
private->color_tag = item_color_tag;
private->lock_content = item_lock_content;
private->lock_position = item_lock_position;
@@ -268,15 +265,6 @@ item_options_dialog_new (GimpImage *image,
G_CALLBACK (gimp_toggle_button_update),
&private->visible);
- button = check_button_with_icon_new (_("_Linked"),
- GIMP_ICON_LINKED,
- GTK_BOX (private->right_vbox));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
- private->linked);
- g_signal_connect (button, "toggled",
- G_CALLBACK (gimp_toggle_button_update),
- &private->linked);
-
button = check_button_with_icon_new (lock_content_label,
lock_content_icon_name,
GTK_BOX (private->right_vbox));
@@ -448,7 +436,6 @@ item_options_dialog_response (GtkWidget *dialog,
private->context,
name,
private->visible,
- private->linked,
private->color_tag,
private->lock_content,
private->lock_position,
diff --git a/app/dialogs/item-options-dialog.h b/app/dialogs/item-options-dialog.h
index b577047255..160fc02589 100644
--- a/app/dialogs/item-options-dialog.h
+++ b/app/dialogs/item-options-dialog.h
@@ -25,7 +25,6 @@ typedef void (* GimpItemOptionsCallback) (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -47,7 +46,6 @@ GtkWidget * item_options_dialog_new (GimpImage *image,
const gchar *lock_position_label,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index 47ad440124..566a5026ec 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -81,7 +81,6 @@ static void layer_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -115,7 +114,6 @@ layer_options_dialog_new (GimpImage *image,
gdouble layer_opacity,
GimpFillType layer_fill_type,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_content,
gboolean layer_lock_position,
@@ -169,7 +167,6 @@ layer_options_dialog_new (GimpImage *image,
_("Lock position and _size"),
layer_name,
layer_visible,
- layer_linked,
layer_color_tag,
layer_lock_content,
layer_lock_position,
@@ -459,7 +456,6 @@ layer_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -504,7 +500,6 @@ layer_options_dialog_callback (GtkWidget *dialog,
offset_x,
offset_y,
item_visible,
- item_linked,
item_color_tag,
item_lock_content,
item_lock_position,
diff --git a/app/dialogs/layer-options-dialog.h b/app/dialogs/layer-options-dialog.h
index ceb0502ba9..ca9235266b 100644
--- a/app/dialogs/layer-options-dialog.h
+++ b/app/dialogs/layer-options-dialog.h
@@ -35,7 +35,6 @@ typedef void (* GimpLayerOptionsCallback) (GtkWidget *dialog,
gint layer_offset_x,
gint layer_offset_y,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_content,
gboolean layer_lock_position,
@@ -61,7 +60,6 @@ GtkWidget * layer_options_dialog_new (GimpImage *image,
gdouble layer_opacity,
GimpFillType layer_fill_type,
gboolean layer_visible,
- gboolean layer_linked,
GimpColorTag layer_color_tag,
gboolean layer_lock_content,
gboolean layer_lock_position,
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
index 3b00be02c5..d58dac0959 100644
--- a/app/dialogs/vectors-options-dialog.c
+++ b/app/dialogs/vectors-options-dialog.c
@@ -53,7 +53,6 @@ static void vectors_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -74,7 +73,6 @@ vectors_options_dialog_new (GimpImage *image,
const gchar *help_id,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -109,7 +107,6 @@ vectors_options_dialog_new (GimpImage *image,
_("Lock path _position"),
vectors_name,
vectors_visible,
- vectors_linked,
vectors_color_tag,
vectors_lock_content,
vectors_lock_position,
@@ -138,7 +135,6 @@ vectors_options_dialog_callback (GtkWidget *dialog,
GimpContext *context,
const gchar *item_name,
gboolean item_visible,
- gboolean item_linked,
GimpColorTag item_color_tag,
gboolean item_lock_content,
gboolean item_lock_position,
@@ -152,7 +148,6 @@ vectors_options_dialog_callback (GtkWidget *dialog,
context,
item_name,
item_visible,
- item_linked,
item_color_tag,
item_lock_content,
item_lock_position,
diff --git a/app/dialogs/vectors-options-dialog.h b/app/dialogs/vectors-options-dialog.h
index 00f5a32758..39fa73a030 100644
--- a/app/dialogs/vectors-options-dialog.h
+++ b/app/dialogs/vectors-options-dialog.h
@@ -25,7 +25,6 @@ typedef void (* GimpVectorsOptionsCallback) (GtkWidget *dialog,
GimpContext *context,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
@@ -43,7 +42,6 @@ GtkWidget * vectors_options_dialog_new (GimpImage *image,
const gchar *help_id,
const gchar *vectors_name,
gboolean vectors_visible,
- gboolean vectors_linked,
GimpColorTag vectors_color_tag,
gboolean vectors_lock_content,
gboolean vectors_lock_position,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
