Skip to content

Commit

Permalink
Merge pull request #57 from ErikEJ/loading
Browse files Browse the repository at this point in the history 
Loading
  • Loading branch information
@ErikEJ
ErikEJ committed May 7, 2016
2 parents a7a231a + e087708 commit 1d4920b
Show file tree
Hide file tree
Showing 14 changed files with 145 additions and 148 deletions.
48 changes: 25 additions & 23 deletions src/GUI/SqlCe35Toolbox/ContextMenues/DatabaseContextMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
if (isSqlCe)
scriptDatabaseRootMenuItem.Items.Add(scriptSqliteSchemaDataMenuItem);

var scriptDatabaseSchemaDataBLOBMenuItem = new MenuItem
var scriptDatabaseSchemaDataBlobMenuItem = new MenuItem
{
Header = "Script Database Schema and Data with BLOBs...",
Icon = ImageHelper.GetImageFromResource("../resources/script_16xLG.png"),
Command = DatabaseMenuCommands.DatabaseCommand,
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaDataBlobs
};
scriptDatabaseSchemaDataBLOBMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseSchemaDataBlobMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
if (isSqlCe)
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBLOBMenuItem);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBlobMenuItem);

var scriptDatabaseDataMenuItem = new MenuItem
{
Expand Down Expand Up @@ -282,7 +282,7 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
scriptUpgradeMenuItem.ToolTip = "Create a copy of this database in 4.0 format";

if (databaseMenuCommandParameters.DatabaseInfo.DatabaseType == DatabaseType.SQLCE35
&& Helpers.DataConnectionHelper.IsV40Installed())
&& DataConnectionHelper.IsV40Installed())
{
Items.Add(scriptUpgradeMenuItem);
}
Expand Down Expand Up @@ -336,44 +336,46 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
scriptEdmxMenuItem.CommandBindings.Add(scriptEdmxCommandBinding);
generateCodeRootMenuItem.Items.Add(scriptEdmxMenuItem);

var scriptDCCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
var scriptDcCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.GenerateDataContextInProject);

var scriptDCMenuItem = new MenuItem
var scriptDcMenuItem = new MenuItem
{
Header = "Add LINQ to SQL DataContext to current Project (needs 3.5)...",
Icon = ImageHelper.GetImageFromResource("../resources/Schema_16xLG.png"),
Command = DatabaseMenuCommands.DatabaseCommand,
CommandParameter = databaseMenuCommandParameters,
Tag = true
};
scriptDCMenuItem.CommandBindings.Add(scriptDCCommandBinding);
scriptDCMenuItem.IsEnabled = DataConnectionHelper.IsV35Installed() && DataConnectionHelper.IsV35DbProviderInstalled();
generateCodeRootMenuItem.Items.Add(scriptDCMenuItem);
scriptDcMenuItem.CommandBindings.Add(scriptDcCommandBinding);
scriptDcMenuItem.IsEnabled = DataConnectionHelper.IsV35Installed() && DataConnectionHelper.IsV35DbProviderInstalled();
generateCodeRootMenuItem.Items.Add(scriptDcMenuItem);

var scriptWPDCMenuItem = new MenuItem
var scriptWpdcMenuItem = new MenuItem
{
Header = "Add Windows Phone DataContext to current Project (needs 3.5)...",
Icon = ImageHelper.GetImageFromResource("../resources/Schema_16xLG.png"),
Command = DatabaseMenuCommands.DatabaseCommand,
CommandParameter = databaseMenuCommandParameters,
Tag = false
};
scriptWPDCMenuItem.CommandBindings.Add(scriptDCCommandBinding);
scriptWPDCMenuItem.IsEnabled = DataConnectionHelper.IsV35Installed() && DataConnectionHelper.IsV35DbProviderInstalled();
scriptWpdcMenuItem.CommandBindings.Add(scriptDcCommandBinding);
scriptWpdcMenuItem.IsEnabled = DataConnectionHelper.IsV35Installed() && DataConnectionHelper.IsV35DbProviderInstalled();
if (databaseMenuCommandParameters.DatabaseInfo.DatabaseType != DatabaseType.SQLCE35)
{
scriptWPDCMenuItem.IsEnabled = false;
scriptWpdcMenuItem.IsEnabled = false;
}
generateCodeRootMenuItem.Items.Add(scriptWPDCMenuItem);
generateCodeRootMenuItem.Items.Add(scriptWpdcMenuItem);
generateCodeRootMenuItem.Items.Add(new Separator());

var syncFXRootMenuItem = new MenuItem
var syncFxRootMenuItem = new MenuItem
{
Header = "Sync Framework Tools",
Icon = ImageHelper.GetImageFromResource("../resources/Synchronize_16xLG.png"),
};

var isSyncFxInstalled = DataConnectionHelper.IsSyncFx21Installed();

var syncFxProvisionCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.SyncFxProvisionScope);

Expand All @@ -386,9 +388,9 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
};
syncFxProvisionMenuItem.CommandBindings.Add(syncFxProvisionCommandBinding);
syncFxProvisionMenuItem.IsEnabled = databaseMenuCommandParameters.DatabaseInfo.DatabaseType == DatabaseType.SQLCE35
&& Helpers.DataConnectionHelper.IsSyncFx21Installed();
&& isSyncFxInstalled;

syncFXRootMenuItem.Items.Add(syncFxProvisionMenuItem);
syncFxRootMenuItem.Items.Add(syncFxProvisionMenuItem);

var syncFxDeprovisionCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.SyncFxDeprovisionDatabase);
Expand All @@ -403,9 +405,9 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
syncFxDeprovisionMenuItem.CommandBindings.Add(syncFxDeprovisionCommandBinding);

syncFxDeprovisionMenuItem.IsEnabled = databaseMenuCommandParameters.DatabaseInfo.DatabaseType == DatabaseType.SQLCE35
&& Helpers.DataConnectionHelper.IsSyncFx21Installed();
&& isSyncFxInstalled;

syncFXRootMenuItem.Items.Add(syncFxDeprovisionMenuItem);
syncFxRootMenuItem.Items.Add(syncFxDeprovisionMenuItem);

var syncFxGenerateSnapshotCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.SyncFxGenerateSnapshot);
Expand All @@ -420,9 +422,9 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
syncFxGenerateSnapshotMenuItem.CommandBindings.Add(syncFxGenerateSnapshotCommandBinding);

syncFxGenerateSnapshotMenuItem.IsEnabled = databaseMenuCommandParameters.DatabaseInfo.DatabaseType == DatabaseType.SQLCE35
&& Helpers.DataConnectionHelper.IsSyncFx21Installed();
&& isSyncFxInstalled;

syncFXRootMenuItem.Items.Add(syncFxGenerateSnapshotMenuItem);
syncFxRootMenuItem.Items.Add(syncFxGenerateSnapshotMenuItem);

var syncFxCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.SyncFxGenerateSyncCodeInProject);
Expand All @@ -437,10 +439,10 @@ public DatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPara
syncFxMenuItem.CommandBindings.Add(syncFxCommandBinding);

syncFxMenuItem.IsEnabled = databaseMenuCommandParameters.DatabaseInfo.DatabaseType == DatabaseType.SQLCE35
&& Helpers.DataConnectionHelper.IsSyncFx21Installed();
&& isSyncFxInstalled;

generateCodeRootMenuItem.Items.Add(syncFxMenuItem);
generateCodeRootMenuItem.Items.Add(syncFXRootMenuItem);
generateCodeRootMenuItem.Items.Add(syncFxRootMenuItem);

if (isSqlCe)
{
Expand Down
30 changes: 15 additions & 15 deletions src/GUI/SqlCe35Toolbox/ContextMenues/DatabasesContextMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
CommandParameter = databaseMenuCommandParameters,
};
var pkg = parent.Package as SqlCeToolboxPackage;
if (pkg.VSSupportsDDEX40())
if (pkg != null && pkg.VSSupportsDDEX40())
{
var addCe40DatabaseCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.AddCe40Database);
Expand All @@ -51,7 +51,7 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
Command = DatabaseMenuCommands.DatabaseCommand,
CommandParameter = databaseMenuCommandParameters,
};
if (pkg.VSSupportsDDEX35())
if (pkg != null && pkg.VSSupportsDDEX35())
{
addCe35DatabaseMenuItem.CommandBindings.Add(addCe35DatabaseCommandBinding);
addCe35DatabaseMenuItem.IsEnabled = ver35IsInstalled;
Expand All @@ -67,17 +67,17 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
}

// Add SQLite database menu
var addSQLiteDatabaseCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
var addSqLiteDatabaseCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
dcmd.AddSqLiteDatabase);
var addSQLiteDatabaseMenuItem = new MenuItem
var addSqLiteDatabaseMenuItem = new MenuItem
{
Header = "Add SQLite Connection...",
Icon = ImageHelper.GetImageFromResource("../resources/AddConnection_477.png"),
Command = DatabaseMenuCommands.DatabaseCommand,
CommandParameter = databaseMenuCommandParameters,
};
addSQLiteDatabaseMenuItem.CommandBindings.Add(addSQLiteDatabaseCommandBinding);
Items.Add(addSQLiteDatabaseMenuItem);
addSqLiteDatabaseMenuItem.CommandBindings.Add(addSqLiteDatabaseCommandBinding);
Items.Add(addSqLiteDatabaseMenuItem);

// Add from solution
var addFromSolutionCommandBinding = new CommandBinding(DatabaseMenuCommands.DatabaseCommand,
Expand Down Expand Up @@ -185,7 +185,7 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
scriptDatabaseSchemaDataMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataMenuItem);

var scriptDatabaseSchemaDataSQLiteMenuItem = new MenuItem
var scriptDatabaseSchemaDataSqLiteMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema and Data for SQLite...",
Icon = ImageHelper.GetImageFromResource("../resources/script_16xLG.png"),
Expand All @@ -194,10 +194,10 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaDataSQLite
};
scriptDatabaseSchemaDataSQLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataSQLiteMenuItem);
scriptDatabaseSchemaDataSqLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataSqLiteMenuItem);

var scriptDatabaseSchemaSQLiteMenuItem = new MenuItem
var scriptDatabaseSchemaSqLiteMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema for SQLite...",
Icon = ImageHelper.GetImageFromResource("../resources/script_16xLG.png"),
Expand All @@ -206,10 +206,10 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaSQLite
};
scriptDatabaseSchemaSQLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaSQLiteMenuItem);
scriptDatabaseSchemaSqLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaSqLiteMenuItem);

var scriptDatabaseSchemaDataBLOBMenuItem = new MenuItem
var scriptDatabaseSchemaDataBlobMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema and Data with BLOBs...",
ToolTip = toolTip,
Expand All @@ -218,8 +218,8 @@ public DatabasesContextMenu(DatabaseMenuCommandParameters databaseMenuCommandPar
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaDataBlobs
};
scriptDatabaseSchemaDataBLOBMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBLOBMenuItem);
scriptDatabaseSchemaDataBlobMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBlobMenuItem);



Expand Down
18 changes: 9 additions & 9 deletions src/GUI/SqlCe35Toolbox/ContextMenues/SqlServerDatabaseContextMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public SqlServerDatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCo
scriptDatabaseSchemaDataMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataMenuItem);

var scriptDatabaseSchemaDataSQLiteMenuItem = new MenuItem
var scriptDatabaseSchemaDataSqLiteMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema and Data for SQLite...",
Icon = ImageHelper.GetImageFromResource("../resources/script_16xLG.png"),
Expand All @@ -84,10 +84,10 @@ public SqlServerDatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCo
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaDataSQLite
};
scriptDatabaseSchemaDataSQLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataSQLiteMenuItem);
scriptDatabaseSchemaDataSqLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataSqLiteMenuItem);

var scriptDatabaseSchemaSQLiteMenuItem = new MenuItem
var scriptDatabaseSchemaSqLiteMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema for SQLite...",
Icon = ImageHelper.GetImageFromResource("../resources/script_16xLG.png"),
Expand All @@ -96,10 +96,10 @@ public SqlServerDatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCo
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaSQLite
};
scriptDatabaseSchemaSQLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaSQLiteMenuItem);
scriptDatabaseSchemaSqLiteMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaSqLiteMenuItem);

