Changeset 10904 for branches/DataPreprocessing

Timestamp:

05/28/14 14:35:48 (10 years ago)

Author:

pfleck

Message:

• changed ViewShortcutCollection(View) to ViewShortcutList(View)

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataPreprocessingView.cs (modified) (3 diffs)
• DataPreprocessingView.designer.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• ViewShortcutListView.Designer.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutCollectionView.Designer.cs) (2 diffs)
• ViewShortcutListView.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutCollectionView.cs) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

@@ -53 +53 @@
         var dataCompletenessLogic = new ChartLogic(data);
 
-        var viewShortcuts = new ItemCollection<IViewShortcut> {
+        var viewShortcuts = new ItemList<IViewShortcut> {
           new DataGridContent(dataGridLogic, manipulationLogic, filterLogic),
           new StatisticsContent(statisticsLogic),
@@ -66 +66 @@
         };
 
-        viewShortcutCollectionView.Content = viewShortcuts.AsReadOnly();
+        viewShortcutListView.Content = viewShortcuts.AsReadOnly();
 
-        viewShortcutCollectionView.ItemsListView.Items[0].Selected = true;
-        viewShortcutCollectionView.Select();
+        viewShortcutListView.ItemsListView.Items[0].Selected = true;
+        viewShortcutListView.Select();
 
       } else {
-        viewShortcutCollectionView.Content = null;
+        viewShortcutListView.Content = null;
       }
     }
@@ -78 +78 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      viewShortcutCollectionView.Enabled = Content != null;
+      viewShortcutListView.Enabled = Content != null;
       applyInNewTabButton.Enabled = Content != null;
       exportProblemButton.Enabled = Content != null;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.designer.cs

@@ -51 +51 @@
       this.exportProblemButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.viewShortcutCollectionView = new HeuristicLab.DataPreprocessing.Views.ViewShortcutCollectionView();
+      this.viewShortcutListView = new HeuristicLab.DataPreprocessing.Views.ViewShortcutListView();
       this.SuspendLayout();
       // 
@@ -87 +87 @@
       this.exportProblemButton.Click += new System.EventHandler(this.exportProblemButton_Click);
       // 
-      // viewShortcutCollectionView
+      // ViewShortcutListView
       // 
-      this.viewShortcutCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.viewShortcutListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
             | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.viewShortcutCollectionView.Caption = "ViewShortcutCollection View";
-      this.viewShortcutCollectionView.Content = null;
-      this.viewShortcutCollectionView.Location = new System.Drawing.Point(4, 33);
-      this.viewShortcutCollectionView.Name = "viewShortcutCollectionView";
-      this.viewShortcutCollectionView.ReadOnly = false;
-      this.viewShortcutCollectionView.ShowDetails = true;
-      this.viewShortcutCollectionView.Size = new System.Drawing.Size(831, 413);
-      this.viewShortcutCollectionView.TabIndex = 4;
+      this.viewShortcutListView.Caption = "ViewShortcutCollection View";
+      this.viewShortcutListView.Content = null;
+      this.viewShortcutListView.Location = new System.Drawing.Point(4, 33);
+      this.viewShortcutListView.Name = "viewShortcutListView";
+      this.viewShortcutListView.ReadOnly = false;
+      this.viewShortcutListView.Size = new System.Drawing.Size(831, 413);
+      this.viewShortcutListView.TabIndex = 4;
       // 
       // DataPreprocessingView
@@ -105 +104 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.viewShortcutCollectionView);
+      this.Controls.Add(this.viewShortcutListView);
       this.Controls.Add(this.undoButton);
       this.Controls.Add(this.applyInNewTabButton);
@@ -121 +120 @@
     private System.Windows.Forms.Button undoButton;
     private System.Windows.Forms.ToolTip toolTip;
-    private ViewShortcutCollectionView viewShortcutCollectionView;
+    private ViewShortcutListView viewShortcutListView;
 
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -183 +183 @@
     <Compile Include="Utils\FindPreprocessingItemsIterator.cs" />
     <Compile Include="Utils\IFindPreprocessingItemsIterator.cs" />
-    <Compile Include="ViewShortcutCollectionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ViewShortcutCollectionView.Designer.cs">
-      <DependentUpon>ViewShortcutCollectionView.cs</DependentUpon>
+    <Compile Include="ViewShortcutListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ViewShortcutListView.Designer.cs">
+      <DependentUpon>ViewShortcutListView.cs</DependentUpon>
     </Compile>
   </ItemGroup>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutListView.Designer.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class ViewShortcutCollectionView {
+  partial class ViewShortcutListView {
     /// <summary> 
     /// Required designer variable.
@@ -48 +48 @@
       this.SuspendLayout();
       // 
-      // ViewShortcutCollectionView
+      // ViewShortcutListView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.Name = "ViewShortcutCollectionView";
+      this.Name = "ViewShortcutListView";
       this.Size = new System.Drawing.Size(532, 383);
       this.ResumeLayout(false);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutListView.cs

@@ -20 +20 @@
 #endregion
 
-
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -27 +26 @@
 namespace HeuristicLab.DataPreprocessing.Views {
   [View("ViewShortcutCollection View")]
-  [Content(typeof(IItemCollection<IViewShortcut>), true)]
-  public partial class ViewShortcutCollectionView : ItemCollectionView<IViewShortcut> {
+  [Content(typeof(IItemList<IViewShortcut>), true)]
+  public partial class ViewShortcutListView : ItemListView<IViewShortcut> {
 
-    public ViewShortcutCollectionView() {
+    public ViewShortcutListView() {
       InitializeComponent();
       itemsGroupBox.Text = "View Shortcuts";