GTK: user @property declarations in TikzDocument

git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@421 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64

2 files changed, 31 insertions, 27 deletions

diff --git a/tikzit/src/gtk/TikzDocument.h b/tikzit/src/gtk/TikzDocument.h
index 93e6173..6d60703 100644
--- a/tikzit/src/gtk/TikzDocument.h
+++ b/tikzit/src/gtk/TikzDocument.h
@@ -57,18 +57,21 @@
 - (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager;
 - (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error;
 
-- (Graph*) graph;
-- (PickSupport*) pickSupport;
-- (NSString*) path;
-- (NSString*) name;
-- (NSString*) suggestedFileName;
-- (BOOL) hasUnsavedChanges;
-
-- (StyleManager*) styleManager;
-- (void) setStyleManager:(StyleManager*)manager;
-
-- (NSString*) tikz;
-- (BOOL) setTikz:(NSString*)tikz;
+@property (readonly) Graph *graph;
+@property (readonly) PickSupport *pickSupport;
+@property (readonly) NSString *path;
+@property (readonly) NSString *name;
+@property (readonly) NSString *suggestedFileName;
+@property (readonly) BOOL hasUnsavedChanges;
+@property (retain)   StyleManager *styleManager;
+@property (readonly) NSString *tikz;
+@property (readonly) BOOL canUndo;
+@property (readonly) BOOL canRedo;
+@property (readonly) NSString *undoName;
+@property (readonly) NSString *redoName;
+
+- (BOOL) validateTikz:(NSString**)tikz error:(NSError**)error;
+- (BOOL) setTikz:(NSString*)t;
 
 - (Graph*) cutSelection;
 - (Graph*) copySelection;
@@ -81,12 +84,8 @@
 - (NSEnumerator*) nodeEnumerator;
 - (NSEnumerator*) edgeEnumerator;
 
-- (BOOL) canUndo;
 - (void) undo;
-- (BOOL) canRedo;
 - (void) redo;
-- (NSString*) undoName;
-- (NSString*) redoName;
 
 - (void) startUndoGroup;
 - (void) nameAndEndUndoGroup:(NSString*)nm;
diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m
index aa9ce11..f7cf145 100644
--- a/tikzit/src/gtk/TikzDocument.m
+++ b/tikzit/src/gtk/TikzDocument.m
@@ -151,17 +151,7 @@
     [super dealloc];
 }
 
-- (Graph*) graph {
-    return graph;
-}
-
-- (PickSupport*) pickSupport {
-    return pickSupport;
-}
-
-- (NSString*) path {
-    return path;
-}
+@synthesize graph, pickSupport, path;
 
 - (NSString*) name {
     if (path) {
@@ -246,6 +236,21 @@
     return tikz;
 }
 
+- (BOOL) validateTikz:(NSString**)t error:(NSError**)error {
+    if (*t == nil) {
+        return NO;
+    }
+    if (t == tikz || [t isEqual:tikz]) {
+        return YES;
+    }
+
+    TikzGraphAssembler *a = [TikzGraphAssembler assembler];
+    BOOL success = [a parseTikz:*t];
+    if (!success && error != NULL) {
+    }
+    return success;
+}
+
 - (BOOL) setTikz:(NSString*)t {
     if (t == nil) {
         t = [NSString string];