Changeset 7257 for trunk/sources/HeuristicLab.Clients.Hive.Views

Timestamp:

01/03/12 02:10:15 (13 years ago)

Author:

swagner

Message:

Removed unnecessary resource files (*.resx) and removed unnecessary context menu items in ItemTreeView (#1725)

Location:

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3

Files:

• GanttChart/GanttChart.resx (deleted)
• HeuristicLab.Clients.Hive.Views-3.3.csproj (modified) (1 diff)
• HiveTasks/HiveTaskView.resx (deleted)
• HiveTasks/OptimizerHiveTaskView.designer.cs (modified) (4 diffs)
• HiveTasks/OptimizerHiveTaskView.resx (deleted)
• Progress/ProgressView.resx (deleted)
• StateLog/StateLogGanttChartListView.resx (deleted)
• StateLog/StateLogGanttChartView.resx (deleted)
• StateLog/StateLogView.resx (deleted)
• TreeView/ItemTreeView.cs (modified) (2 diffs)
• TreeView/ItemTreeView.designer.cs (modified) (4 diffs)
• TreeView/ItemTreeView.resx (deleted)

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

@@ -187 +187 @@
       <DependentUpon>HiveInformationDialog.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx">
-      <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="HiveTasks\HiveTaskView.resx">
-      <DependentUpon>HiveTaskView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TreeView\ItemTreeView.resx">
-      <DependentUpon>ItemTreeView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="StateLog\StateLogGanttChartListView.resx">
-      <DependentUpon>StateLogGanttChartListView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="GanttChart\GanttChart.resx">
-      <DependentUpon>GanttChart.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="StateLog\StateLogGanttChartView.resx">
-      <DependentUpon>StateLogGanttChartView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="StateLog\StateLogView.resx">
-      <DependentUpon>StateLogView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Progress\ProgressView.resx">
-      <DependentUpon>ProgressView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveTaskView));
       this.restartButton = new System.Windows.Forms.Button();
       this.pauseButton = new System.Windows.Forms.Button();
@@ -62 +61 @@
       // 
       this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
+      this.restartButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
       this.restartButton.Location = new System.Drawing.Point(3, 348);
       this.restartButton.Name = "restartButton";
@@ -74 +73 @@
       this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.pauseButton.Enabled = false;
-      this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
+      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
       this.pauseButton.Location = new System.Drawing.Point(33, 348);
       this.pauseButton.Name = "pauseButton";
@@ -85 +84 @@
       // 
       this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
+      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
       this.stopButton.Location = new System.Drawing.Point(63, 348);
       this.stopButton.Name = "stopButton";

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs

@@ -345 +345 @@
 
     protected virtual void contextMenuStrip_Opening(object sender, CancelEventArgs e) {
-      if (treeView.SelectedNode != null) {
+      if (treeView.SelectedNode == null) {
+        e.Cancel = true;
+      } else {
         T selectedItem = treeView.SelectedNode.Tag as T;
         T parentItem = GetParentItem(selectedItem);
@@ -353 +355 @@
           contextMenuStrip.Items.Add(new DelegateMenuItem<T>(action.Name, action.Image, new Action<T, T>(action.Execute), selectedItem, parentItem));
         }
+        e.Cancel = contextMenuStrip.Items.Count == 0;
       }
     }

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.designer.cs

@@ -26 +26 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ItemTreeView<T>));
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
@@ -33 +32 @@
       this.treeView = new System.Windows.Forms.TreeView();
       this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-      this.asfasdfToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.gfgffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.imageList = new System.Windows.Forms.ImageList(this.components);
       this.detailsGroupBox = new System.Windows.Forms.GroupBox();
@@ -123 +120 @@
       // contextMenuStrip
       // 
-      this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.asfasdfToolStripMenuItem,
-            this.gfgffToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
       this.contextMenuStrip.Size = new System.Drawing.Size(153, 70);
       this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
-      // 
-      // asfasdfToolStripMenuItem
-      // 
-      this.asfasdfToolStripMenuItem.Name = "asfasdfToolStripMenuItem";
-      this.asfasdfToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-      this.asfasdfToolStripMenuItem.Text = "asfasdf";
-      // 
-      // gfgffToolStripMenuItem
-      // 
-      this.gfgffToolStripMenuItem.Name = "gfgffToolStripMenuItem";
-      this.gfgffToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-      this.gfgffToolStripMenuItem.Text = "gfgff";
       // 
       // imageList
@@ -197 +179 @@
     private System.Windows.Forms.GroupBox detailsGroupBox;
     private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
-    private System.Windows.Forms.ToolStripMenuItem asfasdfToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem gfgffToolStripMenuItem;
     protected System.Windows.Forms.CheckBox showDetailsCheckBox;
     protected System.Windows.Forms.Button removeButton;