Changeset 7257


Ignore:
Timestamp:
01/03/12 02:10:15 (8 years ago)
Author:
swagner
Message:

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

Location:
trunk/sources
Files:
16 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

    r6977 r7257  
    141141  </ItemGroup>
    142142  <ItemGroup>
    143     <EmbeddedResource Include="Views\HiveAdministratorView.resx">
    144       <DependentUpon>HiveAdministratorView.cs</DependentUpon>
    145     </EmbeddedResource>
    146     <EmbeddedResource Include="Views\Recurrence.resx">
    147       <DependentUpon>Recurrence.cs</DependentUpon>
    148     </EmbeddedResource>
    149     <EmbeddedResource Include="Views\ResourcesView.resx">
    150       <DependentUpon>ResourcesView.cs</DependentUpon>
    151     </EmbeddedResource>
    152     <EmbeddedResource Include="Views\ScheduleView.resx">
    153       <DependentUpon>ScheduleView.cs</DependentUpon>
    154     </EmbeddedResource>
    155     <EmbeddedResource Include="Views\SlaveView.resx">
    156       <DependentUpon>SlaveView.cs</DependentUpon>
    157     </EmbeddedResource>
    158   </ItemGroup>
    159   <ItemGroup>
    160143    <ProjectReference Include="..\..\HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj">
    161144      <Project>{730A9104-D4D1-4360-966B-E49B7571DDA3}</Project>
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame

    r7225 r7257  
    2727  [PluginDependency("HeuristicLab.Collections", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common", "3.3")]
     29  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2930  [PluginDependency("HeuristicLab.Core", "3.3")]
    3031  [PluginDependency("HeuristicLab.Core.Views", "3.3")] 
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

    r6976 r7257  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Recurrence));
    2726      this.gbAppointment = new System.Windows.Forms.GroupBox();
    2827      this.chbade = new System.Windows.Forms.CheckBox();
     
    243242      this.Controls.Add(this.gbAppointment);
    244243      this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
    245       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
     244      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
    246245      this.Name = "Recurrence";
    247246      this.Text = "Recurrence";
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

    r7146 r7257  
    4747    private void InitializeComponent() {
    4848      this.components = new System.ComponentModel.Container();
    49       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourcesView));
    5049      this.imageListSlaveGroups = new System.Windows.Forms.ImageList(this.components);
    5150      this.splitSlaves = new System.Windows.Forms.SplitContainer();
     
    103102      // btnRefresh
    104103      //
    105       this.btnRefresh.Image = ((System.Drawing.Image)(resources.GetObject("btnRefresh.Image")));
     104      this.btnRefresh.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    106105      this.btnRefresh.Location = new System.Drawing.Point(3, 3);
    107106      this.btnRefresh.Name = "btnRefresh";
     
    122121      // btnSave
    123122      //
    124       this.btnSave.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.Image")));
     123      this.btnSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
    125124      this.btnSave.Location = new System.Drawing.Point(93, 3);
    126125      this.btnSave.Name = "btnSave";
     
    133132      // btnRemoveGroup
    134133      //
    135       this.btnRemoveGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnRemoveGroup.Image")));
     134      this.btnRemoveGroup.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
    136135      this.btnRemoveGroup.Location = new System.Drawing.Point(63, 3);
    137136      this.btnRemoveGroup.Name = "btnRemoveGroup";
     
    144143      // btnAddGroup
    145144      //
    146       this.btnAddGroup.Image = ((System.Drawing.Image)(resources.GetObject("btnAddGroup.Image")));
     145      this.btnAddGroup.Image = HeuristicLab.Common.Resources.VSImageLibrary.Add;
    147146      this.btnAddGroup.Location = new System.Drawing.Point(33, 3);
    148147      this.btnAddGroup.Name = "btnAddGroup";
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

    r7146 r7257  
    4747      this.components = new System.ComponentModel.Container();
    4848      Calendar.DrawTool drawTool1 = new Calendar.DrawTool();
    49       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScheduleView));
    5049      this.dvOnline = new Calendar.DayView();
    5150      this.txttimeTo = new System.Windows.Forms.DateTimePicker();
     
    161160      // btnRecurrence
    162161      //
    163       this.btnRecurrence.Image = ((System.Drawing.Image)(resources.GetObject("btnRecurrence.Image")));
     162      this.btnRecurrence.Image = HeuristicLab.Common.Resources.VSImageLibrary.Timer;
    164163      this.btnRecurrence.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    165164      this.btnRecurrence.Location = new System.Drawing.Point(135, 129);
     
    174173      // btbDelete
    175174      //
    176       this.btbDelete.Image = ((System.Drawing.Image)(resources.GetObject("btbDelete.Image")));
     175      this.btbDelete.Image = HeuristicLab.Common.Resources.VSImageLibrary.Delete;
    177176      this.btbDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    178177      this.btbDelete.Location = new System.Drawing.Point(8, 129);
     
    205204      // btCreate
    206205      //
    207       this.btCreate.Image = ((System.Drawing.Image)(resources.GetObject("btCreate.Image")));
     206      this.btCreate.Image = HeuristicLab.Common.Resources.VSImageLibrary.Add;
    208207      this.btCreate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    209208      this.btCreate.Location = new System.Drawing.Point(6, 93);
     
    218217      // btnSaveCal
    219218      //
    220       this.btnSaveCal.Image = ((System.Drawing.Image)(resources.GetObject("btnSaveCal.Image")));
     219      this.btnSaveCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
    221220      this.btnSaveCal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    222221      this.btnSaveCal.Location = new System.Drawing.Point(633, 41);
     
    231230      // btnClearCal
    232231      //
    233       this.btnClearCal.Image = ((System.Drawing.Image)(resources.GetObject("btnClearCal.Image")));
     232      this.btnClearCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.Document;
    234233      this.btnClearCal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
    235234      this.btnClearCal.Location = new System.Drawing.Point(633, 9);
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

    r6976 r7257  
    136136  </ItemGroup>
    137137  <ItemGroup>
    138     <EmbeddedResource Include="Views\HiveJobManagerView.resx">
    139       <DependentUpon>HiveJobManagerView.cs</DependentUpon>
    140       <SubType>Designer</SubType>
    141     </EmbeddedResource>
    142     <EmbeddedResource Include="Views\HiveJobPermissionView.resx">
    143       <DependentUpon>HiveJobPermissionView.cs</DependentUpon>
    144     </EmbeddedResource>
    145     <EmbeddedResource Include="Views\RefreshableHiveJobView.resx">
    146       <DependentUpon>RefreshableHiveJobView.cs</DependentUpon>
    147     </EmbeddedResource>
    148   </ItemGroup>
    149   <ItemGroup>
    150138    <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.3\HeuristicLab.Clients.Hive.Views-3.3.csproj">
    151139      <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project>
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame

    r7225 r7257  
    2929  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3030  [PluginDependency("HeuristicLab.Common", "3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3132  [PluginDependency("HeuristicLab.Core", "3.3")]
    3233  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs

    r7103 r7257  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HiveJobManagerView));
    4847      this.hiveExperimentListView = new RefreshableHiveJobListView();
    4948      this.refreshButton = new System.Windows.Forms.Button();
     
    6564      // refreshButton
    6665      //
    67       this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     66      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    6867      this.refreshButton.Location = new System.Drawing.Point(3, 3);
    6968      this.refreshButton.Name = "refreshButton";
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

    r7104 r7257  
    2525    private void InitializeComponent() {
    2626      this.components = new System.ComponentModel.Container();
    27       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RefreshableHiveJobView));
    2827      this.tabControl = new System.Windows.Forms.TabControl();
    2928      this.tasksTabPage = new System.Windows.Forms.TabPage();
     
    125124      // refreshPermissionsButton
    126125      //
    127       this.refreshPermissionsButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshPermissionsButton.Image")));
     126      this.refreshPermissionsButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    128127      this.refreshPermissionsButton.Location = new System.Drawing.Point(3, 3);
    129128      this.refreshPermissionsButton.Name = "refreshPermissionsButton";
     
    228227      //
    229228      this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    230       this.startButton.Image = ((System.Drawing.Image)(resources.GetObject("startButton.Image")));
     229      this.startButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
    231230      this.startButton.Location = new System.Drawing.Point(0, 536);
    232231      this.startButton.Name = "startButton";
     
    240239      //
    241240      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    242       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
     241      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
    243242      this.stopButton.Location = new System.Drawing.Point(60, 536);
    244243      this.stopButton.Name = "stopButton";
     
    253252      this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    254253      this.resetButton.Enabled = false;
    255       this.resetButton.Image = ((System.Drawing.Image)(resources.GetObject("resetButton.Image")));
     254      this.resetButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
    256255      this.resetButton.Location = new System.Drawing.Point(90, 536);
    257256      this.resetButton.Name = "resetButton";
     
    285284      this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    286285      this.pauseButton.Enabled = false;
    287       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
     286      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
    288287      this.pauseButton.Location = new System.Drawing.Point(30, 536);
    289288      this.pauseButton.Name = "pauseButton";
     
    334333      // refreshButton
    335334      //
    336       this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
     335      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
    337336      this.refreshButton.Location = new System.Drawing.Point(3, 0);
    338337      this.refreshButton.Name = "refreshButton";
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r7256 r7257  
    187187      <DependentUpon>HiveInformationDialog.cs</DependentUpon>
    188188    </EmbeddedResource>
    189     <EmbeddedResource Include="HiveTasks\OptimizerHiveTaskView.resx">
    190       <DependentUpon>OptimizerHiveTaskView.cs</DependentUpon>
    191     </EmbeddedResource>
    192     <EmbeddedResource Include="HiveTasks\HiveTaskView.resx">
    193       <DependentUpon>HiveTaskView.cs</DependentUpon>
    194     </EmbeddedResource>
    195     <EmbeddedResource Include="TreeView\ItemTreeView.resx">
    196       <DependentUpon>ItemTreeView.cs</DependentUpon>
    197     </EmbeddedResource>
    198     <EmbeddedResource Include="StateLog\StateLogGanttChartListView.resx">
    199       <DependentUpon>StateLogGanttChartListView.cs</DependentUpon>
    200     </EmbeddedResource>
    201     <EmbeddedResource Include="GanttChart\GanttChart.resx">
    202       <DependentUpon>GanttChart.cs</DependentUpon>
    203     </EmbeddedResource>
    204     <EmbeddedResource Include="StateLog\StateLogGanttChartView.resx">
    205       <DependentUpon>StateLogGanttChartView.cs</DependentUpon>
    206     </EmbeddedResource>
    207     <EmbeddedResource Include="StateLog\StateLogView.resx">
    208       <DependentUpon>StateLogView.cs</DependentUpon>
    209     </EmbeddedResource>
    210     <EmbeddedResource Include="Progress\ProgressView.resx">
    211       <DependentUpon>ProgressView.cs</DependentUpon>
    212     </EmbeddedResource>
    213189  </ItemGroup>
    214190  <ItemGroup>
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.designer.cs

    r7104 r7257  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptimizerHiveTaskView));
    2726      this.restartButton = new System.Windows.Forms.Button();
    2827      this.pauseButton = new System.Windows.Forms.Button();
     
    6261      //
    6362      this.restartButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    64       this.restartButton.Image = ((System.Drawing.Image)(resources.GetObject("restartButton.Image")));
     63      this.restartButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Restart;
    6564      this.restartButton.Location = new System.Drawing.Point(3, 348);
    6665      this.restartButton.Name = "restartButton";
     
    7473      this.pauseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    7574      this.pauseButton.Enabled = false;
    76       this.pauseButton.Image = ((System.Drawing.Image)(resources.GetObject("pauseButton.Image")));
     75      this.pauseButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Pause;
    7776      this.pauseButton.Location = new System.Drawing.Point(33, 348);
    7877      this.pauseButton.Name = "pauseButton";
     
    8584      //
    8685      this.stopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
    87       this.stopButton.Image = ((System.Drawing.Image)(resources.GetObject("stopButton.Image")));
     86      this.stopButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Stop;
    8887      this.stopButton.Location = new System.Drawing.Point(63, 348);
    8988      this.stopButton.Name = "stopButton";
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.cs

    r7056 r7257  
    345345
    346346    protected virtual void contextMenuStrip_Opening(object sender, CancelEventArgs e) {
    347       if (treeView.SelectedNode != null) {
     347      if (treeView.SelectedNode == null) {
     348        e.Cancel = true;
     349      } else {
    348350        T selectedItem = treeView.SelectedNode.Tag as T;
    349351        T parentItem = GetParentItem(selectedItem);
     
    353355          contextMenuStrip.Items.Add(new DelegateMenuItem<T>(action.Name, action.Image, new Action<T, T>(action.Execute), selectedItem, parentItem));
    354356        }
     357        e.Cancel = contextMenuStrip.Items.Count == 0;
    355358      }
    356359    }
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/TreeView/ItemTreeView.designer.cs

    r6976 r7257  
    2626    private void InitializeComponent() {
    2727      this.components = new System.ComponentModel.Container();
    28       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ItemTreeView<T>));
    2928      this.splitContainer = new System.Windows.Forms.SplitContainer();
    3029      this.showDetailsCheckBox = new System.Windows.Forms.CheckBox();
     
    3332      this.treeView = new System.Windows.Forms.TreeView();
    3433      this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
    35       this.asfasdfToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    36       this.gfgffToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
    3734      this.imageList = new System.Windows.Forms.ImageList(this.components);
    3835      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
     
    123120      // contextMenuStrip
    124121      //
    125       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    126             this.asfasdfToolStripMenuItem,
    127             this.gfgffToolStripMenuItem});
    128122      this.contextMenuStrip.Name = "contextMenuStrip";
    129123      this.contextMenuStrip.Size = new System.Drawing.Size(153, 70);
    130124      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
    131       //
    132       // asfasdfToolStripMenuItem
    133       //
    134       this.asfasdfToolStripMenuItem.Name = "asfasdfToolStripMenuItem";
    135       this.asfasdfToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    136       this.asfasdfToolStripMenuItem.Text = "asfasdf";
    137       //
    138       // gfgffToolStripMenuItem
    139       //
    140       this.gfgffToolStripMenuItem.Name = "gfgffToolStripMenuItem";
    141       this.gfgffToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
    142       this.gfgffToolStripMenuItem.Text = "gfgff";
    143125      //
    144126      // imageList
     
    197179    private System.Windows.Forms.GroupBox detailsGroupBox;
    198180    private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
    199     private System.Windows.Forms.ToolStripMenuItem asfasdfToolStripMenuItem;
    200     private System.Windows.Forms.ToolStripMenuItem gfgffToolStripMenuItem;
    201181    protected System.Windows.Forms.CheckBox showDetailsCheckBox;
    202182    protected System.Windows.Forms.Button removeButton;
Note: See TracChangeset for help on using the changeset viewer.