Context Navigation

← Previous Change
Next Change →

Views

Timestamp:

08/31/11 19:27:45 (13 years ago)

Author:

ascheibe

Message:

#1233 some renaming to be more consistent with OKB

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4

Files:

: 3 added
: 3 deleted
: 13 edited
: 1 moved

. (modified) (1 prop)
Views/Common/UpdateControl.Designer.cs (modified) (1 diff)
Views/Common/UpdateControl.cs (modified) (1 diff)
Views/HiveAdministrationView.Designer.cs (deleted)
Views/HiveAdministrationView.cs (deleted)
Views/HiveAdministrationView.resx (deleted)
Views/HiveAdministratorView.Designer.cs (added)
Views/HiveAdministratorView.cs (added)
Views/HiveAdministratorView.resx (added)
Views/HiveAppointment.cs (modified) (1 diff)
Views/MenuItems/AdministratorMenuItem.cs (moved) (moved from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/MenuItems/AdministrationMenuItem.cs) (2 diffs)
Views/Recurrence.Designer.cs (modified) (1 diff)
Views/Recurrence.cs (modified) (1 diff)
Views/RecurrentEvent.cs (modified) (1 diff)
Views/ResourcesView.Designer.cs (modified) (3 diffs)
Views/ResourcesView.cs (modified) (1 diff)
Views/ScheduleView.Designer.cs (modified) (1 diff)
Views/ScheduleView.cs (modified) (1 diff)
Views/SlaveView.Designer.cs (modified) (1 diff)
Views/SlaveView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4

Property svn:ignore

-                      old
+                      new
-bin
-obj
 HeuristicLab.Clients.Hive.Administration-3.4.csproj.user
 HeuristicLab.Clients.Hive.Administration-3.4.csproj.vs10x
 HeuristicLabClientsHiveAdministrationPlugin.cs
+HeuristicLabClientsHiveAdministratorPlugin.cs
+bin
+obj

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Common/UpdateControl.Designer.cs

r6373	r6688
1		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views.Common {
	1	namespace HeuristicLab.Clients.Hive.Administrator.Views.Common {
2	2	partial class UpdateControl {
3	3	/// <summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Common/UpdateControl.cs

r6373	r6688
3	3	using System.Windows.Forms;
4	4
5		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views.Common {
	5	namespace HeuristicLab.Clients.Hive.Administrator.Views.Common {
6	6	public partial class UpdateControl : UserControl {
7	7	public UpdateControl() {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/HiveAppointment.cs

r6451	r6688
24	24	using System.Xml.Serialization;
25	25
26		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	26	namespace HeuristicLab.Clients.Hive.Administrator.Views {
27	27
28	28	public class HiveAppointment : Calendar.Appointment {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/MenuItems/AdministratorMenuItem.cs

-                      r6682
+                      r6688
 using System.Collections.Generic;
 using HeuristicLab.Clients.Hive.Administration;
+using HeuristicLab.Clients.Hive.Administrator;
 using HeuristicLab.MainForm;
 namespace HeuristicLab.Optimizer.MenuItems {
   public class AdministrationMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
+  public class AdministratorMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
       get { return "&Administration"; }
+      get { return "&Administrator"; }
+    }
     public override IEnumerable<string> Structure {
 …
+    }
     public override void Execute() {
       MainFormManager.MainForm.ShowContent(new HiveAdministrationClient());
+      MainFormManager.MainForm.ShowContent(new HiveAdministratorClient());
+    }
     public override int Position {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Recurrence.Designer.cs

r6451	r6688
1		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	1	namespace HeuristicLab.Clients.Hive.Administrator.Views {
2	2	partial class Recurrence {
3	3	/// <summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/Recurrence.cs

r6373	r6688
24	24	using System.Windows.Forms;
25	25
26		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	26	namespace HeuristicLab.Clients.Hive.Administrator.Views {
27	27
28	28	public enum RecurrenceMode {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/RecurrentEvent.cs

r6373	r6688
23	23	using System.Collections.Generic;
24	24
25		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	25	namespace HeuristicLab.Clients.Hive.Administrator.Views {
26	26	public class RecurrentEvent {
27	27	public DateTime DateFrom { get; set; }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.Designer.cs

-                      r6437
+                      r6688
 #endregion
 using HeuristicLab.Clients.Hive.Administration.Views.Common;
 namespace HeuristicLab.Clients.Hive.Administration.Views {
+using HeuristicLab.Clients.Hive.Administrator.Views.Common;
+namespace HeuristicLab.Clients.Hive.Administrator.Views {
   partial class ResourcesView {
     /// <summary>
 …
       this.imageListSlaveGroups = new System.Windows.Forms.ImageList(this.components);
       this.splitSlaves = new System.Windows.Forms.SplitContainer();
       this.updateSlaveGroup = new HeuristicLab.Clients.Hive.Administration.Views.Common.UpdateControl();
+      this.updateSlaveGroup = new HeuristicLab.Clients.Hive.Administrator.Views.Common.UpdateControl();
       this.btnSave = new System.Windows.Forms.Button();
       this.btnRemoveGroup = new System.Windows.Forms.Button();
 …
       this.tabSlaveGroup = new System.Windows.Forms.TabControl();
       this.tabDetails = new System.Windows.Forms.TabPage();
       this.slaveView = new HeuristicLab.Clients.Hive.Administration.Views.SlaveView();
+      this.slaveView = new HeuristicLab.Clients.Hive.Administrator.Views.SlaveView();
       this.tabSchedule = new System.Windows.Forms.TabPage();
       this.updateScheduleControl = new HeuristicLab.Clients.Hive.Administration.Views.Common.UpdateControl();
       this.scheduleView = new HeuristicLab.Clients.Hive.Administration.Views.ScheduleView();
+      this.updateScheduleControl = new HeuristicLab.Clients.Hive.Administrator.Views.Common.UpdateControl();
+      this.scheduleView = new HeuristicLab.Clients.Hive.Administrator.Views.ScheduleView();
       ((System.ComponentModel.ISupportInitialize)(this.splitSlaves)).BeginInit();
       this.splitSlaves.Panel1.SuspendLayout();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs

r6492	r6688
29	29	using HeuristicLab.MainForm;
30	30
31		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	31	namespace HeuristicLab.Clients.Hive.Administrator.Views {
32	32	[View("ResourcesView")]
33	33	[Content(typeof(IItemList<Resource>), IsDefaultView = true)]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.Designer.cs

r6373	r6688
20	20	#endregion
21	21
22		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	22	namespace HeuristicLab.Clients.Hive.Administrator.Views {
23	23	partial class ScheduleView {
24	24	/// <summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs

r6454	r6688
31	31	using HeuristicLab.MainForm;
32	32
33		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	33	namespace HeuristicLab.Clients.Hive.Administrator.Views {
34	34	[View("ScheduleView")]
35	35	[Content(typeof(IItemList<Downtime>), IsDefaultView = true)]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.Designer.cs

r6464	r6688
20	20	#endregion
21	21
22		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	22	namespace HeuristicLab.Clients.Hive.Administrator.Views {
23	23	partial class SlaveView {
24	24	/// <summary>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/SlaveView.cs

r6464	r6688
26	26	using HeuristicLab.MainForm.WindowsForms;
27	27
28		namespace HeuristicLab.Clients.Hive.Administrat~~ion~~.Views {
	28	namespace HeuristicLab.Clients.Hive.Administrator.Views {
29	29	[View("SlaveView")]
30	30	[Content(typeof(Resource), IsDefaultView = true)]

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 6688 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views

Legend:

Download in other formats: