procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 17:59:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: fix code formatting and UI packing

Browse source
This commit is contained in:
Michael Natterer 2010-02-22 10:35:43 +01:00
parent 652c6756c4
commit ba6a7d33ff
4 changed files with 63 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

85
app/widgets/gimpdynamicseditor.c
View file

@ -109,12 +109,12 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
G_CALLBACK (gimp_dynamics_editor_notify_model), G_CALLBACK (gimp_dynamics_editor_notify_model),
editor); editor);
editor->view_selector = gimp_enum_combo_box_new (GIMP_TYPE_DYNAMICS_OUTPUT_TYPE); editor->view_selector =
gtk_box_pack_start (GTK_BOX (data_editor), editor->view_selector, TRUE, TRUE, 0); gimp_enum_combo_box_new (GIMP_TYPE_DYNAMICS_OUTPUT_TYPE);
gtk_box_pack_start (GTK_BOX (data_editor), editor->view_selector,
FALSE, FALSE, 0);
gtk_widget_show (editor->view_selector); gtk_widget_show (editor->view_selector);
editor->notebook = gtk_notebook_new (); editor->notebook = gtk_notebook_new ();
gtk_notebook_set_show_border (GTK_NOTEBOOK (editor->notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (editor->notebook), FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (editor->notebook), FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (editor->notebook), FALSE);
@ -123,12 +123,12 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
editor->check_grid = gtk_table_new (10, n_inputs + 2, FALSE); editor->check_grid = gtk_table_new (10, n_inputs + 2, FALSE);
gimp_dynamics_editor_init_output_editors(dynamics, gimp_dynamics_editor_init_output_editors (dynamics,
editor->view_selector, editor->view_selector,
editor->notebook, editor->notebook,
editor->check_grid); editor->check_grid);
frame = gtk_frame_new(_("Mapping matrix")); frame = gimp_frame_new (_("Mapping matrix"));
gtk_notebook_append_page (GTK_NOTEBOOK (editor->notebook), frame, NULL); gtk_notebook_append_page (GTK_NOTEBOOK (editor->notebook), frame, NULL);
gtk_widget_show (frame); gtk_widget_show (frame);
@ -138,7 +138,7 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
GIMP_INT_STORE_USER_DATA, frame, GIMP_INT_STORE_USER_DATA, frame,
-1); -1);
gimp_int_combo_box_set_active(GIMP_INT_COMBO_BOX (editor->view_selector), -1); gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (editor->view_selector), -1);
gtk_container_add (GTK_CONTAINER (frame), editor->check_grid); gtk_container_add (GTK_CONTAINER (frame), editor->check_grid);
gtk_widget_show (editor->check_grid); gtk_widget_show (editor->check_grid);
@ -158,11 +158,11 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
for (i = 0; i < n_inputs; i++) for (i = 0; i < n_inputs; i++)
{ {
gtk_label_set_angle (GTK_LABEL (input_labels[i]), gtk_label_set_angle (GTK_LABEL (input_labels[i]), 90);
90);
gtk_misc_set_alignment (GTK_MISC (input_labels[i]), 1.0, 1.0); gtk_misc_set_alignment (GTK_MISC (input_labels[i]), 1.0, 1.0);
gtk_table_attach (GTK_TABLE(editor->check_grid), input_labels[i], i + 1, i + 2, 0, 1, gtk_table_attach (GTK_TABLE(editor->check_grid), input_labels[i],
i + 1, i + 2, 0, 1,
GTK_SHRINK, GTK_SHRINK, 0, 0); GTK_SHRINK, GTK_SHRINK, 0, 0);
gtk_widget_show (input_labels[i]); gtk_widget_show (input_labels[i]);
} }
@ -356,7 +356,7 @@ gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
GtkWidget *notebook, GtkWidget *notebook,
GtkWidget *check_grid) GtkWidget *check_grid)
{ {
GimpIntStore *list = GIMP_INT_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(view_selector))); GimpIntStore *list = GIMP_INT_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (view_selector)));
GtkTreeModel *model = GTK_TREE_MODEL(list); GtkTreeModel *model = GTK_TREE_MODEL(list);
GtkWidget *output_editor; GtkWidget *output_editor;
GtkTreeIter iter; GtkTreeIter iter;
@ -365,49 +365,50 @@ gimp_dynamics_editor_init_output_editors (GimpDynamics *dynamics,
for (iter_valid = gtk_tree_model_get_iter_first (model, &iter); for (iter_valid = gtk_tree_model_get_iter_first (model, &iter);
iter_valid; iter_valid;
iter_valid = gtk_tree_model_iter_next (model, &iter)) { iter_valid = gtk_tree_model_iter_next (model, &iter))
{
gint output_type;
gchar *label;
GimpDynamicsOutput *output;
gint output_type; gtk_tree_model_get (GTK_TREE_MODEL(model), &iter,
gchar *label; GIMP_INT_STORE_VALUE, &output_type,
GimpDynamicsOutput *output; GIMP_INT_STORE_LABEL, &label,
-1);
gtk_tree_model_get (GTK_TREE_MODEL(model), &iter, output = gimp_dynamics_get_output (dynamics, output_type);
GIMP_INT_STORE_VALUE, &output_type,
GIMP_INT_STORE_LABEL, &label,
-1);
output_editor = gimp_dynamics_output_editor_new (output);
output = gimp_dynamics_get_output(dynamics, output_type); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), output_editor, NULL);
gtk_widget_show (output_editor);
output_editor = gimp_dynamics_output_editor_new (output); gtk_list_store_set(GTK_LIST_STORE(list), &iter,
GIMP_INT_STORE_USER_DATA, output_editor,
-1);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), output_editor, NULL); gimp_dynamics_editor_add_output_row (G_OBJECT (output),
gtk_widget_show (output_editor); label,
GTK_TABLE (check_grid),
gtk_list_store_set(GTK_LIST_STORE(list), &iter, i);
GIMP_INT_STORE_USER_DATA, output_editor, i++;
-1);
gimp_dynamics_editor_add_output_row (G_OBJECT (output),
label,
GTK_TABLE (check_grid),
i);
i++;
g_free (label);
} }
g_signal_connect( G_OBJECT (view_selector), "changed", g_signal_connect (G_OBJECT (view_selector), "changed",
G_CALLBACK (gimp_dynamics_editor_view_changed), notebook ); G_CALLBACK (gimp_dynamics_editor_view_changed),
notebook);
} }
static void static void
gimp_dynamics_editor_view_changed (GtkComboBox *combo, gimp_dynamics_editor_view_changed (GtkComboBox *combo,
GtkWidget *notebook) GtkWidget *notebook)
{ {
GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(GTK_COMBO_BOX(combo))); GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(GTK_COMBO_BOX(combo)));
GtkTreeIter iter; GtkTreeIter iter;
gint page; gint page;
GValue value = { 0, }; GValue value = { 0, };
gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo), &iter); gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo), &iter);

