diff options
Diffstat (limited to 'tikzit/src/linux/NodeStylesPalette.m')
| -rw-r--r-- | tikzit/src/linux/NodeStylesPalette.m | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/tikzit/src/linux/NodeStylesPalette.m b/tikzit/src/linux/NodeStylesPalette.m index 24a5729..d5ac2e1 100644 --- a/tikzit/src/linux/NodeStylesPalette.m +++ b/tikzit/src/linux/NodeStylesPalette.m @@ -66,27 +66,25 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette if (self) { document = nil; selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; - editor = [[NodeStyleEditor alloc] init]; + editor = [[NodeStyleEditor alloc] init]; palette = gtk_vbox_new (FALSE, 0); - // FIXME: remove this line when we add edge styles - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - gtk_box_set_spacing (GTK_BOX (palette), 6); - g_object_ref_sink (palette); - - gtk_box_pack_start (GTK_BOX (palette), [editor widget], FALSE, FALSE, 0); - gtk_widget_show ([editor widget]); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorFrame), [selector widget]); - gtk_box_pack_start (GTK_BOX (palette), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); + gtk_box_set_spacing (GTK_BOX (palette), 6); + g_object_ref_sink (palette); + + gtk_box_pack_start (GTK_BOX (palette), [editor widget], FALSE, FALSE, 0); + gtk_widget_show ([editor widget]); + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (selectorFrame), [selector widget]); + gtk_box_pack_start (GTK_BOX (palette), selectorFrame, TRUE, TRUE, 0); + gtk_widget_show (selectorFrame); + gtk_widget_show ([selector widget]); GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 5)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); GtkBox *bbox1 = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (buttonBox, GTK_WIDGET (bbox1), FALSE, FALSE, 0); + gtk_box_pack_start (buttonBox, GTK_WIDGET (bbox1), FALSE, FALSE, 0); GtkWidget *addStyleButton = gtk_button_new (); gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); @@ -99,7 +97,7 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette self); removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); + g_object_ref_sink (removeStyleButton); gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); @@ -110,10 +108,10 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette self); GtkBox *bbox2 = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (buttonBox, GTK_WIDGET (bbox2), FALSE, FALSE, 0); + gtk_box_pack_start (buttonBox, GTK_WIDGET (bbox2), FALSE, FALSE, 0); applyStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyStyleButton); + g_object_ref_sink (applyStyleButton); gtk_widget_set_tooltip_text (applyStyleButton, "Apply style to selected nodes"); gtk_box_pack_start (bbox2, applyStyleButton, FALSE, FALSE, 5); g_signal_connect (G_OBJECT (applyStyleButton), @@ -122,7 +120,7 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette self); clearStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearStyleButton); + g_object_ref_sink (clearStyleButton); gtk_widget_set_tooltip_text (clearStyleButton, "Clear style from selected nodes"); gtk_box_pack_start (bbox2, clearStyleButton, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (clearStyleButton), @@ -130,14 +128,14 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette G_CALLBACK (clear_style_button_cb), self); - gtk_widget_show_all (GTK_WIDGET (buttonBox)); + gtk_widget_show_all (GTK_WIDGET (buttonBox)); [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectedStyleChanged:) name:@"SelectedStyleChanged" object:selector]; - [self updateButtonState]; + [self updateButtonState]; } return self; @@ -179,10 +177,10 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette [editor release]; [selector release]; [document release]; - g_object_unref (palette); - g_object_unref (removeStyleButton); - g_object_unref (applyStyleButton); - g_object_unref (clearStyleButton); + g_object_unref (palette); + g_object_unref (removeStyleButton); + g_object_unref (applyStyleButton); + g_object_unref (clearStyleButton); [super dealloc]; } @@ -194,7 +192,7 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette @implementation NodeStylesPalette (Notifications) - (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; + [editor setStyle:[selector selectedStyle]]; [self updateButtonState]; } @@ -213,7 +211,7 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette gtk_widget_set_sensitive (applyStyleButton, hasNodeSelection && hasStyleSelection); gtk_widget_set_sensitive (clearStyleButton, hasNodeSelection); - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); + gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); } - (void) removeSelectedStyle { @@ -278,4 +276,4 @@ static void clear_style_button_cb (GtkButton *widget, NodeStylesPalette *palette // }}} -// vim:ft=objc:ts=4:noet:sts=4:sw=4:foldmethod=marker +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker |