Browse Source

Extracted strings for SharpDbTools into resources

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2449 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Dickon Field 19 years ago
parent
commit
ae44ed1052
  1. 2
      src/AddIns/Misc/SharpServerTools/OracleDbToolsProvider/Src/Forms/OracleFormsArtefactFactory.cs
  2. 17
      src/AddIns/Misc/SharpServerTools/SQLServerDbToolsProvider/Src/Forms/SQLServerFormsArtefactFactory.cs
  3. 68
      src/AddIns/Misc/SharpServerTools/SharpDbTools/Resources/Strings.resx
  4. 19
      src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/ConnectionStringDefinitionDialog.cs
  5. 22
      src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/DatabaseExplorerTreeNode.cs
  6. 19
      src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/DbModelInfoTreeNode.cs
  7. 5
      src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/FormsArtefactFactory.cs

2
src/AddIns/Misc/SharpServerTools/OracleDbToolsProvider/Src/Forms/OracleFormsArtefactFactory.cs

@ -32,7 +32,7 @@ namespace SharpDbTools.Oracle.Forms @@ -32,7 +32,7 @@ namespace SharpDbTools.Oracle.Forms
+ ": creating MetaDataNode for: " + logicalConnectionName);
// create root node of the metadata collections tree
string nodeName = ResourceService.GetString("SharpDbTools.Data.DbObjectNodeName");
string nodeName = ResourceService.GetString("SharpDbTools.Forms.DbObjectNodeName");
TreeNode metaNode = new TreeNode(nodeName);
// retrieve the metadata for this logical connection name

17
src/AddIns/Misc/SharpServerTools/SQLServerDbToolsProvider/Src/Forms/SQLServerFormsArtefactFactory.cs

@ -16,9 +16,13 @@ using SharpDbTools.Forms; @@ -16,9 +16,13 @@ using SharpDbTools.Forms;
namespace SharpDbTools.SQLServer.Forms
{
/// <summary>
/// Description of MetaDataNodeBuilder.
/// TODO: currently this is just a flat list - need to reflect ownership
/// relationships such as schema etc
/// Creates a TreeNode that displays the metadata for a SQLServer database
/// Uses:
/// <item>DbModelInfo and DbModelInfoService: to access the metadata</item>
/// <item>TableTreeNode: to display Table metadata - this has 'Describe'
/// behaviour associated with it, accessed via a right mouse menu</item>
/// Going forward this should reflect the structure and relationship
/// of SQLServer objects - for now it is generic
/// </summary>
public class SQLServerFormsArtefactFactory : FormsArtefactFactory
{
@ -32,7 +36,8 @@ namespace SharpDbTools.SQLServer.Forms @@ -32,7 +36,8 @@ namespace SharpDbTools.SQLServer.Forms
+ ": creating MetaDataNode for: " + logicalConnectionName);
// create root node of the metadata collections tree
TreeNode metaNode = new TreeNode("Db Objects");
string nodeName = ResourceService.GetString("SharpDbTools.Forms.DbObjectNodeName");
TreeNode metaNode = new TreeNode(nodeName);
// retrieve the metadata for this logical connection name
@ -52,7 +57,9 @@ namespace SharpDbTools.SQLServer.Forms @@ -52,7 +57,9 @@ namespace SharpDbTools.SQLServer.Forms
LoggingService.Debug("looking for metadata: " + metadataCollectionName);
DataTable metaCollectionTable = info.Tables[metadataCollectionName];
LoggingService.Debug("found metadata collection: " + metadataCollectionName);
TreeNode collectionNode = new TreeNode(metadataCollectionName);
string nodeDisplayNameKey = "SharpDbTools.Data.PrimaryObjects." + metadataCollectionName;
string nodeDisplayName = ResourceService.GetString(nodeDisplayNameKey);
TreeNode collectionNode = new TreeNode(nodeDisplayName);
metaNode.Nodes.Add(collectionNode);
if (metaCollectionTable != null) {

68
src/AddIns/Misc/SharpServerTools/SharpDbTools/Resources/Strings.resx

@ -133,7 +133,73 @@ @@ -133,7 +133,73 @@
<data name="SharpDbTools.Data.PrimaryObjects.Users" xml:space="preserve">
<value>Users</value>
</data>
<data name="SharpDbTools.Data.DbObjectNodeName" xml:space="preserve">
<data name="SharpDbTools.Forms.DbObjectNodeName" xml:space="preserve">
<value>Db Objects</value>
</data>
<data name="SharpDbTools.Forms.DbExplorerNodeName" xml:space="preserve">
<value>Database Explorer</value>
</data>
<data name="SharpDbTools.Forms.AddConnectionMenu" xml:space="preserve">
<value>Add Connection</value>
</data>
<data name="SharpDbTools.Forms.DeleteConnectionMenu" xml:space="preserve">
<value>Delete Connection</value>
</data>
<data name="SharpDbTools.Forms.SaveAllMenu" xml:space="preserve">
<value>Save All</value>
</data>
<data name="SharpDbTools.Forms.ConnectionPropertiesNodeName" xml:space="preserve">
<value>Connection Properties</value>
</data>
<data name="SharpDbTools.Forms.NoMetadataNodeName" xml:space="preserve">
<value>No Metadata</value>
</data>
<data name="SharpDbTools.Forms.SetConnectionStringMenu" xml:space="preserve">
<value>Set Connection String</value>
</data>
<data name="SharpDbTools.Forms.LoadMetadataFromConnectionMenu" xml:space="preserve">
<value>Load Metadata From Connection</value>
</data>
<data name="SharpDbTools.Forms.LoadMetadataFromFileMenu" xml:space="preserve">
<value>Load Metadata From File</value>
</data>
<data name="SharpDbTools.Forms.OpenSQLToolMenu" xml:space="preserve">
<value>Open SQL Tool</value>
</data>
<data name="SharpDbTools.Forms.ConnectionStringNodeName" xml:space="preserve">
<value>Connection String:</value>
</data>
<data name="SharpDbTools.Forms.InvariantNameNodeName" xml:space="preserve">
<value>Invariant Name:</value>
</data>
<data name="SharpDbTools.Forms.ConnectionSucceededMsg" xml:space="preserve">
<value>Connection Succeeded</value>
</data>
<data name="SharpDbTools.Forms.ConnectionFailedMsg" xml:space="preserve">
<value>Connection Failed</value>
</data>
<data name="SharpDbTools.Forms.TestButton" xml:space="preserve">
<value>Test</value>
</data>
<data name="SharpDbTools.Forms.SubmitButton" xml:space="preserve">
<value>Submit</value>
</data>
<data name="SharpDbTools.Forms.CancelButton" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="SharpDbTools.Forms.DataSourceTypeLabel" xml:space="preserve">
<value>Data Source Type:</value>
</data>
<data name="SharpDbTools.Forms.ConnectionStringLabel" xml:space="preserve">
<value>Connection String:</value>
</data>
<data name="SharpDbTools.Forms.ConnectionStringTab" xml:space="preserve">
<value>Connection String</value>
</data>
<data name="SharpDbTools.Forms.TestResultTab" xml:space="preserve">
<value>Test Result Message</value>
</data>
<data name="SharpDbTools.Forms.ConnectionStringDefinitionDialog" xml:space="preserve">
<value>Set Up Connection String</value>
</data>
</root>

19
src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/ConnectionStringDefinitionDialog.cs

@ -10,6 +10,7 @@ using System.Collections.Generic; @@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data.Common;
using System.Windows.Forms;
using ICSharpCode.Core;
using SharpDbTools.Data;
@ -40,6 +41,19 @@ namespace SharpDbTools.Forms @@ -40,6 +41,19 @@ namespace SharpDbTools.Forms
// The InitializeComponent() call is required for Windows Forms designer support.
//
InitializeComponent();
// overwrite Text properties using ResourceService
this.testButton.Text = ResourceService.GetString("SharpDbTools.Forms.TestButton");
this.submitButton.Text = ResourceService.GetString("SharpDbTools.Forms.SubmitButton");
this.cancelButton.Text = ResourceService.GetString("SharpDbTools.Forms.CancelButton");
this.dataSourceTypeLabel.Text = ResourceService.GetString("SharpDbTools.Forms.DataSourceTypeLabel");
this.connectionStringLabel.Text = ResourceService.GetString("SharpDbTools.Forms.ConnectionStringLabel");
this.connectionStringTab.Text = ResourceService.GetString("SharpDbTools.Forms.ConnectionStringTab");
this.testResultTab.Text = ResourceService.GetString("SharpDbTools.Forms.TestResultTab");
this.Text = ResourceService.GetString("SharpDbTools.Forms.ConnectionStringDefinitionDialog");
this.connStringPropertyGrid.PropertyValueChanged +=
new PropertyValueChangedEventHandler(this.ConnStringAttributesViewPropertyValueChanged);
// add a ProgressBar to the statusString
@ -187,12 +201,13 @@ namespace SharpDbTools.Forms @@ -187,12 +201,13 @@ namespace SharpDbTools.Forms
connection.ConnectionString = this.ConnectionString;
connection.Open();
e.Result = "Connection Succeeded";
e.Result = ResourceService.GetString("SharpDbTools.Forms.ConnectionSucceededMsg"); //"Connection Succeeded";
connectionTestState = ConnectionTestState.TestSucceeded;
}
catch(Exception ex)
{
e.Result = "Connection Failed: " + ex.Message;
e.Result =
ResourceService.GetString("SharpDbTools.Forms.ConnectionFailedMsg") + ex.Message; /*"Connection Failed: "*/
connectionTestState = ConnectionTestState.TestFailed;
}
finally

22
src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/DatabaseExplorerTreeNode.cs

@ -23,20 +23,32 @@ namespace SharpDbTools.Forms @@ -23,20 +23,32 @@ namespace SharpDbTools.Forms
/// Hold minimal state - access state through the DbModelInfoService
/// </summary>
public class DatabaseExplorerTreeNode: TreeNode, IRebuildable, IRequiresRebuildSource, ISupportsDragDrop
{
public DatabaseExplorerTreeNode(): base("Database Explorer")
{
static DatabaseExplorerTreeNode()
{
ResourceService.RegisterStrings("SharpDbTools.Resources.Strings", typeof(DatabaseExplorerTreeNode).Assembly);
}
public DatabaseExplorerTreeNode(): base()
{
this.Text = ResourceService.GetString("SharpDbTools.Forms.DbExplorerNodeName");
ContextMenuStrip cMenu = new ContextMenuStrip();
ToolStripMenuItem addConnectionMenuItem =
new ToolStripMenuItem("Add Connection");
new ToolStripMenuItem();
addConnectionMenuItem.Text =
ResourceService.GetString("SharpDbTools.Forms.AddConnectionMenu");
addConnectionMenuItem.Click += new EventHandler(AddDbConnectionClickHandler);
ToolStripMenuItem deleteConnectionMenuItem =
new ToolStripMenuItem("Delete Connection");
new ToolStripMenuItem();
deleteConnectionMenuItem.Text =
ResourceService.GetString("SharpDbTools.Forms.DeleteConnectionMenu");
deleteConnectionMenuItem.Click += new EventHandler(DeleteDbConnectionClickHandler);
ToolStripMenuItem saveMetadataMenuItem =
new ToolStripMenuItem("Save All");
new ToolStripMenuItem();
saveMetadataMenuItem.Text =
ResourceService.GetString("SharpDbTools.Forms.SaveAllMenu");
saveMetadataMenuItem.Click += new EventHandler(SaveDbModelInfoClickHandler);

19
src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/DbModelInfoTreeNode.cs

@ -47,18 +47,22 @@ namespace SharpDbTools.Forms @@ -47,18 +47,22 @@ namespace SharpDbTools.Forms
// create menu items
ToolStripMenuItem setConnectionStringMenuItem =
new ToolStripMenuItem("Set Connection String");
new ToolStripMenuItem();
setConnectionStringMenuItem.Text = ResourceService.GetString("SharpDbTools.Forms.SetConnectionStringMenu");
setConnectionStringMenuItem.Click += new EventHandler(SetConnectionStringOnDbModelInfoClickHandler);
ToolStripMenuItem loadMetadataFromConnectionMenuItem =
new ToolStripMenuItem("Load Metadata from Connection");
new ToolStripMenuItem();
loadMetadataFromConnectionMenuItem.Text = ResourceService.GetString("SharpDbTools.Forms.LoadMetadataFromConnectionMenu");
loadMetadataFromConnectionMenuItem.Click += new EventHandler(LoadMetadataFromConnectionClickHandler);
ToolStripMenuItem loadMetadataFromFileMenuItem =
new ToolStripMenuItem("Load Metadata from File");
new ToolStripMenuItem();
loadMetadataFromFileMenuItem.Text = ResourceService.GetString("SharpDbTools.Forms.LoadMetadataFromFileMenu");
loadMetadataFromFileMenuItem.Click += new EventHandler(LoadMetadataFromFileClickHandler);
ToolStripMenuItem openSQLToolMenuItem = new ToolStripMenuItem("Open SQL Tool");
ToolStripMenuItem openSQLToolMenuItem = new ToolStripMenuItem();
openSQLToolMenuItem.Text = ResourceService.GetString("SharpDbTools.Forms.OpenSQLToolMenu");
openSQLToolMenuItem.Click += new EventHandler(OpenSQLToolClickHandler);
cMenu.Items.AddRange(new ToolStripMenuItem[]
@ -116,14 +120,17 @@ namespace SharpDbTools.Forms @@ -116,14 +120,17 @@ namespace SharpDbTools.Forms
string invariantName = modelInfo.InvariantName;
TreeNode attributesNode = new TreeNode("Connection Properties");
attributesNode.Text = ResourceService.GetString("SharpDbTools.Forms.ConnectionPropertiesNodeName");
if (connectionString != null) {
TreeNode cstringNode = new TreeNode("Connection String: " + connectionString);
TreeNode cstringNode = new TreeNode();
cstringNode.Text = ResourceService.GetString("SharpDbTools.Forms.ConnectionStringNodeName") + connectionString;
attributesNode.Nodes.Add(cstringNode);
}
if (invariantName != null) {
TreeNode invNameNode = new TreeNode("Invariant Name: " + invariantName);
TreeNode invNameNode = new TreeNode();
invNameNode.Text = ResourceService.GetString("SharpDbTools.Forms.InvariantNameNodeName") + invariantName;
attributesNode.Nodes.Add(invNameNode);
}

5
src/AddIns/Misc/SharpServerTools/SharpDbTools/Src/Forms/FormsArtefactFactory.cs

@ -25,11 +25,6 @@ namespace SharpDbTools.Forms @@ -25,11 +25,6 @@ namespace SharpDbTools.Forms
{
}
static FormsArtefactFactory()
{
ResourceService.RegisterStrings("SharpDbTools.Resources.Strings", typeof(FormsArtefactFactory).Assembly);
}
public abstract TreeNode CreateMetaDataNode(string name);
public abstract string[] GetDescribeTableFieldNames();
public abstract string[] GetDescribeTableColumnHeaderNames();

Loading…
Cancel
Save