From 24c26ce52aa95e4dddfaceb23025a0438ed34350 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@cs.ox.ac.uk>
Date: Tue, 11 Dec 2012 18:23:29 +0000
Subject: Remove the concept of an "active style" from StyleManager

It's all tool-based in the GTK+ interface now.
---
 tikzit/src/gtk/EdgeStyleSelector.m | 44 +++-----------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

(limited to 'tikzit/src/gtk/EdgeStyleSelector.m')

diff --git a/tikzit/src/gtk/EdgeStyleSelector.m b/tikzit/src/gtk/EdgeStyleSelector.m
index c9c9780..8c4e0df 100644
--- a/tikzit/src/gtk/EdgeStyleSelector.m
+++ b/tikzit/src/gtk/EdgeStyleSelector.m
@@ -44,7 +44,6 @@ enum {
 - (void) stylesReplaced:(NSNotification*)notification;
 - (void) styleAdded:(NSNotification*)notification;
 - (void) styleRemoved:(NSNotification*)notification;
-- (void) activeStyleChanged:(NSNotification*)notification;
 - (void) shapeDictionaryReplaced:(NSNotification*)n;
 - (void) selectionChanged;
 - (void) observeValueForKeyPath:(NSString*)keyPath
@@ -60,7 +59,6 @@ enum {
 - (GdkPixbuf*) pixbufFromSurface:(cairo_surface_t*)surface;
 - (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface;
 - (void) addStyle:(EdgeStyle*)style;
-- (void) postSelectedStyleChanged;
 - (void) observeStyle:(EdgeStyle*)style;
 - (void) stopObservingStyle:(EdgeStyle*)style;
 - (void) reloadStyles;
@@ -81,7 +79,6 @@ enum {
 
     if (self) {
         styleManager = nil;
-        linkedToActiveStyle = YES;
 
         store = gtk_list_store_new (STYLES_N_COLS,
                                     G_TYPE_STRING,
@@ -155,10 +152,6 @@ enum {
                                              selector:@selector(styleRemoved:)
                                                  name:@"EdgeStyleRemoved"
                                                object:m];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(activeStyleChanged:)
-                                                 name:@"ActiveEdgeStyleChanged"
-                                               object:m];
 
     [styleManager release];
     styleManager = m;
@@ -170,20 +163,6 @@ enum {
     return GTK_WIDGET (view);
 }
 
-- (BOOL) isLinkedToActiveStyle {
-    return linkedToActiveStyle;
-}
-
-- (void) setLinkedToActiveStyle:(BOOL)linked {
-    linkedToActiveStyle = linked;
-    if (linkedToActiveStyle) {
-        EdgeStyle *style = [self selectedStyle];
-        if ([styleManager activeEdgeStyle] != style) {
-            [self setSelectedStyle:[styleManager activeEdgeStyle]];
-        }
-    }
-}
-
 - (EdgeStyle*) selectedStyle {
     GtkTreeSelection *sel = gtk_tree_view_get_selection (view);
     GtkTreeIter iter;
@@ -258,15 +237,6 @@ enum {
     }
 }
 
-- (void) activeStyleChanged:(NSNotification*)notification {
-    if (linkedToActiveStyle) {
-        EdgeStyle *style = [self selectedStyle];
-        if ([styleManager activeEdgeStyle] != style) {
-            [self setSelectedStyle:[styleManager activeEdgeStyle]];
-        }
-    }
-}
-
 - (void) observeValueForKeyPath:(NSString*)keyPath
                        ofObject:(id)object
                          change:(NSDictionary*)change
@@ -301,13 +271,9 @@ enum {
 }
 
 - (void) selectionChanged {
-    if (linkedToActiveStyle) {
-        EdgeStyle *style = [self selectedStyle];
-        if ([styleManager activeEdgeStyle] != style) {
-            [styleManager setActiveEdgeStyle:style];
-        }
-    }
-    [self postSelectedStyleChanged];
+    [[NSNotificationCenter defaultCenter]
+        postNotificationName:@"SelectedStyleChanged"
+                      object:self];
 }
 @end
 
@@ -421,10 +387,6 @@ enum {
     cairo_surface_destroy (surface);
 }
 
-- (void) postSelectedStyleChanged {
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectedStyleChanged" object:self];
-}
-
 - (void) observeStyle:(EdgeStyle*)style {
     [style addObserver:self
             forKeyPath:@"name"
-- 
cgit v1.2.3