var scriptDatabaseSchemaDataBLOBMenuItem = new MenuItem
var scriptDatabaseSchemaDataBlobMenuItem = new MenuItem
{
Header = "Script SQL Server Database Schema and Data with BLOBs...",
ToolTip = toolTip,
Expand All @@ -108,8 +108,8 @@ public SqlServerDatabaseContextMenu(DatabaseMenuCommandParameters databaseMenuCo
CommandParameter = databaseMenuCommandParameters,
Tag = SqlCeScripting.Scope.SchemaDataBlobs
};
scriptDatabaseSchemaDataBLOBMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBLOBMenuItem);
scriptDatabaseSchemaDataBlobMenuItem.CommandBindings.Add(scriptDatabaseCommandBinding);
scriptDatabaseRootMenuItem.Items.Add(scriptDatabaseSchemaDataBlobMenuItem);
Items.Add(scriptDatabaseRootMenuItem);
Items.Add(new Separator());

Expand Down
26 changes: 13 additions & 13 deletions src/GUI/SqlCe35Toolbox/ContextMenues/ViewContextMenu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ public ViewContextMenu(MenuCommandParameters menuCommandParameters, ExplorerTool
CreateScriptAsDropMenuItem(tcmd, menuCommandParameters);
}

private void ReportDataMenuItem(ViewMenuCommandsHandler tcmd, MenuCommandParameters menuCommandParameters)
{
var scriptCommandBinding = new CommandBinding(TableMenuCommands.TableCommand, tcmd.ReportTableData);
var scriptMenuItem = new MenuItem
{
Header = "View Data as Report",
Icon = ImageHelper.GetImageFromResource("../resources/Tables_8928.png"),
Command = TableMenuCommands.TableCommand,
CommandParameter = menuCommandParameters
};
scriptMenuItem.CommandBindings.Add(scriptCommandBinding);
Items.Add(scriptMenuItem);
}
//private void ReportDataMenuItem(ViewMenuCommandsHandler tcmd, MenuCommandParameters menuCommandParameters)
//{
// var scriptCommandBinding = new CommandBinding(TableMenuCommands.TableCommand, tcmd.ReportTableData);
// var scriptMenuItem = new MenuItem
// {
// Header = "View Data as Report",
// Icon = ImageHelper.GetImageFromResource("../resources/Tables_8928.png"),
// Command = TableMenuCommands.TableCommand,
// CommandParameter = menuCommandParameters
// };
// scriptMenuItem.CommandBindings.Add(scriptCommandBinding);
// Items.Add(scriptMenuItem);
//}

private void CreateScriptAsCreateMenuItem(ViewMenuCommandsHandler tcmd, MenuCommandParameters menuCommandParameters)
{
Expand Down
2 changes: 1 addition & 1 deletion src/GUI/SqlCe35Toolbox/SqlCeToolboxPackage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public sealed class SqlCeToolboxPackage : Package
/// </summary>
public SqlCeToolboxPackage()
{
Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", this.ToString()));
Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering constructor for: {0}", ToString()));
}

public void SetStatus(string message)
Expand Down
18 changes: 10 additions & 8 deletions src/GUI/SqlCe35Toolbox/ToolWindows/DataEditControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@ public partial class DataEditControl
public List<int> ReadOnlyColumns { get; set; }
public string SqlText { get; set; }

public DataEditControl(DataGridViewWindow parentWindow)
public DataEditControl()
{
InitializeComponent();
}

public void ShowGrid()
{
ResultsetGrid = new ResultsetGrid();
ResultsetGrid.DatabaseInfo = this.DatabaseInfo;
ResultsetGrid.TableName = this.TableName;
ResultsetGrid.ReadOnly = this.ReadOnly;
ResultsetGrid.ReadOnlyColumns = this.ReadOnlyColumns;
ResultsetGrid.SqlText = this.SqlText;
this.winFormHost.Child = ResultsetGrid;
ResultsetGrid = new ResultsetGrid
{
DatabaseInfo = DatabaseInfo,
TableName = TableName,
ReadOnly = ReadOnly,
ReadOnlyColumns = ReadOnlyColumns,
SqlText = SqlText
};
winFormHost.Child = ResultsetGrid;
}
}
}
Loading

0 comments on commit 1d4920b

Please sign in to comment.