[Monodevelop-patches-list] r2121 - in trunk/MonoDevelop/Extras/MonoQuery: . Collection Gui/Forms Gui/Forms/Glade Gui/MonoQueryTree SchemaClass
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Sat Jan 8 04:51:12 EST 2005
Author: chergert
Date: 2005-01-08 04:51:12 -0500 (Sat, 08 Jan 2005)
New Revision: 2121
Removed:
trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/Glade/monoquery.glade
Modified:
trunk/MonoDevelop/Extras/MonoQuery/ChangeLog
trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryListDictionary.cs
trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryStringDictionary.cs
trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/CreateConnectionDruid.cs
trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryDataNodes.cs
trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryNodesRoot.cs
trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryTree.cs
trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
trunk/MonoDevelop/Extras/MonoQuery/SchemaClass/MonoQuerySchemaClass.cs
Log:
MonoQuery makefile fixes. Fixed the Create connection druid so that it
doesnt crash (this was caused by missing icons). Also updated the druid
to use an interface more like danmorg's sqlsharpgtk. Warning fixes during
the build.
Modified: trunk/MonoDevelop/Extras/MonoQuery/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/ChangeLog 2005-01-08 09:51:12 UTC (rev 2121)
@@ -1,3 +1,13 @@
+2005-01-08 Christian Hergert <chris at mosaix.net>
+
+ * Following Makefile.am fixes
+ * Copy .addin.xml if it changes
+ * Fix setup to work if layout changes in the future
+ * If .addin.xml changes, only copy addin and not rebuild the dll
+ * Get package references from configure rather than statically
+ * Added files with GetString to the PO .in file
+ * Fixed a few warnings from build stage
+
2005-01-06 Christian Hergert <chris at mosaix.net>
* Initial creation of MonoQuery AddIn
Modified: trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryListDictionary.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryListDictionary.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryListDictionary.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -49,7 +49,7 @@
}
protected override void OnInsert( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
@@ -58,13 +58,13 @@
}
protected override void OnRemove( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
}
protected override void OnSet( object key, object oldValue, object newValue ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if (!(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
@@ -73,7 +73,7 @@
}
protected override void OnValidate( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
Modified: trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryStringDictionary.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryStringDictionary.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Collection/MonoQueryStringDictionary.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -47,7 +47,7 @@
}
protected override void OnInsert( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
@@ -56,13 +56,13 @@
}
protected override void OnRemove( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
}
protected override void OnSet( object key, object oldValue, object newValue ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if (!(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
@@ -71,7 +71,7 @@
}
protected override void OnValidate( object key, object value ) {
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
if ( !(key is string) )
throw new ArgumentException( GettextCatalog.GetString( "Wrong Key Type" ), "key" );
Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/CreateConnectionDruid.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/CreateConnectionDruid.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/CreateConnectionDruid.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -1,115 +1,165 @@
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
using System;
-using Gnome;
-using Glade;
-using Gtk;
-
-using MonoDevelop.Core.Services;
-using MonoDevelop.Services;
-
-using MonoQuery.Gui.TreeView;
-using MonoQuery.Collections;
-using MonoQuery.Connection;
-using MonoQuery.Services;
-
namespace MonoQuery.Gui
{
+ using Gtk;
+ using Gnome;
+
+ using MonoDevelop.Services;
+ using MonoDevelop.Core.Services;
+
+ using MonoQuery.Gui.TreeView;
+ using MonoQuery.Services;
+ using MonoQuery.Collections;
+ using MonoQuery.Connection;
+
public class CreateConnectionDruid
{
- /// <summary>Window container</summary>
- [Widget]
- private Gtk.Window winAddconnectionDruid = null;
+ #region // Properties
+ Gnome.Druid druid = null;
+ Gnome.DruidPageEdge startPage = null;
+ Gnome.DruidPageEdge endPage = null;
+ Gnome.DruidPageStandard settingsPage = null;
+ Gtk.ListStore store = null;
+ Gtk.ComboBox providers = null;
+ Gtk.Button testButton = null;
+ Gtk.Entry connStringEntry = null;
+ Gtk.Entry serverEntry = null;
+ Gtk.Entry databaseEntry = null;
+ Gtk.Entry userEntry = null;
+ Gtk.Entry passEntry = null;
+ Gtk.Entry otherEntry = null;
+ MonoQueryNodeDatabaseRoot rootNode = null;
+ #endregion // End Properties
- /// <summary>druid widget</summary>
- [Widget]
- private Gnome.Druid druidAddconnection = null;
-
- /// <summary></summary>
- [Widget]
- private Gnome.DruidPageEdge pageAddconnectionStart = null;
-
- /// <summary></summary>
- [Widget]
- private Gnome.DruidPageStandard druidAddconnectionPage1 = null;
-
- /// <summary></summary>
- [Widget]
- private Gtk.ComboBox cmbProviders = null;
-
- /// <summary></summary>
- [Widget]
- private Gtk.TextView textview1 = null;
-
- /// <summary></summary>
- [Widget]
- private Gnome.DruidPageEdge druidpagefinish1 = null;
-
- /// <summary>
- /// Root node of the TreeView
- /// </summary>
- private MonoQueryNodeDatabaseRoot rootNode = null;
-
- /// <summary>
- /// List store for providers
- /// </summary>
- private ListStore store = null;
-
- /// <summary>
- /// Constructor. Loads our druid for display.
- /// </summary>
- public CreateConnectionDruid( MonoQuery.Gui.TreeView.MonoQueryNodeDatabaseRoot node )
+ #region // Constructors
+ public CreateConnectionDruid( MonoQueryNodeDatabaseRoot root )
{
- this.rootNode = node;
- Glade.XML gxml = new Glade.XML( null, "monoquery.glade", "winAddconnectionDruid", null );
- gxml.Autoconnect( this );
+ rootNode = root;
- this.pageAddconnectionStart.ShowAll();
- this.druidAddconnectionPage1.ShowAll();
- this.druidpagefinish1.ShowAll();
+ druid = new Druid(
+ GettextCatalog.GetString( "Create Database Connection" ),
+ true
+ );
+ druid.Cancel += new EventHandler( OnCancelClicked );
+ startPage = new DruidPageEdge( EdgePosition.Start,
+ true,
+ GettextCatalog.GetString( "Create Database Connection" ),
+ GettextCatalog.GetString( "This wizard will help you create"
+ + " a new database connection for use within "
+ + "MonoDevelop. You will need your connection string as"
+ + " well as a supported database." ),
+ null, null, null
+ );
+
+ settingsPage = new DruidPageStandard();
+ settingsPage.Title = GettextCatalog.GetString(
+ "Connection Settings" );
+ VBox vbox1 = new VBox();
+ HBox hbox1 = new HBox();
+ VBox vbox2 = new VBox();
+ VBox vbox3 = new VBox();
+ hbox1.PackStart( vbox2, false, false, 2 );
+ HBox hbox4 = new HBox();
+ hbox4.PackStart( new Label(GettextCatalog.GetString("Provider")), false, false, 0 );
+ hbox4.PackStart( new Label() );
+ vbox2.PackStart( hbox4 );
+ HBox hbox5 = new HBox();
+ hbox5.PackStart( new Label(GettextCatalog.GetString("Connection String")), false, false, 0 );
+ hbox5.PackStart( new Label() );
+ vbox2.PackStart( hbox5 );
+ HBox hbox6 = new HBox();
+ hbox6.PackStart( new Label(GettextCatalog.GetString("Server")), false, false, 0 );
+ hbox6.PackStart( new Label() );
+ vbox2.PackStart( hbox6 );
+ HBox hbox7 = new HBox();
+ hbox7.PackStart( new Label(GettextCatalog.GetString("Database")), false, false, 0 );
+ hbox7.PackStart( new Label() );
+ vbox2.PackStart( hbox7 );
+ HBox hbox8 = new HBox();
+ hbox8.PackStart( new Label(GettextCatalog.GetString("User ID")), false, false, 0 );
+ hbox8.PackStart( new Label() );
+ vbox2.PackStart( hbox8 );
+ HBox hbox9 = new HBox();
+ hbox9.PackStart( new Label(GettextCatalog.GetString("Password")), false, false, 0 );
+ hbox9.PackStart( new Label() );
+ vbox2.PackStart( hbox9 );
+ HBox hbox10 = new HBox();
+ hbox10.PackStart( new Label(GettextCatalog.GetString("Other")), false, false, 0 );
+ vbox2.PackStart( hbox10 );
+ hbox1.PackStart( vbox3, true, true, 2 );
+ providers = new Gtk.ComboBox();
+ connStringEntry = new Gtk.Entry();
+ serverEntry = new Gtk.Entry();
+ databaseEntry = new Gtk.Entry();
+ userEntry = new Gtk.Entry();
+ passEntry = new Gtk.Entry();
+ otherEntry = new Gtk.Entry();
+ serverEntry.Changed += new EventHandler( OnSettingsChanged );
+ databaseEntry.Changed += new EventHandler( OnSettingsChanged );
+ userEntry.Changed += new EventHandler( OnSettingsChanged );
+ passEntry.Changed += new EventHandler( OnSettingsChanged );
+ otherEntry.Changed += new EventHandler( OnSettingsChanged );
+ vbox3.PackStart( providers, false, false, 2 );
+ vbox3.PackStart( connStringEntry, false, false, 2 );
+ vbox3.PackStart( serverEntry, false, false, 2 );
+ vbox3.PackStart( databaseEntry, false, false, 2 );
+ vbox3.PackStart( userEntry, false, false, 2 );
+ vbox3.PackStart( passEntry, false, false, 2 );
+ vbox3.PackStart( otherEntry, false, false, 2 );
+ vbox1.PackStart( hbox1, false, false, 0 );
+ testButton = new Button( GettextCatalog.GetString(
+ "Test Connection" ) );
+ testButton.Clicked += new EventHandler( OnTestConnectionClicked );
+ HBox hbox2 = new HBox();
+ hbox2.PackStart( new Label(), true, true, 0 );
+ hbox2.PackStart( testButton, false, false, 0 );
+ vbox1.PackStart( hbox2, false, false, 2 );
+ settingsPage.AppendItem( "", vbox1, "" );
+
+ endPage = new DruidPageEdge( EdgePosition.Finish,
+ true,
+ GettextCatalog.GetString( "Create Database Connection" ),
+ GettextCatalog.GetString( "We are now ready to create your"
+ + " new connection. Press Finish to create the "
+ + "connection." ),
+ null, null, null
+ );
+ endPage.FinishClicked += new FinishClickedHandler( OnFinishClicked );
+
+ druid.AppendPage( startPage );
+ druid.AppendPage( settingsPage );
+ druid.AppendPage( endPage );
+
BuildProviderList();
+
+ druid.ShowAll();
}
+ #endregion // End Constructors
- #region // Private Methods
- private void OnCancelClicked( object o, EventArgs e )
+ #region // Methods
+ private void OnCancelClicked( object sender, EventArgs args )
{
- this.winAddconnectionDruid.Destroy();
+ druid.Destroy();
}
- /// <summary>
- /// This method will get our list of providers and enter them into the
- /// combo box.
- /// </summary>
- private void BuildProviderList()
+ private void OnTestConnectionClicked( object sender, EventArgs args )
{
- MonoQueryService monoQueryService = (MonoQueryService)
- ServiceManager.GetService( typeof( MonoQueryService ) );
-
- store = new ListStore( typeof( string ),
- typeof( ConnectionProviderDescriptor ) );
-
- foreach( ConnectionProviderDescriptor descriptor in monoQueryService.Providers )
- {
- store.AppendValues( descriptor.Name, descriptor );
- }
-
- CellRendererText colr = new CellRendererText();
- this.cmbProviders.Model = store;
- this.cmbProviders.PackStart( colr, true );
- this.cmbProviders.AddAttribute( colr, "text", 0 );
-
- // Set to first provider
- // This is where we could put some autolearning
- this.cmbProviders.Active = 0;
- }
-
- /// <summary>
- /// Event handler for when we should test the connection to the
- /// database.
- /// </summary>
- private void OnTestConnection( object o, EventArgs e )
- {
MessageService service = (MessageService)ServiceManager.GetService(
typeof( MessageService ) );
@@ -118,12 +168,12 @@
try
{
TreeIter iter;
- this.cmbProviders.GetActiveIter( out iter );
+ this.providers.GetActiveIter( out iter );
ConnectionProviderDescriptor descriptor = (ConnectionProviderDescriptor)
store.GetValue( iter, 1 );
IConnection conn = CreateConnectionObject(
descriptor.ProviderType,
- this.textview1.Buffer.Text );
+ this.connStringEntry.Text );
successful = conn.Open(); // returns true on success
}
catch ( Exception err )
@@ -138,64 +188,320 @@
service.ShowError( GettextCatalog.GetString(
"Error connecting to server." )
+ "\n------------------------------\n"
- + this.textview1.Buffer.Text );
+ + this.connStringEntry.Text );
}
}
- /// <summary>
- /// Creates an instance of a connection from a few settings.
- /// </summary>
- private IConnection CreateConnectionObject( System.Type type, string connString )
+ private void OnSettingsChanged( object sender, EventArgs args )
{
- System.Reflection.Assembly ass = System.Reflection.Assembly.GetExecutingAssembly();
- IConnection conn = (IConnection)ass.CreateInstance( type.FullName );
- try
- {
- conn.ConnectionString = connString;
- }
- catch ( Exception e ) {}
-
- return conn;
+ connStringEntry.Text = "Server=" + serverEntry.Text + ";"
+ + "Database=" + databaseEntry.Text + ";"
+ + (userEntry.Text.Equals( "" ) ? "" : "User ID=" + userEntry.Text + ";")
+ + (passEntry.Text.Equals( "" ) ? "" : "Password=" + passEntry.Text + ";")
+ + otherEntry.Text;
}
- /// <summary>
- /// Create our node and connection objects. Add them to the root node
- /// of our treeview.
- /// </summary>
- private void OnFinishClicked( object o, FinishClickedArgs e )
+ private void OnFinishClicked( object sender, FinishClickedArgs args )
{
- TreeIter iter;
- MonoQueryNodeConnection node = null;
+ MessageService service = (MessageService)ServiceManager.GetService(
+ typeof( MessageService ) );
+ bool successful = false;
+ IConnection conn = null;
+
try
{
- this.cmbProviders.GetActiveIter( out iter );
+ TreeIter iter;
+ this.providers.GetActiveIter( out iter );
ConnectionProviderDescriptor descriptor = (ConnectionProviderDescriptor)
store.GetValue( iter, 1 );
- IConnection conn = CreateConnectionObject(
+ conn = CreateConnectionObject(
descriptor.ProviderType,
- this.textview1.Buffer.Text );
-
-
- node = new MonoQueryNodeConnection( conn );
-
- rootNode.Nodes.Add( node as MonoDevelop.Gui.Widgets.TreeNode );
-
- conn.Open();
- node.Expand();
+ this.connStringEntry.Text );
+ successful = conn.Open();
}
catch ( Exception err )
{
- MessageService service = (MessageService)ServiceManager.GetService(typeof(MessageService));
- service.ShowError( GettextCatalog.GetString("There was an error adding your connection. "
- + "Please check your connection string.") );
+ successful = false;
}
finally
{
- this.druidAddconnection.Destroy();
- this.winAddconnectionDruid.Destroy();
+ if ( successful ) {
+ MonoQueryNodeConnection node = new MonoQueryNodeConnection( conn );
+ if ( (node as MonoDevelop.Gui.Widgets.TreeNode) != null ) {
+ rootNode.Nodes.Add( node as MonoDevelop.Gui.Widgets.TreeNode );
+ }
+ } else {
+ service.ShowMessage( GettextCatalog.GetString(
+ "Your connection string or provider was invalid" ) );
+ }
}
+
+ druid.Destroy();
}
- #endregion // End Private Methods
+
+ private void BuildProviderList()
+ {
+ MonoQueryService monoQueryService = (MonoQueryService)
+ ServiceManager.GetService( typeof( MonoQueryService ) );
+
+ store = new ListStore( typeof( string ),
+ typeof( ConnectionProviderDescriptor ) );
+
+ foreach( ConnectionProviderDescriptor descriptor in monoQueryService.Providers )
+ {
+ store.AppendValues( descriptor.Name, descriptor );
+ }
+
+ CellRendererText colr = new CellRendererText();
+ this.providers.Model = store;
+ this.providers.PackStart( colr, true );
+ this.providers.AddAttribute( colr, "text", 0 );
+
+ // Set to first provider
+ // This is where we could put some autolearning
+ this.providers.Active = 0;
+ }
+
+ private IConnection CreateConnectionObject( System.Type type, string connString )
+ {
+ System.Reflection.Assembly ass = System.Reflection.Assembly.GetExecutingAssembly();
+ IConnection conn = (IConnection)ass.CreateInstance( type.FullName );
+ try
+ {
+ conn.ConnectionString = connString;
+ }
+ catch ( Exception e )
+ {}
+
+ return conn;
+ }
+ #endregion // End Methods
}
-}
\ No newline at end of file
+}
+
+
+//
+//using System;
+//
+//using Gnome;
+//using Glade;
+//using Gtk;
+//
+//using MonoDevelop.Core.Services;
+//using MonoDevelop.Services;
+//
+//using MonoQuery.Gui.TreeView;
+//using MonoQuery.Collections;
+//using MonoQuery.Connection;
+//using MonoQuery.Services;
+//
+//namespace MonoQuery.Gui
+//{
+// public class CreateConnectionDruid
+// {
+// [Widget]
+// private Gtk.Window winAddconnectionDruid = null;
+//
+// [Widget]
+// private Druid druidAddconnection = null;
+//
+// [Widget]
+// private DruidPageEdge pageAddconnectionStart = null;
+//
+// [Widget]
+// private Gnome.DruidPageStandard druidAddconnectionPage1 = null;
+//
+// [Widget]
+// private Gtk.ComboBox comboProviders = null;
+//
+// [Widget]
+// private Gtk.Entry txtConnString = null;
+//
+// [Widget]
+// private Gtk.Entry txtServer = null;
+//
+// [Widget]
+// private Gtk.Entry txtDatabase = null;
+//
+// [Widget]
+// private Gtk.Entry txtUserID = null;
+//
+// [Widget]
+// private Gtk.Entry txtOthers = null;
+//
+// [Widget]
+// private DruidPageEdge druidpagefinish1 = null;
+//
+// [Widget]
+// private Gtk.Button btnTest = null;
+//
+// [Widget]
+// private Gtk.Entry txtPass = null;
+//
+// private MonoQueryNodeDatabaseRoot rootNode = null;
+//
+// private ListStore store = null;
+//
+// private TreeIter cur;
+//
+// /// <summary>
+// /// Constructor. Loads our druid for display.
+// /// </summary>
+// public CreateConnectionDruid( MonoQuery.Gui.TreeView.MonoQueryNodeDatabaseRoot node )
+// {
+// this.rootNode = node;
+// Glade.XML gxml = new Glade.XML( null, "monoquery.glade", "winAddconnectionDruid", null );
+// gxml.Autoconnect( this );
+//
+// this.pageAddconnectionStart.ShowAll();
+// this.druidAddconnectionPage1.ShowAll();
+// this.druidpagefinish1.ShowAll();
+//
+// BuildProviderList();
+// }
+//
+// #region // Private Methods
+// private void OnCancelClicked( object o, EventArgs args )
+// {
+// this.winAddconnectionDruid.Destroy();
+// }
+//
+// private void OnEntryChanged( object o, EventArgs args )
+// {
+// if ( this.txtConnString != null )
+// this.txtConnString.Text =
+// "Server=" + this.txtServer.Text + ";"
+// + "Database=" + this.txtDatabase.Text + ";"
+// + "User ID=" + this.txtUserID.Text + ";"
+// + "Password=" + this.txtPass.Text + ";"
+// + this.txtOthers.Text;
+// }
+//
+// /// <summary>
+// /// This method will get our list of providers and enter them into the
+// /// combo box.
+// /// </summary>
+// private void BuildProviderList()
+// {
+// MonoQueryService monoQueryService = (MonoQueryService)
+// ServiceManager.GetService( typeof( MonoQueryService ) );
+//
+// store = new ListStore( typeof( string ),
+// typeof( ConnectionProviderDescriptor ) );
+//
+// foreach( ConnectionProviderDescriptor descriptor in monoQueryService.Providers )
+// {
+// store.AppendValues( descriptor.Name, descriptor );
+// }
+//
+// CellRendererText colr = new CellRendererText();
+// this.comboProviders.Model = store;
+// this.comboProviders.PackStart( colr, true );
+// this.comboProviders.AddAttribute( colr, "text", 0 );
+//
+// // Set to first provider
+// // This is where we could put some autolearning
+// this.comboProviders.Active = 0;
+// }
+//
+// /// <summary>
+// /// Event handler for when we should test the connection to the
+// /// database.
+// /// </summary>
+// private void OnTestConnection( object o, EventArgs e )
+// {
+// MessageService service = (MessageService)ServiceManager.GetService(
+// typeof( MessageService ) );
+//
+// bool successful = false;
+//
+// try
+// {
+// TreeIter iter;
+// this.comboProviders.GetActiveIter( out iter );
+// ConnectionProviderDescriptor descriptor = (ConnectionProviderDescriptor)
+// store.GetValue( iter, 1 );
+// IConnection conn = CreateConnectionObject(
+// descriptor.ProviderType,
+// this.txtConnString.Text );
+// successful = conn.Open(); // returns true on success
+// }
+// catch ( Exception err )
+// {
+// successful = false;
+// }
+//
+// if ( successful ) {
+// service.ShowMessage( GettextCatalog.GetString(
+// "Connection was successful." ) );
+// } else {
+// service.ShowError( GettextCatalog.GetString(
+// "Error connecting to server." )
+// + "\n------------------------------\n"
+// + this.txtConnString.Text );
+// }
+// }
+//
+// /// <summary>
+// /// Creates an instance of a connection from a few settings.
+// /// </summary>
+// private IConnection CreateConnectionObject( System.Type type, string connString )
+// {
+// System.Reflection.Assembly ass = System.Reflection.Assembly.GetExecutingAssembly();
+// IConnection conn = (IConnection)ass.CreateInstance( type.FullName );
+// try
+// {
+// conn.ConnectionString = connString;
+// }
+// catch ( Exception e ) {}
+//
+// return conn;
+// }
+//
+// /// <summary>
+// /// Save the provider iter so it can be used later.
+// /// </summary>
+// private void OnProvidersChanged( object o, EventArgs args )
+// {
+// this.comboProviders.GetActiveIter( out cur );
+// }
+//
+// /// <summary>
+// /// Create our node and connection objects. Add them to the root node
+// /// of our treeview.
+// /// </summary>
+// private void OnFinishClicked( object o, FinishClickedArgs e )
+// {
+// MonoQueryNodeConnection node = null;
+//
+// try
+// {
+// ConnectionProviderDescriptor descriptor = (ConnectionProviderDescriptor)
+// store.GetValue( cur, 1 );
+// IConnection conn = CreateConnectionObject(
+// descriptor.ProviderType,
+// this.txtConnString.Text );
+// conn.Open();
+//
+// node = new MonoQueryNodeConnection( conn );
+// rootNode.Nodes.Add( node );
+// node.Expand();
+// }
+// catch ( Exception err )
+// {
+// MessageService service = (MessageService)ServiceManager.GetService(typeof(MessageService));
+// service.ShowError( GettextCatalog.GetString("There was an error adding your connection. "
+// + "Please check your connection string.") );
+// Console.WriteLine( err.Message + "\n\n" + err );
+// }
+// finally
+// {
+// this.druidAddconnection.Destroy();
+// this.winAddconnectionDruid.Destroy();
+// }
+// }
+// #endregion // End Private Methods
+// }
+//}
+//
\ No newline at end of file
Deleted: trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/Glade/monoquery.glade
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/Glade/monoquery.glade 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/Forms/Glade/monoquery.glade 2005-01-08 09:51:12 UTC (rev 2121)
@@ -1,278 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="winAddconnectionDruid">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Add Connection Wizard</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
- <child>
- <widget class="GnomeDruid" id="druidAddconnection">
- <property name="border_width">4</property>
- <property name="visible">True</property>
- <property name="show_help">False</property>
- <signal name="cancel" handler="OnCancelClicked" last_modification_time="Sun, 07 Nov 2004 07:27:30 GMT"/>
-
- <child>
- <widget class="GnomeDruidPageEdge" id="pageAddconnectionStart">
- <property name="visible">True</property>
- <property name="position">GNOME_EDGE_START</property>
- <property name="title" translatable="yes">Add new connection</property>
- <property name="text" translatable="yes">This wizard will help you create a new connection for use within MonoDevelop. You will need to select your connection provider as well as your proper connection string.</property>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageStandard" id="druidAddconnectionPage1">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select connection provider</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox1">
- <property name="border_width">16</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select your connection provider</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="cmbProviders">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">12</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="height_request">75</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="lblSpacer1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="cmdTestConnection">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="OnTestConnection" last_modification_time="Sun, 07 Nov 2004 22:54:55 GMT"/>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Test Connection</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageEdge" id="druidpagefinish1">
- <property name="visible">True</property>
- <property name="position">GNOME_EDGE_FINISH</property>
- <property name="title" translatable="yes">Ready to create connection</property>
- <property name="text" translatable="yes">We are now ready to create the connection. Click Apply to create and start using the connection.</property>
- <signal name="finish" handler="OnFinishClicked" last_modification_time="Sun, 07 Nov 2004 23:29:49 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryDataNodes.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryDataNodes.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryDataNodes.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -139,8 +139,8 @@
/// </summary>
protected override MonoQuerySchemaClassCollection OnExecute( CancelEventArgs e )
{
- MonoQuerySchemaClassCollection tmp = this.SchemaClass.GetSchemaParameters();
- MonoQueryParameterCollection parameters = null;
+// MonoQuerySchemaClassCollection tmp = this.SchemaClass.GetSchemaParameters();
+// MonoQueryParameterCollection parameters = null;
MonoQuerySchemaClassCollection returnValue = null;
// if ( tmp.Count == 1 && tmp[0] is MonoQueryNotSupported )
Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryNodesRoot.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryNodesRoot.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryNodesRoot.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -32,7 +32,7 @@
{
get
{
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
return GettextCatalog.GetString( "Database Connections" );
}
}
@@ -117,7 +117,7 @@
}
IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
messageService.ShowError( e.Message );
- }*/
+ }*/
}
/// <summary>
@@ -200,7 +200,7 @@
}
}
- public MonoQueryNodeConnection( IConnection dataConnection ) : base( null )
+ public MonoQueryNodeConnection( IConnection dataConnection ) : base()
{
this.pConnection = dataConnection;
this.Image = "md-mono-query-database";
Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryTree.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryTree.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/MonoQueryTree/MonoQueryTree.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -35,7 +35,7 @@
///</summary>
public MonoQueryTree() : base()
{
- IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
+// IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
this.menuService = (MenuService)ServiceManager.GetService(typeof(MenuService));
Modified: trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/Makefile.am 2005-01-08 09:51:12 UTC (rev 2121)
@@ -1,7 +1,3 @@
-
-monoquerydir = $(libdir)/monodevelop/AddIns/MonoQuery
-monoquery_DATA = $(ASSEMBLY) MonoQuery.addin.xml
-
FILES = \
AssemblyInfo.cs \
Codons/MonoQueryConnectionCodon.cs \
@@ -37,43 +33,43 @@
Gui/SqlQueryView/SqlQueryView.cs \
Services/MonoQueryService.cs
-ASSEMBLY = MonoQuery.dll
+build_sources = $(addprefix $(srcdir)/, $(FILES))
-REFERENCES = \
-System.Data \
-Npgsql \
-ByteFX.Data \
-../../build/bin/MonoDevelop.Base.dll \
-../../build/bin/MonoDevelop.Core.dll \
-../../build/bin/MonoDevelop.Gui.Widgets.dll
+REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
+ /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
+ /r:Npgsql.dll \
+ /r:System.Data.dll \
+ /r:ByteFX.Data.dll \
+ $(GTK_SHARP_LIBS) \
+ $(GLADE_SHARP_LIBS) \
+ $(GCONF_SHARP_LIBS) \
+ $(GTKSOURCEVIEW_SHARP_LIBS)
-RESOURCES = \
-Gui/Forms/Glade/monoquery.glade
+ADDIN = MonoQuery.addin.xml
-PACKAGES = \
-gtk-sharp-2.0 \
-gnome-sharp-2.0 \
-glade-sharp-2.0 \
-gtksourceview-sharp
+ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoQuery
-BUILD_SOURCES = $(addprefix $(srcdir)/, $(FILES))
-BUILD_REFERENCES = $(addprefix /r:, $(REFERENCES))
-BUILD_PACKAGES = $(addprefix /pkg:, $(PACKAGES))
-BUILD_RESOURCES = $(addprefix /resource:, $(RESOURCES))
+DLL = MonoQuery.dll
-all: $(ASSEMBLY)
+DLL_BUILD = $(top_builddir)/build/AddIns/MonoQuery
-$(ASSEMBLY): mkdirs $(BUILD_SOURCES) ../../build/AddIns/MonoQuery/MonoQuery.addin.xml
- mcs -out:MonoQuery.dll -target:library $(BUILD_SOURCES) \
- $(BUILD_REFERENCES) $(BUILD_PACKAGES) $(BUILD_RESOURCES) \
- && cp MonoQuery.dll ../../build/AddIns/MonoQuery/
+all: $(DLL_BUILD)/$(DLL) $(ADDIN_BUILD)/$(ADDIN)
-../../build/AddIns/MonoQuery/MonoQuery.addin.xml:
- cp MonoQuery.addin.xml ../../build/AddIns/MonoQuery/
+$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
+ mkdir -p $(ADDIN_BUILD)
+ cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/$(ADDIN)
-mkdirs:
- mkdir -p ../../build/AddIns/MonoQuery
+$(DLL): $(build_sources) $(srcdir)/$(GLADEFILE)
+ mcs -target:library -out:$(DLL) $(build_sources) $(REFS)
-CLEANFILES=$(ASSEMBLY) $(ASSEMBLY).mdb
+$(DLL_BUILD)/$(DLL): $(srcdir)/$(DLL)
+ mkdir -p $(DLL_BUILD)
+ cp $(srcdir)/$(DLL) $(DLL_BUILD)/$(DLL)
-EXTRADIST=$(FILES) MonoQuery.addin.xml
+CLEANFILES=$(DLL) $(DLL_BUILD)/$(DLL) $(ADDIN_BUILD)/$(ADDIN)
+
+EXTRADIST=$(FILES)
+
+monoquerydir = $(libdir)/monodevelop/AddIns/MonoQuery
+monoquery_DATA = $(DLL_BUILD)/$(DLL) $(ADDIN_BUILD)/$(ADDIN)
Modified: trunk/MonoDevelop/Extras/MonoQuery/SchemaClass/MonoQuerySchemaClass.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/SchemaClass/MonoQuerySchemaClass.cs 2005-01-08 09:47:23 UTC (rev 2120)
+++ trunk/MonoDevelop/Extras/MonoQuery/SchemaClass/MonoQuerySchemaClass.cs 2005-01-08 09:51:12 UTC (rev 2121)
@@ -541,7 +541,7 @@
public MonoQueryNotSupported( IConnection connection, string catalogName, string schemaName, string ownerName, string name ) : base(connection, catalogName, schemaName, ownerName, name )
{
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
this.pName += " " + GettextCatalog.GetString( "Not Supported" ) + " " + connection.Provider;
}
@@ -615,7 +615,7 @@
public MonoQueryViews( IConnection connection, string catalogName, string schemaName, string ownerName, string name ) : base(connection, catalogName, schemaName, ownerName, name )
{
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
this.pName = GettextCatalog.GetString( "Views" );
}
@@ -651,7 +651,7 @@
public MonoQueryProcedures( IConnection connection, string catalogName, string schemaName, string ownerName, string name ) : base(connection, catalogName, schemaName, ownerName, name )
{
- StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+// StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
this.pName = GettextCatalog.GetString( "Procedures" );
}
More information about the Monodevelop-patches-list
mailing list