From 17ae63bbaecc10d9d3f30a5352cf7dc5e353561e Mon Sep 17 00:00:00 2001
From: Blake Nicholson <blaken@umich.edu>
Date: Tue, 13 May 2008 17:53:24 +0000
Subject: [PATCH] Updated the DBModeler application so the SQLGenerator window
 uses the Renaissance library.  Replaced the gorm file with a gsmarkup file,
 and modified the app code to use it.

* DBModeler/SQLGenerator.m

  (init): Updated to load the gsmarkup file, rather than the nib.

  (awakeFromGSMarkup): Replaces the previous awakeFromNib.

* DBModeler/Resources/SQLGenerator.gsmarkup

  Initial import.

* DBModeler/Resources/SQLGenerator.gorm

  Removed from repository.

* DBModeler/GNUmakefile

  Replaced the SQLGenerator.gorm resource with SQLGenerator.gsmarkup.  Removed
  a dangling reference to ConsistencyResults.gorm.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26522 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                                     |   8 ++
 DBModeler/GNUmakefile                         |   3 +-
 .../Resources/SQLGenerator.gorm/data.classes  |  35 -------
 .../Resources/SQLGenerator.gorm/data.info     | Bin 184 -> 0 bytes
 .../Resources/SQLGenerator.gorm/objects.gorm  | Bin 6540 -> 0 bytes
 DBModeler/Resources/SQLGenerator.gsmarkup     |  97 ++++++++++++++++++
 DBModeler/SQLGenerator.m                      |   6 +-
 7 files changed, 110 insertions(+), 39 deletions(-)
 delete mode 100644 DBModeler/Resources/SQLGenerator.gorm/data.classes
 delete mode 100644 DBModeler/Resources/SQLGenerator.gorm/data.info
 delete mode 100644 DBModeler/Resources/SQLGenerator.gorm/objects.gorm
 create mode 100644 DBModeler/Resources/SQLGenerator.gsmarkup

diff --git a/ChangeLog b/ChangeLog
index ea90634..00c8bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-13  Blake Nicholson  <blaken@umich.edu>
+
+	* DBModeler/SQLGenerator.m: Updated to use new gsmarkup file.
+	* DBModeler/Resources/SQLGenerator.gsmarkup: Initial import.
+	* DBModeler/Resources/SQLGenerator.gorm: Removed.
+	* DBModeler/GNUmakefile: Replaced the SQLGenerator.gorm resource with
+	SQLGenerator.gsmarkup.  Removed reference to ConsistencyResults.gorm.
+
 2008-05-13  Matt Rice  <ratmice@gmail.com>
 
 	* DBModeler/Resources/Menu-{Cocoa,GNUstep}.gsmarkup: Remove a TODO
diff --git a/DBModeler/GNUmakefile b/DBModeler/GNUmakefile
index 4ebbc90..7402e80 100644
--- a/DBModeler/GNUmakefile
+++ b/DBModeler/GNUmakefile
@@ -43,7 +43,7 @@ ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler Renaissance
 
 $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/ModelDrag.tiff		\
-	Resources/SQLGenerator.gorm		\
+	Resources/SQLGenerator.gsmarkup	\
 	Resources/Info-gnustep.plist    	\
 	Resources/Key_Diagram.tiff		\
 	Resources/Key_Header.tiff		\
@@ -55,7 +55,6 @@ $(APP_NAME)_RESOURCE_FILES =			\
 	Resources/ClassProperty_Header.tiff	\
 	Resources/ClassProperty_On.tiff 	\
 	Resources/Preferences.gorm		\
-	Resources/ConsistencyResults.gorm	\
 	Resources/DBModeler.tiff		\
 	Resources/DBModeler.icns		\
 	Resources/AllowsNull_On.tiff		\
