]> granicus.if.org Git - icinga2/blobdiff - agent/windows-setup-agent/SetupWizard.Designer.cs
Merge branch 'support/2.8'
[icinga2] / agent / windows-setup-agent / SetupWizard.Designer.cs
index e026f66e67d6644560a2c0a0e2381bbbe0d6cb18..46dd421e4979c9ffbf130f6490bd5af8920d808c 100644 (file)
                        this.lblConfigStatus = new System.Windows.Forms.Label();
                        this.prgConfig = new System.Windows.Forms.ProgressBar();
                        this.tabParameters = new System.Windows.Forms.TabPage();
+                       this.groupBox4 = new System.Windows.Forms.GroupBox();
+                       this.btnEditGlobalZone = new System.Windows.Forms.Button();
+                       this.btnRemoveGlobalZone = new System.Windows.Forms.Button();
+                       this.btnAddGlobalZone = new System.Windows.Forms.Button();
+                       this.lvwGlobalZones = new System.Windows.Forms.ListView();
+                       this.colGlobalZoneName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+                       this.introduction1 = new System.Windows.Forms.Label();
                        this.groupBox3 = new System.Windows.Forms.GroupBox();
+                       this.txtUser = new System.Windows.Forms.TextBox();
+                       this.chkRunServiceAsThisUser = new System.Windows.Forms.CheckBox();
+                       this.chkInstallNSCP = new System.Windows.Forms.CheckBox();
                        this.chkAcceptConfig = new System.Windows.Forms.CheckBox();
                        this.chkAcceptCommands = new System.Windows.Forms.CheckBox();
                        this.txtTicket = new System.Windows.Forms.TextBox();
                        this.lblListenerPort = new System.Windows.Forms.Label();
                        this.rdoListener = new System.Windows.Forms.RadioButton();
                        this.groupBox1 = new System.Windows.Forms.GroupBox();
+                       this.btnEditEndpoint = new System.Windows.Forms.Button();
                        this.btnRemoveEndpoint = new System.Windows.Forms.Button();
                        this.btnAddEndpoint = new System.Windows.Forms.Button();
                        this.lvwEndpoints = new System.Windows.Forms.ListView();
                        this.colInstanceName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
                        this.colHost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
                        this.colPort = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-                       this.rdoNoMaster = new System.Windows.Forms.RadioButton();
-                       this.rdoNewMaster = new System.Windows.Forms.RadioButton();
                        this.tbcPages = new System.Windows.Forms.TabControl();
                        this.tabRetrieveCertificate = new System.Windows.Forms.TabPage();
                        this.lblRetrieveCertificate = new System.Windows.Forms.Label();
                        this.txtError = new System.Windows.Forms.TextBox();
                        this.lblError = new System.Windows.Forms.Label();
                        this.picBanner = new System.Windows.Forms.PictureBox();
-                       this.chkInstallNSCP = new System.Windows.Forms.CheckBox();
                        this.tabFinish.SuspendLayout();
                        this.tabConfigure.SuspendLayout();
                        this.tabParameters.SuspendLayout();
+                       this.groupBox4.SuspendLayout();
                        this.groupBox3.SuspendLayout();
                        this.groupBox2.SuspendLayout();
                        this.groupBox1.SuspendLayout();
                        // btnBack
                        // 
                        this.btnBack.Enabled = false;
-                       this.btnBack.Location = new System.Drawing.Point(367, 592);
+                       this.btnBack.Location = new System.Drawing.Point(376, 556);
                        this.btnBack.Name = "btnBack";
                        this.btnBack.Size = new System.Drawing.Size(75, 23);
                        this.btnBack.TabIndex = 1;
                        // 
                        // btnNext
                        // 
-                       this.btnNext.Location = new System.Drawing.Point(448, 592);
+                       this.btnNext.Location = new System.Drawing.Point(457, 556);
                        this.btnNext.Name = "btnNext";
                        this.btnNext.Size = new System.Drawing.Size(75, 23);
                        this.btnNext.TabIndex = 2;
                        // btnCancel
                        // 
                        this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-                       this.btnCancel.Location = new System.Drawing.Point(538, 592);
+                       this.btnCancel.Location = new System.Drawing.Point(538, 556);
                        this.btnCancel.Name = "btnCancel";
                        this.btnCancel.Size = new System.Drawing.Size(75, 23);
                        this.btnCancel.TabIndex = 3;
                        this.tabFinish.Location = new System.Drawing.Point(4, 5);
                        this.tabFinish.Name = "tabFinish";
                        this.tabFinish.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabFinish.Size = new System.Drawing.Size(617, 500);
+                       this.tabFinish.Size = new System.Drawing.Size(617, 471);
                        this.tabFinish.TabIndex = 5;
                        this.tabFinish.Text = "Finish";
                        this.tabFinish.UseVisualStyleBackColor = true;
                        this.lblSetupCompleted.AutoSize = true;
                        this.lblSetupCompleted.Location = new System.Drawing.Point(34, 35);
                        this.lblSetupCompleted.Name = "lblSetupCompleted";
-                       this.lblSetupCompleted.Size = new System.Drawing.Size(214, 13);
+                       this.lblSetupCompleted.Size = new System.Drawing.Size(259, 13);
                        this.lblSetupCompleted.TabIndex = 0;
-                       this.lblSetupCompleted.Text = "The Icinga 2 agent was set up successfully.";
+                       this.lblSetupCompleted.Text = "The Icinga 2 Windows client was set up successfully.";
                        // 
                        // tabConfigure
                        // 
                        this.tabConfigure.Location = new System.Drawing.Point(4, 5);
                        this.tabConfigure.Name = "tabConfigure";
                        this.tabConfigure.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabConfigure.Size = new System.Drawing.Size(617, 500);
+                       this.tabConfigure.Size = new System.Drawing.Size(617, 471);
                        this.tabConfigure.TabIndex = 4;
                        this.tabConfigure.Text = "Configure Icinga 2";
                        this.tabConfigure.UseVisualStyleBackColor = true;
                        // 
                        // tabParameters
                        // 
+                       this.tabParameters.Controls.Add(this.groupBox4);
+                       this.tabParameters.Controls.Add(this.introduction1);
                        this.tabParameters.Controls.Add(this.groupBox3);
                        this.tabParameters.Controls.Add(this.txtTicket);
                        this.tabParameters.Controls.Add(this.lblTicket);
                        this.tabParameters.Location = new System.Drawing.Point(4, 5);
                        this.tabParameters.Name = "tabParameters";
                        this.tabParameters.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabParameters.Size = new System.Drawing.Size(617, 500);
+                       this.tabParameters.Size = new System.Drawing.Size(617, 471);
                        this.tabParameters.TabIndex = 3;
                        this.tabParameters.Text = "Agent Parameters";
                        this.tabParameters.UseVisualStyleBackColor = true;
                        // 
+                       // groupBox4
+                       // 
+                       this.groupBox4.Controls.Add(this.btnEditGlobalZone);
+                       this.groupBox4.Controls.Add(this.btnRemoveGlobalZone);
+                       this.groupBox4.Controls.Add(this.btnAddGlobalZone);
+                       this.groupBox4.Controls.Add(this.lvwGlobalZones);
+                       this.groupBox4.Location = new System.Drawing.Point(8, 210);
+                       this.groupBox4.Name = "groupBox4";
+                       this.groupBox4.Size = new System.Drawing.Size(601, 110);
+                       this.groupBox4.TabIndex = 9;
+                       this.groupBox4.TabStop = false;
+                       this.groupBox4.Text = "Global Zones";
+                       // 
+                       // btnEditGlobalZone
+                       // 
+                       this.btnEditGlobalZone.Enabled = false;
+                       this.btnEditGlobalZone.Location = new System.Drawing.Point(520, 48);
+                       this.btnEditGlobalZone.Name = "btnEditGlobalZone";
+                       this.btnEditGlobalZone.Size = new System.Drawing.Size(75, 23);
+                       this.btnEditGlobalZone.TabIndex = 7;
+                       this.btnEditGlobalZone.Text = "Edit";
+                       this.btnEditGlobalZone.UseVisualStyleBackColor = true;
+                       this.btnEditGlobalZone.Click += new System.EventHandler(this.btnEditGlobalZone_Click);
+                       // 
+                       // btnRemoveGlobalZone
+                       // 
+                       this.btnRemoveGlobalZone.Enabled = false;
+                       this.btnRemoveGlobalZone.Location = new System.Drawing.Point(520, 77);
+                       this.btnRemoveGlobalZone.Name = "btnRemoveGlobalZone";
+                       this.btnRemoveGlobalZone.Size = new System.Drawing.Size(75, 23);
+                       this.btnRemoveGlobalZone.TabIndex = 6;
+                       this.btnRemoveGlobalZone.Text = "Remove";
+                       this.btnRemoveGlobalZone.UseVisualStyleBackColor = true;
+                       this.btnRemoveGlobalZone.Click += new System.EventHandler(this.btnRemoveGlobalZone_Click);
+                       // 
+                       // btnAddGlobalZone
+                       // 
+                       this.btnAddGlobalZone.Location = new System.Drawing.Point(520, 19);
+                       this.btnAddGlobalZone.Name = "btnAddGlobalZone";
+                       this.btnAddGlobalZone.Size = new System.Drawing.Size(75, 23);
+                       this.btnAddGlobalZone.TabIndex = 5;
+                       this.btnAddGlobalZone.Text = "Add";
+                       this.btnAddGlobalZone.UseVisualStyleBackColor = true;
+                       this.btnAddGlobalZone.Click += new System.EventHandler(this.btnAddGlobalZone_Click);
+                       // 
+                       // lvwGlobalZones
+                       // 
+                       this.lvwGlobalZones.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.colGlobalZoneName});
+                       this.lvwGlobalZones.FullRowSelect = true;
+                       this.lvwGlobalZones.Location = new System.Drawing.Point(6, 19);
+                       this.lvwGlobalZones.Name = "lvwGlobalZones";
+                       this.lvwGlobalZones.Size = new System.Drawing.Size(500, 81);
+                       this.lvwGlobalZones.TabIndex = 4;
+                       this.lvwGlobalZones.UseCompatibleStateImageBehavior = false;
+                       this.lvwGlobalZones.View = System.Windows.Forms.View.Details;
+                       this.lvwGlobalZones.SelectedIndexChanged += new System.EventHandler(this.lvwGlobalZones_SelectedIndexChanged);
+                       // 
+                       // colGlobalZoneName
+                       // 
+                       this.colGlobalZoneName.Text = "Zone Name";
+                       this.colGlobalZoneName.Width = 496;
+                       // 
+                       // introduction1
+                       // 
+                       this.introduction1.AutoSize = true;
+                       this.introduction1.Location = new System.Drawing.Point(11, 3);
+                       this.introduction1.Name = "introduction1";
+                       this.introduction1.Size = new System.Drawing.Size(269, 13);
+                       this.introduction1.TabIndex = 6;
+                       this.introduction1.Text = "Welcome to the Icinga 2 Windows Client Setup Wizard!";
+                       // 
                        // groupBox3
                        // 
+                       this.groupBox3.Controls.Add(this.txtUser);
+                       this.groupBox3.Controls.Add(this.chkRunServiceAsThisUser);
                        this.groupBox3.Controls.Add(this.chkInstallNSCP);
                        this.groupBox3.Controls.Add(this.chkAcceptConfig);
                        this.groupBox3.Controls.Add(this.chkAcceptCommands);
-                       this.groupBox3.Location = new System.Drawing.Point(308, 359);
+                       this.groupBox3.Location = new System.Drawing.Point(308, 326);
                        this.groupBox3.Name = "groupBox3";
-                       this.groupBox3.Size = new System.Drawing.Size(301, 111);
+                       this.groupBox3.Size = new System.Drawing.Size(301, 139);
                        this.groupBox3.TabIndex = 5;
                        this.groupBox3.TabStop = false;
                        this.groupBox3.Text = "Advanced Options";
                        // 