1
app/widgets/gimpdynamicseditor.h
View file

@ -41,7 +41,6 @@ struct _GimpDynamicsEditor
GtkWidget *check_grid; GtkWidget *check_grid;
GtkWidget *view_selector; GtkWidget *view_selector;
GtkWidget *notebook; GtkWidget *notebook;
}; };
struct _GimpDynamicsEditorClass struct _GimpDynamicsEditorClass

49
app/widgets/gimpdynamicsoutputeditor.c
View file

@ -79,7 +79,8 @@ static void gimp_dynamics_output_editor_curve_reset (GtkWidget
GimpCurve *curve); GimpCurve *curve);
G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor, GTK_TYPE_HBOX) G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor,
GTK_TYPE_VBOX)
#define parent_class gimp_dynamics_output_editor_parent_class #define parent_class gimp_dynamics_output_editor_parent_class
@ -110,7 +111,7 @@ gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (editor); private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (editor);
gtk_box_set_spacing (GTK_BOX (editor), 6);
} }
static GObject * static GObject *
@ -121,11 +122,9 @@ gimp_dynamics_output_editor_constructor (GType type,
GObject *object; GObject *object;
GimpDynamicsOutputEditor *editor; GimpDynamicsOutputEditor *editor;
GimpDynamicsOutputEditorPrivate *private; GimpDynamicsOutputEditorPrivate *private;
GtkWidget *label;
GtkWidget *vbox; GtkWidget *view;
GtkWidget *label; GtkWidget *button;
GtkWidget *view;
GtkWidget *button;
object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params); object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
@ -134,19 +133,9 @@ gimp_dynamics_output_editor_constructor (GType type,
g_assert (GIMP_IS_DYNAMICS_OUTPUT (private->output)); g_assert (GIMP_IS_DYNAMICS_OUTPUT (private->output));
vbox = gtk_vbox_new (FALSE, 0); label = gtk_label_new ("This is pressure curve.");
gtk_box_set_spacing (GTK_BOX (vbox), 6); gtk_box_pack_start (GTK_BOX (editor), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (editor), vbox, FALSE, FALSE, 0);
gtk_widget_show(vbox);
label = gtk_label_new("This is pressure curve.");
gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
view = gimp_curve_view_new (); view = gimp_curve_view_new ();
g_object_set (view, g_object_set (view,
@ -155,16 +144,14 @@ gimp_dynamics_output_editor_constructor (GType type,
gtk_widget_set_size_request (view, gtk_widget_set_size_request (view,
CURVE_SIZE + CURVE_BORDER * 2, CURVE_SIZE + CURVE_BORDER * 2,
CURVE_SIZE + CURVE_BORDER * 2); CURVE_SIZE + CURVE_BORDER * 2);
gtk_box_pack_start (GTK_BOX(vbox), view, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (editor), view, TRUE, TRUE, 0);
gtk_widget_show (view); gtk_widget_show (view);
gimp_curve_view_set_curve (GIMP_CURVE_VIEW (view), gimp_curve_view_set_curve (GIMP_CURVE_VIEW (view),
private->output->pressure_curve); private->output->pressure_curve);
button = gtk_button_new_with_mnemonic (_("_Reset Curve")); button = gtk_button_new_with_mnemonic (_("_Reset Curve"));
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (editor), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
@ -192,9 +179,9 @@ gimp_dynamics_output_editor_finalize (GObject *object)
static void static void
gimp_dynamics_output_editor_set_property (GObject *object, gimp_dynamics_output_editor_set_property (GObject *object,
guint property_id, guint property_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GimpDynamicsOutputEditorPrivate *private; GimpDynamicsOutputEditorPrivate *private;
@ -214,9 +201,9 @@ gimp_dynamics_output_editor_set_property (GObject *object,
static void static void
gimp_dynamics_output_editor_get_property (GObject *object, gimp_dynamics_output_editor_get_property (GObject *object,
guint property_id, guint property_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GimpDynamicsOutputEditorPrivate *private; GimpDynamicsOutputEditorPrivate *private;
@ -237,7 +224,7 @@ gimp_dynamics_output_editor_get_property (GObject *object,
static void static void
gimp_dynamics_output_editor_curve_reset (GtkWidget *button, gimp_dynamics_output_editor_curve_reset (GtkWidget *button,
GimpCurve *curve) GimpCurve *curve)
{ {
gimp_curve_reset (curve, TRUE); gimp_curve_reset (curve, TRUE);
} }

4
app/widgets/gimpdynamicsoutputeditor.h
View file

@ -34,12 +34,12 @@ typedef struct _GimpDynamicsOutputEditorClass GimpDynamicsOutputEditorClass;
struct _GimpDynamicsOutputEditor struct _GimpDynamicsOutputEditor
{ {
GtkHBox parent_instance; GtkVBox parent_instance;
}; };
struct _GimpDynamicsOutputEditorClass struct _GimpDynamicsOutputEditorClass
{ {
GtkHBoxClass parent_class; GtkVBoxClass parent_class;
}; };