Changeset 9363 for branches/OaaS/HeuristicLab.Data.Views
- Timestamp:
- 04/16/13 13:13:41 (11 years ago)
- Location:
- branches/OaaS
- Files:
-
- 6 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj
r6866 r9363 128 128 </Compile> 129 129 <Compile Include="Plugin.cs" /> 130 <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs"> 131 <SubType>Form</SubType> 132 </Compile> 133 <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.Designer.cs"> 134 <DependentUpon>StringConvertibleMatrixColumnVisibilityDialog.cs</DependentUpon> 135 </Compile> 136 <Compile Include="StringConvertibleMatrixRowVisibilityDialog.cs"> 137 <SubType>Form</SubType> 138 </Compile> 139 <Compile Include="StringConvertibleMatrixRowVisibilityDialog.Designer.cs"> 140 <DependentUpon>StringConvertibleMatrixRowVisibilityDialog.cs</DependentUpon> 141 </Compile> 130 142 <Compile Include="StringConvertibleValueTupleView.cs"> 131 143 <SubType>UserControl</SubType> … … 141 153 <DependentUpon>BoolValueView.cs</DependentUpon> 142 154 </Compile> 143 <Compile Include=" ColumnsVisibilityDialog.cs">155 <Compile Include="StringConvertibleMatrixVisibilityDialog.cs"> 144 156 <SubType>Form</SubType> 145 157 </Compile> 146 <Compile Include=" ColumnsVisibilityDialog.Designer.cs">147 <DependentUpon> ColumnsVisibilityDialog.cs</DependentUpon>158 <Compile Include="StringConvertibleMatrixVisibilityDialog.Designer.cs"> 159 <DependentUpon>StringConvertibleMatrixVisibilityDialog.cs</DependentUpon> 148 160 </Compile> 149 161 <Compile Include="ComparisonView.cs"> … … 240 252 --> 241 253 <PropertyGroup> 242 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)254 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 243 255 set ProjectDir=$(ProjectDir) 244 256 set SolutionDir=$(SolutionDir) … … 247 259 call PreBuildEvent.cmd 248 260 </PreBuildEvent> 261 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 262 export ProjectDir=$(ProjectDir) 263 export SolutionDir=$(SolutionDir) 264 265 $SolutionDir/PreBuildEvent.sh 266 </PreBuildEvent> 249 267 </PropertyGroup> 250 268 </Project> -
branches/OaaS/HeuristicLab.Data.Views/3.3/Plugin.cs.frame
r7259 r9363 29 29 /// Plugin class for HeuristicLab.Data.Views plugin. 30 30 /// </summary> 31 [Plugin("HeuristicLab.Data.Views", "3.3. 6.$WCREV$")]31 [Plugin("HeuristicLab.Data.Views", "3.3.7.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Data.Views-3.3.dll", PluginFileType.Assembly)] 33 33 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/OaaS/HeuristicLab.Data.Views/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/OaaS/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs
r8139 r9363 35 35 [Content(typeof(IStringConvertibleMatrix), true)] 36 36 public partial class StringConvertibleMatrixView : AsynchronousContentView { 37 pr ivateint[] virtualRowIndices;37 protected int[] virtualRowIndices; 38 38 private List<KeyValuePair<int, SortOrder>> sortedColumnIndices; 39 39 private RowComparer rowComparer; … … 171 171 } 172 172 } 173 protected v oid UpdateRowHeaders() {173 protected virtual void UpdateRowHeaders() { 174 174 int index = dataGridView.FirstDisplayedScrollingRowIndex; 175 175 if (index == -1) index = 0; … … 509 509 contextMenu.Show(MousePosition); 510 510 } 511 pr ivatevoid ShowHideColumns_Click(object sender, EventArgs e) {512 new ColumnsVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog();511 protected virtual void ShowHideColumns_Click(object sender, EventArgs e) { 512 new StringConvertibleMatrixColumnVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog(); 513 513 } 514 514 -
branches/OaaS/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs
r7259 r9363 95 95 } 96 96 private void valueTextBox_Validating(object sender, CancelEventArgs e) { 97 if (ReadOnly) return; 97 98 string errorMessage; 98 99 if (!Content.Validate(valueTextBox.Text, out errorMessage)) { … … 103 104 } 104 105 private void valueTextBox_Validated(object sender, EventArgs e) { 106 if (ReadOnly) return; 105 107 if (!Content.ReadOnly) Content.SetValue(valueTextBox.Text); 106 108 errorProvider.SetError(valueTextBox, string.Empty);
Note: See TracChangeset
for help on using the changeset viewer.