+                       // txtUser
+                       // 
+                       this.txtUser.Enabled = false;
+                       this.txtUser.Location = new System.Drawing.Point(28, 88);
+                       this.txtUser.Name = "txtUser";
+                       this.txtUser.Size = new System.Drawing.Size(178, 20);
+                       this.txtUser.TabIndex = 8;
+                       this.txtUser.Text = "NT AUTHORITY\\NetworkService";
+                       // 
+                       // chkRunServiceAsThisUser
+                       // 
+                       this.chkRunServiceAsThisUser.AutoSize = true;
+                       this.chkRunServiceAsThisUser.Location = new System.Drawing.Point(9, 65);
+                       this.chkRunServiceAsThisUser.Name = "chkRunServiceAsThisUser";
+                       this.chkRunServiceAsThisUser.Size = new System.Drawing.Size(183, 17);
+                       this.chkRunServiceAsThisUser.TabIndex = 7;
+                       this.chkRunServiceAsThisUser.Text = "Run Icinga 2 service as this user:";
+                       this.chkRunServiceAsThisUser.UseVisualStyleBackColor = true;
+                       this.chkRunServiceAsThisUser.CheckedChanged += new System.EventHandler(this.chkRunServiceAsThisUser_CheckedChanged);
+                       // 
+                       // chkInstallNSCP
+                       // 
+                       this.chkInstallNSCP.AutoSize = true;
+                       this.chkInstallNSCP.Location = new System.Drawing.Point(9, 114);
+                       this.chkInstallNSCP.Name = "chkInstallNSCP";
+                       this.chkInstallNSCP.Size = new System.Drawing.Size(190, 17);
+                       this.chkInstallNSCP.TabIndex = 6;
+                       this.chkInstallNSCP.Text = "Install/Update bundled NSClient++";
+                       this.chkInstallNSCP.UseVisualStyleBackColor = true;
+                       // 
                        // chkAcceptConfig
                        // 
                        this.chkAcceptConfig.AutoSize = true;
-                       this.chkAcceptConfig.Location = new System.Drawing.Point(9, 47);
+                       this.chkAcceptConfig.Location = new System.Drawing.Point(9, 42);
                        this.chkAcceptConfig.Name = "chkAcceptConfig";
-                       this.chkAcceptConfig.Size = new System.Drawing.Size(190, 17);
+                       this.chkAcceptConfig.Size = new System.Drawing.Size(284, 17);
                        this.chkAcceptConfig.TabIndex = 1;
-                       this.chkAcceptConfig.Text = "Accept config updates from master";
+                       this.chkAcceptConfig.Text = "Accept config updates from master/satellite instance(s)";
                        this.chkAcceptConfig.UseVisualStyleBackColor = true;
                        // 
                        // chkAcceptCommands
                        // 
                        this.chkAcceptCommands.AutoSize = true;
-                       this.chkAcceptCommands.Location = new System.Drawing.Point(9, 24);
+                       this.chkAcceptCommands.Location = new System.Drawing.Point(9, 19);
                        this.chkAcceptCommands.Name = "chkAcceptCommands";
-                       this.chkAcceptCommands.Size = new System.Drawing.Size(171, 17);
+                       this.chkAcceptCommands.Size = new System.Drawing.Size(265, 17);
                        this.chkAcceptCommands.TabIndex = 0;
-                       this.chkAcceptCommands.Text = "Accept commands from master";
+                       this.chkAcceptCommands.Text = "Accept commands from master/satellite instance(s)";
                        this.chkAcceptCommands.UseVisualStyleBackColor = true;
                        // 
                        // txtTicket
                        // 
-                       this.txtTicket.Location = new System.Drawing.Point(98, 45);
+                       this.txtTicket.Location = new System.Drawing.Point(136, 56);
                        this.txtTicket.Name = "txtTicket";
-                       this.txtTicket.Size = new System.Drawing.Size(340, 20);
+                       this.txtTicket.Size = new System.Drawing.Size(378, 20);
                        this.txtTicket.TabIndex = 1;
                        // 
                        // lblTicket
                        // 
                        this.lblTicket.AutoSize = true;
