[gimp] app: reorder arguments of layer,channel,vectors_dialog_new()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: reorder arguments of layer,channel,vectors_dialog_new()
- Date: Sat, 24 Sep 2016 14:05:58 +0000 (UTC)
commit aba0b03b920601dbbc46d376a876668bf0565969
Author: Michael Natterer <mitch gimp org>
Date: Sat Sep 24 16:04:13 2016 +0200
app: reorder arguments of layer,channel,vectors_dialog_new()
So common ones are before dialog-specific ones.
app/actions/channels-commands.c | 8 ++++----
app/actions/layers-commands.c | 12 ++++++------
app/actions/quick-mask-commands.c | 8 ++++----
app/actions/vectors-commands.c | 8 ++++----
app/dialogs/channel-options-dialog.c | 6 +++---
app/dialogs/channel-options-dialog.h | 4 ++--
app/dialogs/layer-options-dialog.c | 6 +++---
app/dialogs/layer-options-dialog.h | 6 +++---
app/dialogs/vectors-options-dialog.c | 4 ++--
app/dialogs/vectors-options-dialog.h | 4 ++--
10 files changed, 33 insertions(+), 33 deletions(-)
---
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 2c7745d..068e1e2 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -78,13 +78,13 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
options = channel_options_dialog_new (image, channel,
action_data_get_context (data),
widget,
- &channel->color,
- gimp_object_get_name (channel),
_("Channel Attributes"),
"gimp-channel-edit",
"gtk-edit",
_("Edit Channel Attributes"),
GIMP_HELP_CHANNEL_EDIT,
+ &channel->color,
+ gimp_object_get_name (channel),
_("Edit Channel Color"),
_("_Fill opacity:"),
FALSE);
@@ -112,13 +112,13 @@ channels_new_cmd_callback (GtkAction *action,
options = channel_options_dialog_new (image, NULL,
action_data_get_context (data),
widget,
- &config->channel_new_color,
- config->channel_new_name,
_("New Channel"),
"gimp-channel-new",
GIMP_STOCK_CHANNEL,
_("New Channel Options"),
GIMP_HELP_CHANNEL_NEW,
+ &config->channel_new_color,
+ config->channel_new_name,
_("New Channel Color"),
_("_Fill opacity:"),
TRUE);
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index 2eb92c9..31439bf 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -211,13 +211,13 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
layer,
action_data_get_context (data),
widget,
- gimp_object_get_name (layer),
- config->layer_new_fill_type,
_("Layer Attributes"),
"gimp-layer-edit",
"gtk-edit",
_("Edit Layer Attributes"),
- GIMP_HELP_LAYER_EDIT);
+ GIMP_HELP_LAYER_EDIT,
+ gimp_object_get_name (layer),
+ config->layer_new_fill_type);
g_signal_connect (dialog->dialog, "response",
G_CALLBACK (layers_edit_layer_response),
@@ -263,13 +263,13 @@ layers_new_cmd_callback (GtkAction *action,
dialog = layer_options_dialog_new (image, NULL,
action_data_get_context (data),
widget,
- config->layer_new_name,
- config->layer_new_fill_type,
_("New Layer"),
"gimp-layer-new",
GIMP_STOCK_LAYER,
_("Create a New Layer"),
- GIMP_HELP_LAYER_NEW);
+ GIMP_HELP_LAYER_NEW,
+ config->layer_new_name,
+ config->layer_new_fill_type);
g_signal_connect (dialog->dialog, "response",
G_CALLBACK (layers_new_layer_response),
diff --git a/app/actions/quick-mask-commands.c b/app/actions/quick-mask-commands.c
index b30890d..fd8465a 100644
--- a/app/actions/quick-mask-commands.c
+++ b/app/actions/quick-mask-commands.c
@@ -100,14 +100,14 @@ quick_mask_configure_cmd_callback (GtkAction *action,
options = channel_options_dialog_new (image, NULL,
action_data_get_context (data),
widget,
- &color,
- NULL,
- _("Quick Mask Attributes"),
+ _("Quick Mask Attributes"),
"gimp-quick-mask-edit",
GIMP_STOCK_QUICK_MASK_ON,
_("Edit Quick Mask Attributes"),
GIMP_HELP_QUICK_MASK_EDIT,
- _("Edit Quick Mask Color"),
+ &color,
+ NULL,
+ _("Edit Quick Mask Color"),
_("_Mask opacity:"),
FALSE);
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 3e05a42..6ae3a2e 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -137,12 +137,12 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
options = vectors_options_dialog_new (image, vectors,
action_data_get_context (data),
widget,
- gimp_object_get_name (vectors),
_("Path Attributes"),
"gimp-vectors-edit",
"gtk-edit",
_("Edit Path Attributes"),
- GIMP_HELP_PATH_EDIT);
+ GIMP_HELP_PATH_EDIT,
+ gimp_object_get_name (vectors));
g_signal_connect (options->dialog, "response",
G_CALLBACK (vectors_edit_vectors_response),
@@ -167,12 +167,12 @@ vectors_new_cmd_callback (GtkAction *action,
options = vectors_options_dialog_new (image, NULL,
action_data_get_context (data),
widget,
- config->vectors_new_name,
_("New Path"),
"gimp-vectors-new",
GIMP_STOCK_PATH,
_("New Path Options"),
- GIMP_HELP_PATH_NEW);
+ GIMP_HELP_PATH_NEW,
+ config->vectors_new_name);
g_signal_connect (options->dialog, "response",
G_CALLBACK (vectors_new_vectors_response),
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 98c16c6..5c7f97a 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -53,13 +53,13 @@ channel_options_dialog_new (GimpImage *image,
GimpChannel *channel,
GimpContext *context,
GtkWidget *parent,
- const GimpRGB *channel_color,
- const gchar *channel_name,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id,
+ const GimpRGB *channel_color,
+ const gchar *channel_name,
const gchar *color_label,
const gchar *opacity_label,
gboolean show_from_sel)
@@ -75,12 +75,12 @@ channel_options_dialog_new (GimpImage *image,
g_return_val_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
- g_return_val_if_fail (channel_color != NULL, NULL);
g_return_val_if_fail (title != NULL, NULL);
g_return_val_if_fail (role != NULL, NULL);
g_return_val_if_fail (icon_name != NULL, NULL);
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL);
+ g_return_val_if_fail (channel_color != NULL, NULL);
g_return_val_if_fail (color_label != NULL, NULL);
g_return_val_if_fail (opacity_label != NULL, NULL);
diff --git a/app/dialogs/channel-options-dialog.h b/app/dialogs/channel-options-dialog.h
index 803bbcd..be58065 100644
--- a/app/dialogs/channel-options-dialog.h
+++ b/app/dialogs/channel-options-dialog.h
@@ -38,13 +38,13 @@ ChannelOptionsDialog * channel_options_dialog_new (GimpImage *image,
GimpChannel *channel,
GimpContext *context,
GtkWidget *parent,
- const GimpRGB *channel_color,
- const gchar *channel_name,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
const gchar *help_id,
+ const GimpRGB *channel_color,
+ const gchar *channel_name,
const gchar *color_label,
const gchar *opacity_label,
gboolean show_from_sel);
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index 3b67307..0fd69ea 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -55,13 +55,13 @@ layer_options_dialog_new (GimpImage *image,
GimpLayer *layer,
GimpContext *context,
GtkWidget *parent,
- const gchar *layer_name,
- GimpFillType layer_fill_type,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
- const gchar *help_id)
+ const gchar *help_id,
+ const gchar *layer_name,
+ GimpFillType layer_fill_type)
{
LayerOptionsDialog *options;
GimpViewable *viewable;
diff --git a/app/dialogs/layer-options-dialog.h b/app/dialogs/layer-options-dialog.h
index ad64307..f9c7ca4 100644
--- a/app/dialogs/layer-options-dialog.h
+++ b/app/dialogs/layer-options-dialog.h
@@ -42,13 +42,13 @@ LayerOptionsDialog * layer_options_dialog_new (GimpImage *image,
GimpLayer *layer,
GimpContext *context,
GtkWidget *parent,
- const gchar *layer_name,
- GimpFillType layer_fill_type,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
- const gchar *help_id);
+ const gchar *help_id,
+ const gchar *layer_name,
+ GimpFillType layer_fill_type);
#endif /* __LAYER_OPTIONS_DIALOG_H__ */
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
index e4a28f3..72e9057 100644
--- a/app/dialogs/vectors-options-dialog.c
+++ b/app/dialogs/vectors-options-dialog.c
@@ -46,12 +46,12 @@ vectors_options_dialog_new (GimpImage *image,
GimpVectors *vectors,
GimpContext *context,
GtkWidget *parent,
- const gchar *vectors_name,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
- const gchar *help_id)
+ const gchar *help_id,
+ const gchar *vectors_name)
{
VectorsOptionsDialog *options;
GimpViewable *viewable;
diff --git a/app/dialogs/vectors-options-dialog.h b/app/dialogs/vectors-options-dialog.h
index 66baa4a..20e77cb 100644
--- a/app/dialogs/vectors-options-dialog.h
+++ b/app/dialogs/vectors-options-dialog.h
@@ -35,12 +35,12 @@ VectorsOptionsDialog * vectors_options_dialog_new (GimpImage *image,
GimpVectors *vectors,
GimpContext *context,
GtkWidget *parent,
- const gchar *vectors_name,
const gchar *title,
const gchar *role,
const gchar *icon_name,
const gchar *desc,
- const gchar *help_id);
+ const gchar *help_id,
+ const gchar *vectors_name);
#endif /* __VECTORS_OPTIONS_DIALOG_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
