diff options
| author | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-17 19:09:06 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@cs.ox.ac.uk> | 2012-12-17 19:09:06 +0000 |
| commit | 58ceedc38ed430535508360adde7b5b6d76b08e6 (patch) | |
| tree | e43e8fc2e63f00ff7945bb1bd6d1c3e41b3f5e1d /tikzit/src/gtk/ContextWindow.m | |
| parent | 5ac1d383d2a89d22fbf54d688d64bf6a1036df6b (diff) | |
Allow node and edge styles to be applied to selection
Brings back some old functionality, but in a more compact way.
Diffstat (limited to 'tikzit/src/gtk/ContextWindow.m')
| -rw-r--r-- | tikzit/src/gtk/ContextWindow.m | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tikzit/src/gtk/ContextWindow.m b/tikzit/src/gtk/ContextWindow.m index c414bfc..6fbcc59 100644 --- a/tikzit/src/gtk/ContextWindow.m +++ b/tikzit/src/gtk/ContextWindow.m @@ -21,6 +21,7 @@ #import "EdgeStylesModel.h" #import "NodeStylesModel.h" #import "PropertiesPane.h" +#import "SelectionPane.h" #import "StyleManager.h" #import "gtkhelpers.h" @@ -68,6 +69,16 @@ static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], TRUE, TRUE, 0); + GtkWidget *sep = gtk_hseparator_new (); + gtk_widget_show (sep); + gtk_box_pack_start (GTK_BOX (layout), sep, + FALSE, FALSE, 0); + + selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], + FALSE, FALSE, 0); + // hack to position the context window somewhere sensible // (upper right) gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); @@ -93,6 +104,7 @@ static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event - (void) setDocument:(TikzDocument*)doc { [propsPane setDocument:doc]; + [selPane setDocument:doc]; } - (BOOL) visible { @@ -109,6 +121,7 @@ static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event - (void) loadConfiguration:(Configuration*)config { [propsPane loadConfiguration:config]; + [selPane loadConfiguration:config]; if ([config hasGroup:@"ContextWindow"]) { tz_restore_window (GTK_WINDOW (window), @@ -137,6 +150,7 @@ static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event value:[self visible]]; [propsPane saveConfiguration:config]; + [selPane saveConfiguration:config]; } @end |