-                       this.lblTicket.Location = new System.Drawing.Point(9, 48);
+                       this.lblTicket.Location = new System.Drawing.Point(9, 59);
                        this.lblTicket.Name = "lblTicket";
-                       this.lblTicket.Size = new System.Drawing.Size(71, 13);
+                       this.lblTicket.Size = new System.Drawing.Size(117, 13);
                        this.lblTicket.TabIndex = 4;
-                       this.lblTicket.Text = "Setup Ticket:";
+                       this.lblTicket.Text = "Setup Ticket (optional):";
                        // 
                        // txtInstanceName
                        // 
-                       this.txtInstanceName.Location = new System.Drawing.Point(98, 16);
+                       this.txtInstanceName.Location = new System.Drawing.Point(136, 27);
                        this.txtInstanceName.Name = "txtInstanceName";
-                       this.txtInstanceName.Size = new System.Drawing.Size(340, 20);
+                       this.txtInstanceName.Size = new System.Drawing.Size(378, 20);
                        this.txtInstanceName.TabIndex = 0;
                        // 
                        // lblInstanceName
                        // 
                        this.lblInstanceName.AutoSize = true;
-                       this.lblInstanceName.Location = new System.Drawing.Point(9, 20);
+                       this.lblInstanceName.Location = new System.Drawing.Point(11, 30);
                        this.lblInstanceName.Name = "lblInstanceName";
-                       this.lblInstanceName.Size = new System.Drawing.Size(82, 13);
+                       this.lblInstanceName.Size = new System.Drawing.Size(121, 13);
                        this.lblInstanceName.TabIndex = 3;
-                       this.lblInstanceName.Text = "Instance Name:";
+                       this.lblInstanceName.Text = "Instance Name (FQDN):";
                        // 
                        // groupBox2
                        // 
                        this.groupBox2.Controls.Add(this.txtListenerPort);
                        this.groupBox2.Controls.Add(this.lblListenerPort);
                        this.groupBox2.Controls.Add(this.rdoListener);
-                       this.groupBox2.Location = new System.Drawing.Point(8, 359);
+                       this.groupBox2.Location = new System.Drawing.Point(8, 326);
                        this.groupBox2.Name = "groupBox2";
-                       this.groupBox2.Size = new System.Drawing.Size(294, 111);
+                       this.groupBox2.Size = new System.Drawing.Size(298, 139);
                        this.groupBox2.TabIndex = 2;
                        this.groupBox2.TabStop = false;
                        this.groupBox2.Text = "TCP Listener";
                        // txtListenerPort
                        // 
                        this.txtListenerPort.Enabled = false;
-                       this.txtListenerPort.Location = new System.Drawing.Point(132, 51);
+                       this.txtListenerPort.Location = new System.Drawing.Point(66, 47);
                        this.txtListenerPort.Name = "txtListenerPort";
                        this.txtListenerPort.Size = new System.Drawing.Size(84, 20);
                        this.txtListenerPort.TabIndex = 8;
                        // lblListenerPort
                        // 
                        this.lblListenerPort.AutoSize = true;
-                       this.lblListenerPort.Location = new System.Drawing.Point(43, 55);
+                       this.lblListenerPort.Location = new System.Drawing.Point(31, 51);
                        this.lblListenerPort.Name = "lblListenerPort";
                        this.lblListenerPort.Size = new System.Drawing.Size(29, 13);
                        this.lblListenerPort.TabIndex = 1;
                        this.rdoListener.AutoSize = true;
                        this.rdoListener.Location = new System.Drawing.Point(11, 24);
                        this.rdoListener.Name = "rdoListener";
-                       this.rdoListener.Size = new System.Drawing.Size(250, 17);
+                       this.rdoListener.Size = new System.Drawing.Size(283, 17);
                        this.rdoListener.TabIndex = 7;
-                       this.rdoListener.Text = "Listen for connections from the master instance:";
+                       this.rdoListener.Text = "Listen for connections from master/satellite instance(s):";
                        this.rdoListener.UseVisualStyleBackColor = true;
                        this.rdoListener.CheckedChanged += new System.EventHandler(this.RadioListener_CheckedChanged);
                        // 
                        // groupBox1
                        // 