diff --git a/DBModeler/Resources/SQLGenerator.gorm/data.classes b/DBModeler/Resources/SQLGenerator.gorm/data.classes
deleted file mode 100644
index ce0b66f..0000000
--- a/DBModeler/Resources/SQLGenerator.gorm/data.classes
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "## Comment" = "Do NOT change this file, Gorm maintains it";
-    FirstResponder = {
-	Actions = (
-	    "executeSQL:",
-	    "switchChanged:",
-	    "openSesame:",
-	    "saveAs:",
-	    "showTables:"
-	);
-	Super = NSObject;
-    };
-    SQLGenerator = {
-	Actions = (
-	    "openSesame:",
-	    "executeSQL:",
-	    "switchChanged:",
-	    "saveAs:",
-	    "showTables:"
-	);
-	Outlets = (
-	    dropDatabaseSwitch,
-	    createDatabaseSwitch,
-	    dropTablesSwitch,
-	    createTablesSwitch,
-	    dropPKSwitch,
-	    createPKSwitch,
-	    createPKConstraintsSwitch,
-	    createFKConstraintsSwitch,
-	    _sqlOutput,
-	    _window
-	);
-	Super = NSObject;
-    };
-}
\ No newline at end of file
diff --git a/DBModeler/Resources/SQLGenerator.gorm/data.info b/DBModeler/Resources/SQLGenerator.gorm/data.info
deleted file mode 100644
index 152bdecf1368d3ccf77b4dfc8ce7496bfad47564..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmZ?w3oR~5El@}-O3uhEOEmxjqht#UD-Z(+j4>DnRtAiQj0_^~`9-;InK`KeMX71U
zzKMB>>8V8wKw!wkz~L9{pOlrFTms@Vs4_4zG8r%#GK0i}ONuh{(t)Ck3~E4<PZdb8
tih@{7K8Yo%#U%=1sYS(^`FRG+8<{~Wc;G5{m_jNGQd1OwMx-X@0swXxC-eXS

diff --git a/DBModeler/Resources/SQLGenerator.gorm/objects.gorm b/DBModeler/Resources/SQLGenerator.gorm/objects.gorm
deleted file mode 100644
index ab9dff631f18564ef0c3758f8c5ca92604e74b25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6540
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
N%pU!*c3f<|{sX_=d$#}p

diff --git a/DBModeler/Resources/SQLGenerator.gsmarkup b/DBModeler/Resources/SQLGenerator.gsmarkup
new file mode 100644
index 0000000..6d4fc9e
--- /dev/null
+++ b/DBModeler/Resources/SQLGenerator.gsmarkup
@@ -0,0 +1,97 @@
+<?xml version="1.0"?> 
+<!DOCTYPE gsmarkup> 
+<gsmarkup> 
+	<objects>
+
+		<window title="SQL Generation" id="sqlgenWindow" resizable="no">
+			<vbox leftPadding="10" padding="10">
+				<box title="SQL Generation Options" topPadding="10"
+					leftPadding="15" rightPadding="15" width="425">
+					<hbox halign="wexpand">
+						<vbox halign="left" valign="wexpand">
+							<button id="dropDatabase" title="Drop Database"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="dropTables" title="Drop Tables"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<vspace />
+							<button id="dropPKSupport"
+								title="Drop Primary Key Support" type="switch"
+								halign="left" valign="bottom"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+						</vbox>
+						<hspace />
+						<vbox halign="right" valign="top">
+							<button id="createDB" title="Create Database"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createTables" title="Create Tables"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createPKConstraints"
+								title="Primary Key Constraints" type="switch"
+								halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createFKConstraints"
+								title="Foreign Key Constraints" type="switch"
+								halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+							<button id="createPKSupport"
+							   	title="Create Primary Key Support"
+								type="switch" halign="left" valign="top"
+								action="switchChanged:" target="#NSOwner"
+								padding="1.5" />
+						</vbox>
+					</hbox>
+				</box>
+				<scrollView width="425" height="300"
+					borderType="bezel" leftPadding="15" rightPadding="15"
+					hasHorizontalScroller="no">
+					<textView id="sqlOutput"/>
+				</scrollView>
+				<hbox halign="left" padding="8">
+					<button id="executeSQL" title="Execute SQL"
+						type="momentaryPushIn" halign="left" valign="center"
+						action="executeSQL:" target="#NSOwner" width="115"
+						leftPadding="5" />
+					<button id="saveAs" title="Save As..."
+						type="momentaryPushIn" halign="left" valign="center"
+						action="saveAs:" target="#NSOwner" width="100" />
+					<button id="tables" title="Tables..."
+						type="momentaryPushIn" halign="left" valign="center"
+						action="showTables:" target="#NSOwner" width="100" />
+				</hbox>
+			</vbox>
+		</window>
+
+	</objects>
+
+	<connectors>
+		<outlet source="#NSOwner" target="#sqlgenWindow" key="window"/>
+		<outlet source="#NSOwner" target="#dropDatabase"
+			key="dropDatabaseSwitch" />
+		<outlet source="#NSOwner" target="#createDB"
+			key="createDatabaseSwitch"/>
+		<outlet source="#NSOwner" target="#dropTables"
+			key="dropTablesSwitch"/>
+		<outlet source="#NSOwner" target="#createTables"
+		   	key="createTablesSwitch"/>
+		<outlet source="#NSOwner" target="#dropPKSupport"
+		   	key="dropPKSwitch"/>
+		<outlet source="#NSOwner" target="#createPKSupport"
+		   	key="createPKSwitch"/>
+		<outlet source="#NSOwner" target="#createPKConstraints"
+		   	key="createPKConstraintsSwitch" />
+		<outlet source="#NSOwner" target="#createFKConstraints"
+		   	key="createFKConstraintsSwitch" />
+		<outlet source="#NSOwner" target="#sqlOutput" key="sqlOutput"/>
+	</connectors>
+</gsmarkup>
diff --git a/DBModeler/SQLGenerator.m b/DBModeler/SQLGenerator.m
index 9d28397..0a41626 100644
--- a/DBModeler/SQLGenerator.m
+++ b/DBModeler/SQLGenerator.m
@@ -44,6 +44,8 @@
 #include <AppKit/NSWindow.h>
 #endif
 
+#include <Renaissance/Renaissance.h>
+
 #include <EOAccess/EOAdaptor.h>
 #include <EOAccess/EOAdaptorChannel.h>
 #include <EOAccess/EOAdaptorContext.h>
@@ -85,11 +87,11 @@ static NSString *_otherScript;
   adminSwitchButtons = [[NSMutableArray alloc] initWithCapacity:3];
   otherSwitchButtons = [[NSMutableArray alloc] initWithCapacity:7];
   opts = [[NSMutableDictionary alloc] initWithCapacity:8];
-  loadedNib = [NSBundle loadNibNamed:@"SQLGenerator" owner:self];
+  loadedNib = [NSBundle loadGSMarkupNamed: @"SQLGenerator" owner: self];
   return self;
 }
 
-- (void) awakeFromNib
+- (void) awakeFromGSMarkup
 {
   [[dropDatabaseSwitch cell] setRepresentedObject: EODropDatabaseKey];
   [[createDatabaseSwitch cell] setRepresentedObject: EOCreateDatabaseKey];