Ignore:
Timestamp:
09/13/18 13:18:45 (14 months ago)
Author:
ddorfmei
Message:

#2931: Merged [16046-16138/trunk] into branch

Location:
branches/2931_OR-Tools_LP_MIP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2931_OR-Tools_LP_MIP

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.Clients.Hive.Administrator

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

    r15583 r16139  
    3737        components.Dispose();
    3838      }
    39       HiveAdminClient.Instance.Refreshing -= new EventHandler(Instance_Refreshing);
    40       HiveAdminClient.Instance.Refreshed -= new EventHandler(Instance_Refreshed);
    41 
    42       Access.AccessClient.Instance.Refreshing -= new EventHandler(AccessClient_Refreshing);
    43       Access.AccessClient.Instance.Refreshed -= new EventHandler(AccessClient_Refreshed);
    4439      base.Dispose(disposing);
    4540    }
     
    5651      this.splitSlaves = new System.Windows.Forms.SplitContainer();
    5752      this.btnRefresh = new System.Windows.Forms.Button();
    58       this.progressBar = new System.Windows.Forms.ProgressBar();
    5953      this.btnSave = new System.Windows.Forms.Button();
    6054      this.btnRemoveGroup = new System.Windows.Forms.Button();
    6155      this.btnAddGroup = new System.Windows.Forms.Button();
    62       this.btnPermissionsSave = new System.Windows.Forms.Button();
    63       this.treeSlaveGroup = new System.Windows.Forms.TreeView();
     56      this.treeView = new Hive.Views.TreeView.NoDoubleClickTreeView();
    6457      this.tabSlaveGroup = new System.Windows.Forms.TabControl();
    6558      this.tabDetails = new System.Windows.Forms.TabPage();
    66       this.slaveView = new HeuristicLab.Clients.Hive.Administrator.Views.SlaveView();
     59      this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    6760      this.tabSchedule = new System.Windows.Forms.TabPage();
    6861      this.scheduleView = new HeuristicLab.Clients.Hive.Administrator.Views.ScheduleView();
    6962      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
    70       this.tabPermissions = new System.Windows.Forms.TabPage();
    71       this.permissionView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightUserView();
    7263      ((System.ComponentModel.ISupportInitialize)(this.splitSlaves)).BeginInit();
    7364      this.splitSlaves.Panel1.SuspendLayout();
     
    7768      this.tabDetails.SuspendLayout();
    7869      this.tabSchedule.SuspendLayout();
    79       this.tabPermissions.SuspendLayout();
    8070      this.SuspendLayout();
    8171      //
     
    8878      // splitSlaves
    8979      //
    90       this.splitSlaves.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    91             | System.Windows.Forms.AnchorStyles.Left)
     80      this.splitSlaves.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     81            | System.Windows.Forms.AnchorStyles.Left) 
    9282            | System.Windows.Forms.AnchorStyles.Right)));
    9383      this.splitSlaves.Location = new System.Drawing.Point(3, 3);
     
    9787      //
    9888      this.splitSlaves.Panel1.Controls.Add(this.btnRefresh);
    99       this.splitSlaves.Panel1.Controls.Add(this.progressBar);
    10089      this.splitSlaves.Panel1.Controls.Add(this.btnSave);
    10190      this.splitSlaves.Panel1.Controls.Add(this.btnRemoveGroup);
    10291      this.splitSlaves.Panel1.Controls.Add(this.btnAddGroup);
    103       this.splitSlaves.Panel1.Controls.Add(this.treeSlaveGroup);
     92      this.splitSlaves.Panel1.Controls.Add(this.treeView);
    10493      //
    10594      // splitSlaves.Panel2
     
    117106      this.btnRefresh.Size = new System.Drawing.Size(24, 24);
    118107      this.btnRefresh.TabIndex = 8;
    119       this.toolTip.SetToolTip(this.btnRefresh, "Fetch list from server");
     108      this.toolTip.SetToolTip(this.btnRefresh, "Fetch list from server.");
    120109      this.btnRefresh.UseVisualStyleBackColor = true;
    121110      this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
    122111      //
    123       // progressBar
    124       //
    125       this.progressBar.Location = new System.Drawing.Point(123, 4);
    126       this.progressBar.Name = "progressBar";
    127       this.progressBar.Size = new System.Drawing.Size(123, 23);
    128       this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
    129       this.progressBar.TabIndex = 7;
    130       //
    131112      // btnSave
    132113      //
    133       this.btnSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
     114      this.btnSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
    134115      this.btnSave.Location = new System.Drawing.Point(93, 3);
    135116      this.btnSave.Name = "btnSave";
    136117      this.btnSave.Size = new System.Drawing.Size(24, 24);
    137118      this.btnSave.TabIndex = 5;
    138       this.toolTip.SetToolTip(this.btnSave, "Store slave and group configuration on the server");
     119      this.toolTip.SetToolTip(this.btnSave, "Store slave and group configuration on the server.");
    139120      this.btnSave.UseVisualStyleBackColor = true;
    140121      this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
     
    147128      this.btnRemoveGroup.Size = new System.Drawing.Size(24, 24);
    148129      this.btnRemoveGroup.TabIndex = 2;
    149       this.toolTip.SetToolTip(this.btnRemoveGroup, "Delete a slave or a group");
     130      this.toolTip.SetToolTip(this.btnRemoveGroup, "Remove a slave or a group.");
    150131      this.btnRemoveGroup.UseVisualStyleBackColor = true;
    151132      this.btnRemoveGroup.Click += new System.EventHandler(this.btnRemoveGroup_Click);
     
    158139      this.btnAddGroup.Size = new System.Drawing.Size(24, 24);
    159140      this.btnAddGroup.TabIndex = 1;
    160       this.toolTip.SetToolTip(this.btnAddGroup, "Add a new group");
     141      this.toolTip.SetToolTip(this.btnAddGroup, "Add a new group.");
    161142      this.btnAddGroup.UseVisualStyleBackColor = true;
    162143      this.btnAddGroup.Click += new System.EventHandler(this.btnAddGroup_Click);
    163144      //
    164       // treeSlaveGroup
    165       //
    166       this.treeSlaveGroup.AllowDrop = true;
    167       this.treeSlaveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    168             | System.Windows.Forms.AnchorStyles.Left)
    169             | System.Windows.Forms.AnchorStyles.Right)));
    170       this.treeSlaveGroup.ImageIndex = 0;
    171       this.treeSlaveGroup.ImageList = this.imageListSlaveGroups;
    172       this.treeSlaveGroup.Location = new System.Drawing.Point(3, 33);
    173       this.treeSlaveGroup.Name = "treeSlaveGroup";
    174       this.treeSlaveGroup.SelectedImageIndex = 0;
    175       this.treeSlaveGroup.Size = new System.Drawing.Size(243, 511);
    176       this.treeSlaveGroup.TabIndex = 0;
    177       this.treeSlaveGroup.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeSlaveGroup_ItemDrag);
    178       this.treeSlaveGroup.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeSlaveGroup_AfterSelect);
    179       this.treeSlaveGroup.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragDrop);
    180       this.treeSlaveGroup.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragEnter);
    181       this.treeSlaveGroup.DragOver += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragOver);
    182       this.treeSlaveGroup.QueryContinueDrag += new System.Windows.Forms.QueryContinueDragEventHandler(this.treeSlaveGroup_QueryContinueDrag);
     145      // treeView
     146      //
     147      this.treeView.AllowDrop = true;
     148      this.treeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     149            | System.Windows.Forms.AnchorStyles.Left)
     150            | System.Windows.Forms.AnchorStyles.Right)));
     151      this.treeView.CheckBoxes = true;
     152      this.treeView.ImageIndex = 0;
     153      this.treeView.ImageList = this.imageListSlaveGroups;
     154      this.treeView.Location = new System.Drawing.Point(3, 33);
     155      this.treeView.Name = "treeView";
     156      this.treeView.SelectedImageIndex = 0;
     157      this.treeView.Size = new System.Drawing.Size(243, 511);
     158      this.treeView.TabIndex = 0;
     159      this.treeView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.treeSlaveGroup_ItemDrag);
     160      this.treeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.treeSlaveGroup_MouseDown);
     161      this.treeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeSlaveGroup_BeforeSelect);
     162      this.treeView.DragDrop += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragDrop);
     163      this.treeView.DragEnter += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragEnterOver);
     164      this.treeView.DragOver += new System.Windows.Forms.DragEventHandler(this.treeSlaveGroup_DragEnterOver);
     165      this.treeView.BeforeCheck += new System.Windows.Forms.TreeViewCancelEventHandler(this.treeSlaveGroup_BeforeCheck);
    183166      //
    184167      // tabSlaveGroup
    185168      //
    186       this.tabSlaveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    187             | System.Windows.Forms.AnchorStyles.Left)
     169      this.tabSlaveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     170            | System.Windows.Forms.AnchorStyles.Left) 
    188171            | System.Windows.Forms.AnchorStyles.Right)));
    189172      this.tabSlaveGroup.Controls.Add(this.tabDetails);
    190173      this.tabSlaveGroup.Controls.Add(this.tabSchedule);
    191       this.tabSlaveGroup.Controls.Add(this.tabPermissions);
    192174      this.tabSlaveGroup.Location = new System.Drawing.Point(3, 3);
    193175      this.tabSlaveGroup.Name = "tabSlaveGroup";
     
    195177      this.tabSlaveGroup.Size = new System.Drawing.Size(585, 541);
    196178      this.tabSlaveGroup.TabIndex = 1;
    197       this.tabSlaveGroup.SelectedIndexChanged += new System.EventHandler(this.tabSlaveGroup_SelectedIndexChanged);
     179      //this.tabSlaveGroup.TabIndexChanged += TabSlaveGroup_TabIndexChanged;
     180      this.tabSlaveGroup.Selected += TabSlaveGroup_Selected;
    198181      //
    199182      // tabDetails
    200183      //
    201       this.tabDetails.Controls.Add(this.slaveView);
     184      this.tabDetails.Controls.Add(this.viewHost);
    202185      this.tabDetails.Location = new System.Drawing.Point(4, 22);
    203186      this.tabDetails.Name = "tabDetails";
     
    208191      this.tabDetails.UseVisualStyleBackColor = true;
    209192      //
    210       // slaveView
    211       //
    212       this.slaveView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    213             | System.Windows.Forms.AnchorStyles.Left)
    214             | System.Windows.Forms.AnchorStyles.Right)));
    215       this.slaveView.Caption = "SlaveView";
    216       this.slaveView.Content = null;
    217       this.slaveView.Location = new System.Drawing.Point(6, 6);
    218       this.slaveView.Name = "slaveView";
    219       this.slaveView.ReadOnly = false;
    220       this.slaveView.Size = new System.Drawing.Size(565, 503);
    221       this.slaveView.TabIndex = 0;
     193      // viewHost
     194      //
     195      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     196            | System.Windows.Forms.AnchorStyles.Left)
     197            | System.Windows.Forms.AnchorStyles.Right)));
     198      this.viewHost.Caption = "View";
     199      this.viewHost.Content = null;
     200      this.viewHost.Enabled = true;
     201      this.viewHost.Location = new System.Drawing.Point(6, 6);
     202      this.viewHost.Name = "viewHost";
     203      this.viewHost.ReadOnly = false;
     204      this.viewHost.Size = new System.Drawing.Size(565, 503);
     205      this.viewHost.TabIndex = 0;
     206      this.viewHost.ViewsLabelVisible = true;
     207      this.viewHost.ViewType = null;
    222208      //
    223209      // tabSchedule
     
    234220      // scheduleView
    235221      //
    236       this.scheduleView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    237             | System.Windows.Forms.AnchorStyles.Left)
     222      this.scheduleView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     223            | System.Windows.Forms.AnchorStyles.Left) 
    238224            | System.Windows.Forms.AnchorStyles.Right)));
    239225      this.scheduleView.Caption = "ScheduleView";
     
    244230      this.scheduleView.Size = new System.Drawing.Size(565, 503);
    245231      this.scheduleView.TabIndex = 0;
    246       //
    247       // tabPermissions
    248       //
    249       this.tabPermissions.Controls.Add(this.btnPermissionsSave);
    250       this.tabPermissions.Controls.Add(this.permissionView);
    251       this.tabPermissions.Location = new System.Drawing.Point(4, 22);
    252       this.tabPermissions.Name = "tabPermissions";
    253       this.tabPermissions.Padding = new System.Windows.Forms.Padding(3);
    254       this.tabPermissions.Size = new System.Drawing.Size(577, 515);
    255       this.tabPermissions.TabIndex = 2;
    256       this.tabPermissions.Text = "Permissions";
    257       this.tabPermissions.UseVisualStyleBackColor = true;
    258       //
    259       // btnPermissionsSave
    260       //
    261       this.btnPermissionsSave.Enabled = false;
    262       this.btnPermissionsSave.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
    263       this.btnPermissionsSave.Location = new System.Drawing.Point(39, 9);
    264       this.btnPermissionsSave.Name = "btnPermissionsSave";
    265       this.btnPermissionsSave.Size = new System.Drawing.Size(24, 24);
    266       this.btnPermissionsSave.TabIndex = 1;
    267       this.toolTip.SetToolTip(this.btnPermissionsSave, "Store slave and group sharing permissions on the server");
    268       this.btnPermissionsSave.UseVisualStyleBackColor = true;
    269       this.btnPermissionsSave.Click += new System.EventHandler(this.btnPermissionsSave_Click);
    270       //
    271       // permissionView
    272       //
    273       this.permissionView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    274             | System.Windows.Forms.AnchorStyles.Left)
    275             | System.Windows.Forms.AnchorStyles.Right)));
    276       this.permissionView.Caption = "RefreshableLightweightUser View";
    277       this.permissionView.Content = null;
    278       this.permissionView.FetchSelectedUsers = null;
    279       this.permissionView.Location = new System.Drawing.Point(6, 6);
    280       this.permissionView.Name = "permissionView";
    281       this.permissionView.ReadOnly = false;
    282       this.permissionView.Size = new System.Drawing.Size(565, 503);
    283       this.permissionView.TabIndex = 0;
    284232      //
    285233      // ResourcesView
     
    297245      this.tabDetails.ResumeLayout(false);
    298246      this.tabSchedule.ResumeLayout(false);
    299       this.tabPermissions.ResumeLayout(false);
    300247      this.ResumeLayout(false);
    301248
    302249    }
    303 
    304250    #endregion
    305251
     
    307253    private System.Windows.Forms.Button btnRemoveGroup;
    308254    private System.Windows.Forms.Button btnAddGroup;
    309     private System.Windows.Forms.TreeView treeSlaveGroup;
     255    private HeuristicLab.Clients.Hive.Views.TreeView.NoDoubleClickTreeView treeView;
    310256    private System.Windows.Forms.TabControl tabSlaveGroup;
    311257    private System.Windows.Forms.TabPage tabDetails;
    312258    private System.Windows.Forms.TabPage tabSchedule;
    313     private SlaveView slaveView;
    314259    private System.Windows.Forms.ImageList imageListSlaveGroups;
    315260    private ScheduleView scheduleView;
    316261    private System.Windows.Forms.Button btnSave;
    317     private System.Windows.Forms.ProgressBar progressBar;
    318262    private System.Windows.Forms.Button btnRefresh;
    319263    private System.Windows.Forms.ToolTip toolTip;
    320     private System.Windows.Forms.TabPage tabPermissions;
    321     private Access.Views.RefreshableLightweightUserView permissionView;
    322     private System.Windows.Forms.Button btnPermissionsSave;
     264    private MainForm.WindowsForms.ViewHost viewHost;
    323265  }
    324266}
Note: See TracChangeset for help on using the changeset viewer.