+                       this.groupBox1.Controls.Add(this.btnEditEndpoint);
                        this.groupBox1.Controls.Add(this.btnRemoveEndpoint);
                        this.groupBox1.Controls.Add(this.btnAddEndpoint);
                        this.groupBox1.Controls.Add(this.lvwEndpoints);
-                       this.groupBox1.Controls.Add(this.rdoNoMaster);
-                       this.groupBox1.Controls.Add(this.rdoNewMaster);
-                       this.groupBox1.Location = new System.Drawing.Point(8, 77);
+                       this.groupBox1.Location = new System.Drawing.Point(8, 94);
                        this.groupBox1.Name = "groupBox1";
-                       this.groupBox1.Size = new System.Drawing.Size(601, 276);
+                       this.groupBox1.Size = new System.Drawing.Size(601, 110);
                        this.groupBox1.TabIndex = 1;
                        this.groupBox1.TabStop = false;
-                       this.groupBox1.Text = "Master Instance";
+                       this.groupBox1.Text = "Parent master/satellite instance(s) for this client";
+                       // 
+                       // btnEditEndpoint
+                       // 
+                       this.btnEditEndpoint.Enabled = false;
+                       this.btnEditEndpoint.Location = new System.Drawing.Point(520, 48);
+                       this.btnEditEndpoint.Name = "btnEditEndpoint";
+                       this.btnEditEndpoint.Size = new System.Drawing.Size(75, 23);
+                       this.btnEditEndpoint.TabIndex = 7;
+                       this.btnEditEndpoint.Text = "Edit";
+                       this.btnEditEndpoint.UseVisualStyleBackColor = true;
+                       this.btnEditEndpoint.Click += new System.EventHandler(this.btnEditEndpoint_Click);
                        // 
                        // btnRemoveEndpoint
                        // 
                        this.btnRemoveEndpoint.Enabled = false;
-                       this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 112);
+                       this.btnRemoveEndpoint.Location = new System.Drawing.Point(520, 77);
                        this.btnRemoveEndpoint.Name = "btnRemoveEndpoint";
                        this.btnRemoveEndpoint.Size = new System.Drawing.Size(75, 23);
                        this.btnRemoveEndpoint.TabIndex = 6;
                        // 
                        // btnAddEndpoint
                        // 
-                       this.btnAddEndpoint.Location = new System.Drawing.Point(520, 83);
+                       this.btnAddEndpoint.Location = new System.Drawing.Point(520, 19);
                        this.btnAddEndpoint.Name = "btnAddEndpoint";
                        this.btnAddEndpoint.Size = new System.Drawing.Size(75, 23);
                        this.btnAddEndpoint.TabIndex = 5;
             this.colHost,
             this.colPort});
                        this.lvwEndpoints.FullRowSelect = true;
-                       this.lvwEndpoints.Location = new System.Drawing.Point(11, 83);
+                       this.lvwEndpoints.Location = new System.Drawing.Point(6, 19);
                        this.lvwEndpoints.Name = "lvwEndpoints";
-                       this.lvwEndpoints.Size = new System.Drawing.Size(500, 176);
+                       this.lvwEndpoints.Size = new System.Drawing.Size(500, 81);
                        this.lvwEndpoints.TabIndex = 4;
                        this.lvwEndpoints.UseCompatibleStateImageBehavior = false;
                        this.lvwEndpoints.View = System.Windows.Forms.View.Details;
                        this.colPort.Text = "Port";
                        this.colPort.Width = 80;
                        // 
