Skip to content

Commit 3f43b95

Browse files
RoelantVosRoelantVos
committed
Updated version + grid layout fix
Notes is now changeable as column
1 parent a5e274a commit 3f43b95

File tree

4 files changed

+57
-43
lines changed

4 files changed

+57
-43
lines changed

‎Virtual_EDW/Form_Main.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Virtual_EDW/Form_Main.cs‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public FormMain()
3131
InitializeComponent();
3232

3333
// Set the version of the build for everything
34-
const string versionNumberForApplication = "v1.6.9";
34+
const string versionNumberForApplication = "v1.6.10";
3535

3636
Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
3737
labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";
@@ -102,7 +102,7 @@ public FormMain()
102102
var comboItem = comboBoxEnvironments.Items.Cast<KeyValuePair<string, TeamEnvironment>>().FirstOrDefault(item => item.Value.Equals(VdwConfigurationSettings.ActiveEnvironment));
103103
comboBoxEnvironments.SelectedItem = comboItem;
104104

105-
richTextBoxInformationMain.AppendText("Application initialised - welcome to the Virtual Data Warehouse! \r\n\r\n");
105+
richTextBoxInformationMain.AppendText("Welcome to the Virtual Data Warehouse! \r\n\r\n");
106106

107107
checkBoxGenerateInDatabase.Checked = false;
108108

@@ -121,14 +121,15 @@ public FormMain()
121121
SetTextMain("There are no templates found in the designated template directory. Please verify if there is a " + GlobalParameters.TemplateCollectionFileName + " in the " + VdwConfigurationSettings.TemplatePath + " directory, and if the file contains templates.");
122122
}
123123

124-
_templateGridView = new TemplateGridView(TeamConfigurationSettings);
125-
126124
// Define and populate the data grid.
125+
_templateGridView = new TemplateGridView(TeamConfigurationSettings);
127126
((ISupportInitialize)(_templateGridView)).BeginInit();
127+
128128
_templateGridView.DoubleBuffered(true);
129129
tabPageSettings.Controls.Add(_templateGridView);
130-
((ISupportInitialize)(_templateGridView)).EndInit();
131130

131+
((ISupportInitialize)(_templateGridView)).EndInit();
132+
132133
PopulateTemplateCollectionDataGrid();
133134

134135
_templateGridView.AutoLayout();
@@ -202,11 +203,29 @@ public void PopulateTemplateCollectionDataGrid()
202203
}
203204
}
204205

205-
//Make sure the changes are seen as committed, so that changes can be detected later on.
206+
// Make sure the changes are seen as committed, so that changes can be detected later on.
206207
templateDataTable.AcceptChanges();
207208

208209
_bindingSourceTemplateCollection.DataSource = templateDataTable;
209210
_templateGridView.DataSource = _bindingSourceTemplateCollection;
211+
212+
// Layout.
213+
try
214+
{
215+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateName].Width = 300;
216+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateType].Width = 200;
217+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateConnectionKey].Width = 75;
218+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateOutputFileConvention].Width = 200;
219+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateFilePath].Width = 150;
220+
221+
_templateGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
222+
223+
_templateGridView.Columns[(int)TemplateGridColumns.TemplateNotes].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
224+
}
225+
catch
226+
{
227+
// Do nothing.
228+
}
210229
}
211230

212231
[PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
@@ -531,12 +550,11 @@ private void openVDWConfigurationSettingsFileToolStripMenuItem_Click(object send
531550
{
532551
try
533552
{
534-
Process.Start(GlobalParameters.VdwConfigurationPath + GlobalParameters.VdwConfigurationFileName);
535-
553+
Process.Start(GlobalParameters.CorePath + GlobalParameters.VdwConfigurationFileName);
536554
}
537555
catch (Exception ex)
538556
{
539-
richTextBoxInformationMain.Text = "An error has occurred while attempting to open the VDW configuration file. The error message is: " + ex.Message;
557+
richTextBoxInformationMain.Text = $"An error has occurred while attempting to open the VDW configuration file at {GlobalParameters.CorePath + GlobalParameters.VdwConfigurationFileName}. The error message is: " + ex.Message;
540558
}
541559
}
542560

‎Virtual_EDW/LoadPatternGrid.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,15 @@ public TemplateGridView(TeamConfiguration teamConfiguration)
1212
{
1313
#region Generic properties
1414

15+
// Disable resizing for performance, will be enabled after binding.
16+
RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.DisableResizing;
17+
ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
18+
AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.None;
19+
AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
20+
1521
AutoGenerateColumns = false;
1622
ColumnHeadersVisible = true;
23+
1724
EditMode = DataGridViewEditMode.EditOnEnter;
1825

1926
Location = new Point(3, 191);
@@ -81,12 +88,12 @@ public TemplateGridView(TeamConfiguration teamConfiguration)
8188
Name = TemplateGridColumns.TemplateNotes.ToString(),
8289
HeaderText = "Notes",
8390
DataPropertyName = TemplateGridColumns.TemplateNotes.ToString()
91+
//Width = 400
8492
};
8593
Columns.Add(TemplateNotes);
8694

8795
#endregion
8896

89-
9097
#region Event Handlers
9198

9299
CurrentCellDirtyStateChanged += dataGridViewTemplateCollection_CurrentCellDirtyStateChanged;
@@ -147,10 +154,10 @@ public void AutoLayout()
147154
//dataGridView.Columns[dataGridView.ColumnCount - 1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
148155

149156
// Disable the auto size again (to enable manual resizing).
150-
for (var i = 0; i < this.Columns.Count - 1; i++)
157+
for (var i = 0; i < Columns.Count - 1; i++)
151158
{
152-
this.Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
153-
this.Columns[i].Width = this.Columns[i].GetPreferredWidth(DataGridViewAutoSizeColumnMode.AllCells, true);
159+
Columns[i].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
160+
Columns[i].Width = Columns[i].GetPreferredWidth(DataGridViewAutoSizeColumnMode.AllCells, true);
154161
}
155162
}
156163
catch

‎Virtual_EDW_Installer/Virtual_EDW_Installer.vdproj‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,25 +1318,25 @@
13181318
"Entry"
13191319
{
13201320
"MsmKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
1321-
"OwnerKey" = "8:_E6DCDC7D499504C82FDEAD092A5F9772"
1321+
"OwnerKey" = "8:_7C7CC4425468465A8E774BFE2D253A37"
13221322
"MsmSig" = "8:_UNDEFINED"
13231323
}
13241324
"Entry"
13251325
{
13261326
"MsmKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
1327-
"OwnerKey" = "8:_7C7CC4425468465A8E774BFE2D253A37"
1327+
"OwnerKey" = "8:_7D3D5CA263538B83FA396B493987851B"
13281328
"MsmSig" = "8:_UNDEFINED"
13291329
}
13301330
"Entry"
13311331
{
13321332
"MsmKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
1333-
"OwnerKey" = "8:_7D3D5CA263538B83FA396B493987851B"
1333+
"OwnerKey" = "8:_166CE0850202A00C0452B48DF9E8752F"
13341334
"MsmSig" = "8:_UNDEFINED"
13351335
}
13361336
"Entry"
13371337
{
13381338
"MsmKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
1339-
"OwnerKey" = "8:_166CE0850202A00C0452B48DF9E8752F"
1339+
"OwnerKey" = "8:_E6DCDC7D499504C82FDEAD092A5F9772"
13401340
"MsmSig" = "8:_UNDEFINED"
13411341
}
13421342
"Entry"
@@ -1882,12 +1882,6 @@
18821882
"Entry"
18831883
{
18841884
"MsmKey" = "8:_UNDEFINED"
1885-
"OwnerKey" = "8:_7C7CC4425468465A8E774BFE2D253A37"
1886-
"MsmSig" = "8:_UNDEFINED"
1887-
}
1888-
"Entry"
1889-
{
1890-
"MsmKey" = "8:_UNDEFINED"
18911885
"OwnerKey" = "8:_5C4911463B299FE8CE8A85DED339A3EA"
18921886
"MsmSig" = "8:_UNDEFINED"
18931887
}
@@ -2152,13 +2146,19 @@
21522146
"Entry"
21532147
{
21542148
"MsmKey" = "8:_UNDEFINED"
2155-
"OwnerKey" = "8:_0E622166C3E81D688557A2CEEBF515A9"
2149+
"OwnerKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
21562150
"MsmSig" = "8:_UNDEFINED"
21572151
}
21582152
"Entry"
21592153
{
21602154
"MsmKey" = "8:_UNDEFINED"
2161-
"OwnerKey" = "8:_E6F90EBE7E643A437E1160D445BB22FE"
2155+
"OwnerKey" = "8:_7C7CC4425468465A8E774BFE2D253A37"
2156+
"MsmSig" = "8:_UNDEFINED"
2157+
}
2158+
"Entry"
2159+
{
2160+
"MsmKey" = "8:_UNDEFINED"
2161+
"OwnerKey" = "8:_0E622166C3E81D688557A2CEEBF515A9"
21622162
"MsmSig" = "8:_UNDEFINED"
21632163
}
21642164
"Entry"
@@ -2860,12 +2860,6 @@
28602860
"Entry"
28612861
{
28622862
"MsmKey" = "8:_UNDEFINED"
2863-
"OwnerKey" = "8:_BCD43EDEAC99CBA134EC603F0C99282F"
2864-
"MsmSig" = "8:_UNDEFINED"
2865-
}
2866-
"Entry"
2867-
{
2868-
"MsmKey" = "8:_UNDEFINED"
28692863
"OwnerKey" = "8:_EF27ABF6E0A5E3C9779A659453CDF0D1"
28702864
"MsmSig" = "8:_UNDEFINED"
28712865
}
@@ -7761,11 +7755,6 @@
77617755
"AssemblyAsmDisplayName" = "8:System.Security.Cryptography.ProtectedData, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
77627756
"ScatterAssemblies"
77637757
{
7764-
"_E6F90EBE7E643A437E1160D445BB22FE"
7765-
{
7766-
"Name" = "8:System.Security.Cryptography.ProtectedData.dll"
7767-
"Attributes" = "3:512"
7768-
}
77697758
}
77707759
"SourcePath" = "8:System.Security.Cryptography.ProtectedData.dll"
77717760
"TargetName" = "8:"
@@ -8350,23 +8339,23 @@
83508339
{
83518340
"Name" = "8:Microsoft Visual Studio"
83528341
"ProductName" = "8:Virtual Data Warehouse"
8353-
"ProductCode" = "8:{FE48DFAA-FB08-493A-A163-05234021433F}"
8354-
"PackageCode" = "8:{DA4DBE5B-786D-4CA1-9F72-A0194702E113}"
8342+
"ProductCode" = "8:{04E9B8CA-8DB7-4FA5-ABBD-756BD45BDBD0}"
8343+
"PackageCode" = "8:{274CC7A7-9C8A-4F95-A637-962135FA0262}"
83558344
"UpgradeCode" = "8:{CAA37576-CF3A-4799-AF70-44CB58934E54}"
83568345
"AspNetVersion" = "8:4.0.30319.0"
83578346
"RestartWWWService" = "11:FALSE"
83588347
"RemovePreviousVersions" = "11:FALSE"
83598348
"DetectNewerInstalledVersion" = "11:TRUE"
83608349
"InstallAllUsers" = "11:TRUE"
8361-
"ProductVersion" = "8:1.6.9"
8350+
"ProductVersion" = "8:1.6.10"
83628351
"Manufacturer" = "8:RoelantVos"
83638352
"ARPHELPTELEPHONE" = "8:"
83648353
"ARPHELPLINK" = "8:http://www.roelantvos.com/blog"
83658354
"Title" = "8:Virtual Data Warehouse"
83668355
"Subject" = "8:"
83678356
"ARPCONTACT" = "8:Roelant Vos"
83688357
"Keywords" = "8:"
8369-
"ARPCOMMENTS" = "8:Virtual Enterprise Data Warehouse"
8358+
"ARPCOMMENTS" = "8:Virtual Data Warehouse"
83708359
"ARPURLINFOABOUT" = "8:http://www.roelantvos.com/blog"
83718360
"ARPPRODUCTICON" = "8:_8E7FD6A35F0E43CD8A7D134E58D880F4"
83728361
"ARPIconIndex" = "3:0"

0 commit comments

Comments
 (0)