* DBModeler/Resources/ConsistencyResults.gsmarkup: initial import.

* DBModeler/GNUmakefile: Add ConsistencyResults.gsmarkup.
        * DBModeler/ConsistencyResults.m: Use gsmarkup file.
        * DBModeler/Resources/ConsistencyResults.gorm: Remove file.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26519 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -3,6 +3,10 @@
 	* DBModeler/Resources/Menu-{Cocoa,GNUstep}.gsmarkup: Remove a TODO
 	for an old unused hack.
 	* EOModeler/EOModelerDocument.m: Add some comments about the new hack.
+	* DBModeler/Resources/ConsistencyResults.gsmarkup: initial import.
+	* DBModeler/GNUmakefile: Add ConsistencyResults.gsmarkup.
+	* DBModeler/ConsistencyResults.m: Use gsmarkup file.
+	* DBModeler/Resources/ConsistencyResults.gorm: Remove file.
 
 2008-05-12  Matt Ride  <ratmice@gmail.com>
 

DBModeler/ConsistencyResults.m

@@ -37,6 +37,8 @@
 #include <AppKit/NSTextStorage.h>
 #endif
 
+#include <Renaissance/Renaissance.h>
+
 static ConsistencyResults *_sharedResults;
 
 @implementation ConsistencyResults
@@ -51,7 +53,7 @@ static ConsistencyResults *_sharedResults;
 - (id) init
 {
   self = [super init];
-  [NSBundle loadNibNamed:@"ConsistencyResults" owner:self];
+  [NSBundle loadGSMarkupNamed:@"ConsistencyResults" owner:self];
   successful = YES;
   return self;
 }

DBModeler/GNUmakefile

@@ -61,7 +61,8 @@ $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/AllowsNull_On.tiff		\
 	Resources/AllowsNull_Header.tiff	\
 	Resources/Menu-Cocoa.gsmarkup	\
-	Resources/Menu-GNUstep.gsmarkup
+	Resources/Menu-GNUstep.gsmarkup \
+	Resources/ConsistencyResults.gsmarkup
 
 $(APP_NAME)_OBJC_FILES =		\
 	main.m				\

DBModeler/Resources/ConsistencyResults.gorm/data.classes

@@ -1,25 +0,0 @@
-{
-    "## Comment" = "Do NOT change this file, Gorm maintains it";
-    ConsistencyResults = {
-	Actions = (
-	    "showConsistencyCheckResults:",
-	    "ok:",
-	    "cancel:"
-	);
-	Outlets = (
-	    _panel,
-	    cancelButton,
-	    results,
-	    okButton
-	);
-	Super = NSObject;
-    };
-    FirstResponder = {
-	Actions = (
-	    "newAction1:",
-	    "newAction:",
-	    "showConsistencyCheckResults:"
-	);
-	Super = NSObject;
-    };
-}

DBModeler/Resources/ConsistencyResults.gsmarkup

@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE gsmarkup>
+<gsmarkup>
+
+  <objects>
+    <panel id="resultsPanel" title="Consistency Results">
+      <vbox>
+        <scrollView width="500" height="200">
+          <textView id="resultsTextView"></textView>
+        </scrollView>
+        <hbox halign="right">
+          <button id="cancelBut" title="Cancel"
+              target="#NSOwner" action="cancel:" />
+          <button id="okBut" title="Ok" target="#NSOwner" action="ok:" />
+        </hbox>
+      </vbox>
+    </panel>
+  </objects>
+
+  <connectors>
+    <outlet source="#NSOwner" target="#resultsPanel" key="panel" />
+    <outlet source="#NSOwner" target="#okBut" key="okButton" />
+    <outlet source="#NSOwner" target="#cancelBut" key="cancelButton" />
+    <outlet source="#NSOwner" target="#resultsTextView" key="results" />
+  </connectors>
+
+</gsmarkup>