-                       // rdoNoMaster
-                       // 
-                       this.rdoNoMaster.AutoSize = true;
-                       this.rdoNoMaster.Checked = true;
-                       this.rdoNoMaster.Location = new System.Drawing.Point(11, 50);
-                       this.rdoNoMaster.Name = "rdoNoMaster";
-                       this.rdoNoMaster.Size = new System.Drawing.Size(374, 17);
-                       this.rdoNoMaster.TabIndex = 3;
-                       this.rdoNoMaster.TabStop = true;
-                       this.rdoNoMaster.Text = "This instance should report its check results to an existing Icinga 2 master:";
-                       this.rdoNoMaster.UseVisualStyleBackColor = true;
-                       this.rdoNoMaster.CheckedChanged += new System.EventHandler(this.RadioMaster_CheckedChanged);
-                       // 
-                       // rdoNewMaster
-                       // 
-                       this.rdoNewMaster.AutoSize = true;
-                       this.rdoNewMaster.Enabled = false;
-                       this.rdoNewMaster.Location = new System.Drawing.Point(11, 22);
-                       this.rdoNewMaster.Name = "rdoNewMaster";
-                       this.rdoNewMaster.Size = new System.Drawing.Size(167, 17);
-                       this.rdoNewMaster.TabIndex = 2;
-                       this.rdoNewMaster.TabStop = true;
-                       this.rdoNewMaster.Text = "This is a new master instance.";
-                       this.rdoNewMaster.UseVisualStyleBackColor = true;
-                       this.rdoNewMaster.CheckedChanged += new System.EventHandler(this.RadioMaster_CheckedChanged);
-                       // 
                        // tbcPages
                        // 
                        this.tbcPages.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
                        this.tbcPages.Margin = new System.Windows.Forms.Padding(0);
                        this.tbcPages.Name = "tbcPages";
                        this.tbcPages.SelectedIndex = 0;
-                       this.tbcPages.Size = new System.Drawing.Size(625, 509);
+                       this.tbcPages.Size = new System.Drawing.Size(625, 480);
                        this.tbcPages.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
                        this.tbcPages.TabIndex = 0;
                        this.tbcPages.SelectedIndexChanged += new System.EventHandler(this.tbcPages_SelectedIndexChanged);
                        this.tabRetrieveCertificate.Location = new System.Drawing.Point(4, 5);
                        this.tabRetrieveCertificate.Name = "tabRetrieveCertificate";
                        this.tabRetrieveCertificate.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabRetrieveCertificate.Size = new System.Drawing.Size(617, 500);
+                       this.tabRetrieveCertificate.Size = new System.Drawing.Size(617, 471);
                        this.tabRetrieveCertificate.TabIndex = 7;
                        this.tabRetrieveCertificate.Text = "Checking Certificate";
                        this.tabRetrieveCertificate.UseVisualStyleBackColor = true;
                        this.tabVerifyCertificate.Location = new System.Drawing.Point(4, 5);
                        this.tabVerifyCertificate.Name = "tabVerifyCertificate";
                        this.tabVerifyCertificate.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabVerifyCertificate.Size = new System.Drawing.Size(617, 500);
+                       this.tabVerifyCertificate.Size = new System.Drawing.Size(617, 471);
                        this.tabVerifyCertificate.TabIndex = 6;
                        this.tabVerifyCertificate.Text = "Verify Certificate";
                        this.tabVerifyCertificate.UseVisualStyleBackColor = true;
                        this.lblX509Prompt.AutoSize = true;
                        this.lblX509Prompt.Location = new System.Drawing.Point(8, 15);
                        this.lblX509Prompt.Name = "lblX509Prompt";
-                       this.lblX509Prompt.Size = new System.Drawing.Size(201, 13);
+                       this.lblX509Prompt.Size = new System.Drawing.Size(241, 13);
                        this.lblX509Prompt.TabIndex = 0;
-                       this.lblX509Prompt.Text = "Please verify the master\'s SSL certificate:";
+                       this.lblX509Prompt.Text = "Please verify the master/satellite\'s SSL certificate:";
                        // 
                        // tabError
                        // 
                        this.tabError.Location = new System.Drawing.Point(4, 5);
                        this.tabError.Name = "tabError";
                        this.tabError.Padding = new System.Windows.Forms.Padding(3);
-                       this.tabError.Size = new System.Drawing.Size(617, 500);
+                       this.tabError.Size = new System.Drawing.Size(617, 471);
                        this.tabError.TabIndex = 8;
                        this.tabError.Text = "Error";
                        this.tabError.UseVisualStyleBackColor = true;
                        this.picBanner.TabIndex = 1;
                        this.picBanner.TabStop = false;
                        // 
-                       // chkInstallNSCP
-                       // 
-                       this.chkInstallNSCP.AutoSize = true;
-                       this.chkInstallNSCP.Location = new System.Drawing.Point(9, 70);
-                       this.chkInstallNSCP.Name = "chkInstallNSCP";
-                       this.chkInstallNSCP.Size = new System.Drawing.Size(149, 17);
-                       this.chkInstallNSCP.TabIndex = 6;
-                       this.chkInstallNSCP.Text = "Install/Update NSClient++";
-                       this.chkInstallNSCP.UseVisualStyleBackColor = true;
-                       // 
                        // SetupWizard
                        // 
                        this.AcceptButton = this.btnNext;
                        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
                        this.CancelButton = this.btnCancel;
-                       this.ClientSize = new System.Drawing.Size(625, 624);
+                       this.ClientSize = new System.Drawing.Size(625, 587);
                        this.Controls.Add(this.btnCancel);
                        this.Controls.Add(this.btnNext);
                        this.Controls.Add(this.btnBack);
                        this.MaximizeBox = false;
                        this.Name = "SetupWizard";
                        this.Text = "Icinga 2 Setup Wizard";
-                       this.Shown += new System.EventHandler(this.AgentWizard_Shown);
                        this.tabFinish.ResumeLayout(false);
                        this.tabFinish.PerformLayout();
                        this.tabConfigure.ResumeLayout(false);
                        this.tabConfigure.PerformLayout();
                        this.tabParameters.ResumeLayout(false);
                        this.tabParameters.PerformLayout();
+                       this.groupBox4.ResumeLayout(false);
                        this.groupBox3.ResumeLayout(false);
                        this.groupBox3.PerformLayout();
                        this.groupBox2.ResumeLayout(false);
                        this.groupBox2.PerformLayout();
                        this.groupBox1.ResumeLayout(false);
-                       this.groupBox1.PerformLayout();
                        this.tbcPages.ResumeLayout(false);
                        this.tabRetrieveCertificate.ResumeLayout(false);
                        this.tabRetrieveCertificate.PerformLayout();
                private System.Windows.Forms.ListView lvwEndpoints;
                private System.Windows.Forms.ColumnHeader colHost;
                private System.Windows.Forms.ColumnHeader colPort;
-               private System.Windows.Forms.RadioButton rdoNoMaster;
-               private System.Windows.Forms.RadioButton rdoNewMaster;
                private System.Windows.Forms.TabControl tbcPages;
                private System.Windows.Forms.TabPage tabVerifyCertificate;
                private System.Windows.Forms.Label lblX509Prompt;
                private System.Windows.Forms.TextBox txtTicket;
                private System.Windows.Forms.Label lblTicket;
                private System.Windows.Forms.ColumnHeader colInstanceName;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.CheckBox chkAcceptConfig;
-        private System.Windows.Forms.CheckBox chkAcceptCommands;
-       private System.Windows.Forms.CheckBox chkInstallNSCP;
+               private System.Windows.Forms.GroupBox groupBox3;
+               private System.Windows.Forms.CheckBox chkAcceptConfig;
+               private System.Windows.Forms.CheckBox chkAcceptCommands;
+               private System.Windows.Forms.CheckBox chkInstallNSCP;
+               private System.Windows.Forms.TextBox txtUser;
+               private System.Windows.Forms.CheckBox chkRunServiceAsThisUser;
+               private System.Windows.Forms.Button btnEditEndpoint;
+               private System.Windows.Forms.Label introduction1;
+               private System.Windows.Forms.GroupBox groupBox4;
+               private System.Windows.Forms.Button btnEditGlobalZone;
+               private System.Windows.Forms.Button btnRemoveGlobalZone;
+               private System.Windows.Forms.Button btnAddGlobalZone;
+               private System.Windows.Forms.ListView lvwGlobalZones;
+               private System.Windows.Forms.ColumnHeader colGlobalZoneName;
        }
 }