From 6e560e1a3ee859223b34e311e0d9880ecf5d4e7e Mon Sep 17 00:00:00 2001 From: dbuechel Date: Wed, 19 Feb 2020 11:53:29 +0100 Subject: [PATCH] SEBWIN-358: Added new configuration options to configuration tool. --- .../DataMapping/SecurityDataMapper.cs | 2 +- .../DataMapping/UserInterfaceDataMapper.cs | 58 +++-- .../ConfigurationData/Keys.cs | 8 +- SebWindowsConfig/SEBSettings.cs | 14 ++ .../SebWindowsConfigForm.Designer.cs | 199 ++++++++++++++---- SebWindowsConfig/SebWindowsConfigForm.cs | 46 ++++ SebWindowsConfig/SebWindowsConfigForm.resx | 30 +-- 7 files changed, 285 insertions(+), 72 deletions(-) diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/SecurityDataMapper.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/SecurityDataMapper.cs index dae5e684..daea8f5d 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/SecurityDataMapper.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/SecurityDataMapper.cs @@ -50,7 +50,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping private void MapApplicationLogAccess(IDictionary rawData, AppSettings settings) { - var hasValue = rawData.TryGetValue(Keys.General.AllowApplicationLog, out var value); + var hasValue = rawData.TryGetValue(Keys.Security.AllowApplicationLog, out var value); if (hasValue && value is bool allow) { diff --git a/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/UserInterfaceDataMapper.cs b/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/UserInterfaceDataMapper.cs index de1288f5..809b1944 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/UserInterfaceDataMapper.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/DataMapping/UserInterfaceDataMapper.cs @@ -17,36 +17,42 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping { switch (key) { + case Keys.UserInterface.ActionCenter.EnableActionCenter: + MapEnableActionCenter(settings, value); + break; case Keys.UserInterface.ShowAudio: - MapAudio(settings, value); - break; - case Keys.UserInterface.ShowKeyboardLayout: - MapKeyboardLayout(settings, value); - break; - case Keys.UserInterface.ShowWirelessNetwork: - MapWirelessNetwork(settings, value); + MapShowAudio(settings, value); break; case Keys.UserInterface.ShowClock: - MapClock(settings, value); + MapShowClock(settings, value); + break; + case Keys.UserInterface.ShowKeyboardLayout: + MapShowKeyboardLayout(settings, value); + break; + case Keys.UserInterface.ShowWirelessNetwork: + MapShowWirelessNetwork(settings, value); + break; + case Keys.UserInterface.Taskbar.EnableTaskbar: + MapEnableTaskbar(settings, value); + break; + case Keys.UserInterface.Taskbar.ShowApplicationLog: + MapShowApplicationLog(settings, value); break; case Keys.UserInterface.UserInterfaceMode: MapUserInterfaceMode(settings, value); break; - case Keys.UserInterface.Taskbar.ShowApplicationLog: - MapApplicationLogButton(settings, value); - break; } } - private void MapApplicationLogButton(AppSettings settings, object value) + private void MapEnableActionCenter(AppSettings settings, object value) { - if (value is bool show) + if (value is bool enable) { - settings.Taskbar.ShowApplicationLog = show; + settings.ActionCenter.EnableActionCenter = enable; } } - private void MapAudio(AppSettings settings, object value) + private void MapShowAudio(AppSettings settings, object value) { if (value is bool show) { @@ -55,7 +61,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping } } - private void MapClock(AppSettings settings, object value) + private void MapShowClock(AppSettings settings, object value) { if (value is bool show) { @@ -64,7 +70,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping } } - private void MapKeyboardLayout(AppSettings settings, object value) + private void MapShowKeyboardLayout(AppSettings settings, object value) { if (value is bool show) { @@ -73,7 +79,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping } } - private void MapWirelessNetwork(AppSettings settings, object value) + private void MapShowWirelessNetwork(AppSettings settings, object value) { if (value is bool show) { @@ -82,6 +88,22 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping } } + private void MapEnableTaskbar(AppSettings settings, object value) + { + if (value is bool enable) + { + settings.Taskbar.EnableTaskbar = enable; + } + } + + private void MapShowApplicationLog(AppSettings settings, object value) + { + if (value is bool show) + { + settings.Taskbar.ShowApplicationLog = show; + } + } + private void MapUserInterfaceMode(AppSettings settings, object value) { if (value is bool mobile) diff --git a/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs b/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs index c6ed1034..f2ae29ac 100644 --- a/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs +++ b/SafeExamBrowser.Configuration/ConfigurationData/Keys.cs @@ -159,7 +159,6 @@ namespace SafeExamBrowser.Configuration.ConfigurationData internal static class General { - internal const string AllowApplicationLog = "allowApplicationLog"; internal const string LogLevel = "logLevel"; internal const string OriginatorVersion = "originatorVersion"; } @@ -204,6 +203,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData internal static class Security { + internal const string AllowApplicationLog = "allowApplicationLog"; internal const string AllowVirtualMachine = "allowVirtualMachine"; internal const string KioskModeCreateNewDesktop = "createNewDesktop"; internal const string KioskModeDisableExplorerShell = "killExplorerShell"; @@ -219,8 +219,14 @@ namespace SafeExamBrowser.Configuration.ConfigurationData internal const string ShowWirelessNetwork = "allowWlan"; internal const string UserInterfaceMode = "touchOptimized"; + internal static class ActionCenter + { + internal const string EnableActionCenter = "showSideMenu"; + } + internal static class Taskbar { + internal const string EnableTaskbar = "showTaskBar"; internal const string ShowApplicationLog = "showApplicationLogButton"; } } diff --git a/SebWindowsConfig/SEBSettings.cs b/SebWindowsConfig/SEBSettings.cs index c23b9678..0558e040 100644 --- a/SebWindowsConfig/SEBSettings.cs +++ b/SebWindowsConfig/SEBSettings.cs @@ -99,6 +99,8 @@ namespace SebWindowsConfig // Group "User Interface" public const String KeyBrowserViewMode = "browserViewMode"; + public const String KeyBrowserWindowAllowAddressBar = "browserWindowAllowAddressBar"; + public const String KeyNewBrowserWindowAllowAddressBar = "newBrowserWindowAllowAddressBar"; public const String KeyMainBrowserWindowWidth = "mainBrowserWindowWidth"; public const String KeyMainBrowserWindowHeight = "mainBrowserWindowHeight"; public const String KeyMainBrowserWindowPositioning = "mainBrowserWindowPositioning"; @@ -106,6 +108,7 @@ namespace SebWindowsConfig public const String KeyHideBrowserWindowToolbar = "hideBrowserWindowToolbar"; public const String KeyShowMenuBar = "showMenuBar"; public const String KeyShowTaskBar = "showTaskBar"; + public const String KeyShowSideMenu = "showSideMenu"; public const String KeyTaskBarHeight = "taskBarHeight"; public const String KeyTouchOptimized = "touchOptimized"; public const String KeyEnableZoomText = "enableZoomText"; @@ -179,6 +182,8 @@ namespace SebWindowsConfig // Group "Exam" public const String KeyExamKeySalt = "examKeySalt"; + public const String KeyExamSessionClearCookiesOnEnd = "examSessionClearCookiesOnEnd"; + public const String KeyExamSessionClearCookiesOnStart = "examSessionClearCookiesOnStart"; public const String KeyBrowserExamKey = "browserExamKey"; public const String KeyBrowserURLSalt = "browserURLSalt"; public const String KeySendBrowserExamKey = "sendBrowserExamKey"; @@ -346,6 +351,8 @@ namespace SebWindowsConfig public const String KeyKillExplorerShell = "killExplorerShell"; public const String KeyAllowUserSwitching = "allowUserSwitching"; public const String KeyEnableLogging = "enableLogging"; + public const String KeyAllowApplicationLog = "allowApplicationLog"; + public const String KeyShowApplicationLogButton = "showApplicationLogButton"; public const String KeyLogDirectoryOSX = "logDirectoryOSX"; public const String KeyLogDirectoryWin = "logDirectoryWin"; public const String KeyAllowWLAN = "allowWlan"; @@ -591,6 +598,8 @@ namespace SebWindowsConfig // Default settings for group "User Interface" SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserViewMode , 0); + SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserWindowAllowAddressBar, false); + SEBSettings.settingsDefault.Add(SEBSettings.KeyNewBrowserWindowAllowAddressBar, false); SEBSettings.settingsDefault.Add(SEBSettings.KeyMainBrowserWindowWidth , "100%"); SEBSettings.settingsDefault.Add(SEBSettings.KeyMainBrowserWindowHeight , "100%"); SEBSettings.settingsDefault.Add(SEBSettings.KeyMainBrowserWindowPositioning, 1); @@ -598,6 +607,7 @@ namespace SebWindowsConfig SEBSettings.settingsDefault.Add(SEBSettings.KeyHideBrowserWindowToolbar , false); SEBSettings.settingsDefault.Add(SEBSettings.KeyShowMenuBar , false); SEBSettings.settingsDefault.Add(SEBSettings.KeyShowTaskBar , true); + SEBSettings.settingsDefault.Add(SEBSettings.KeyShowSideMenu, true); SEBSettings.settingsDefault.Add(SEBSettings.KeyTaskBarHeight , 40); SEBSettings.settingsDefault.Add(SEBSettings.KeyTouchOptimized , false); SEBSettings.settingsDefault.Add(SEBSettings.KeyEnableZoomText , true); @@ -678,6 +688,8 @@ namespace SebWindowsConfig // Default settings for group "Exam" SEBSettings.settingsDefault.Add(SEBSettings.KeyExamKeySalt , new Byte[] {}); + SEBSettings.settingsDefault.Add(SEBSettings.KeyExamSessionClearCookiesOnEnd, true); + SEBSettings.settingsDefault.Add(SEBSettings.KeyExamSessionClearCookiesOnStart, true); SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserExamKey , ""); SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserURLSalt , true); SEBSettings.settingsDefault.Add(SEBSettings.KeySendBrowserExamKey, false); @@ -873,6 +885,8 @@ namespace SebWindowsConfig SEBSettings.settingsDefault.Add(SEBSettings.KeyCreateNewDesktop , true); SEBSettings.settingsDefault.Add(SEBSettings.KeyKillExplorerShell , false); SEBSettings.settingsDefault.Add(SEBSettings.KeyEnableLogging, true); + SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowApplicationLog, false); + SEBSettings.settingsDefault.Add(SEBSettings.KeyShowApplicationLogButton, false); SEBSettings.settingsDefault.Add(SEBSettings.KeyLogDirectoryOSX , "~/Documents"); SEBSettings.settingsDefault.Add(SEBSettings.KeyLogDirectoryWin , ""); SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowWLAN, false); diff --git a/SebWindowsConfig/SebWindowsConfigForm.Designer.cs b/SebWindowsConfig/SebWindowsConfigForm.Designer.cs index 3b3e1478..90348d08 100644 --- a/SebWindowsConfig/SebWindowsConfigForm.Designer.cs +++ b/SebWindowsConfig/SebWindowsConfigForm.Designer.cs @@ -30,8 +30,8 @@ namespace SebWindowsConfig { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SebWindowsConfigForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.openFileDialogSebConfigFile = new System.Windows.Forms.OpenFileDialog(); this.saveFileDialogSebConfigFile = new System.Windows.Forms.SaveFileDialog(); this.imageListTabIcons = new System.Windows.Forms.ImageList(this.components); @@ -417,6 +417,15 @@ namespace SebWindowsConfig this.editDuplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.configureClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.applyAndStartSEBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.checkBoxClearSessionOnStart = new System.Windows.Forms.CheckBox(); + this.checkBoxClearSessionOnEnd = new System.Windows.Forms.CheckBox(); + this.label15 = new System.Windows.Forms.Label(); + this.checkBoxAllowMainWindowAddressBar = new System.Windows.Forms.CheckBox(); + this.checkBoxAllowAdditionalWindowAddressBar = new System.Windows.Forms.CheckBox(); + this.checkBoxShowSideMenu = new System.Windows.Forms.CheckBox(); + this.checkBoxAllowLogAccess = new System.Windows.Forms.CheckBox(); + this.checkBoxShowLogButton = new System.Windows.Forms.CheckBox(); this.tabPageHookedKeys.SuspendLayout(); this.groupBoxFunctionKeys.SuspendLayout(); this.groupBoxSpecialKeys.SuspendLayout(); @@ -469,6 +478,7 @@ namespace SebWindowsConfig this.groupBoxExitSequence.SuspendLayout(); this.tabControlSebWindowsConfig.SuspendLayout(); this.menuStrip1.SuspendLayout(); + this.groupBox2.SuspendLayout(); this.SuspendLayout(); // // openFileDialogSebConfigFile @@ -1019,6 +1029,8 @@ namespace SebWindowsConfig // // tabPageSecurity // + this.tabPageSecurity.Controls.Add(this.checkBoxShowLogButton); + this.tabPageSecurity.Controls.Add(this.checkBoxAllowLogAccess); this.tabPageSecurity.Controls.Add(this.checkBoxEnablePrivateClipboard); this.tabPageSecurity.Controls.Add(this.checkBoxAllowScreenSharing); this.tabPageSecurity.Controls.Add(this.groupBox1); @@ -1085,7 +1097,7 @@ namespace SebWindowsConfig this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox1.Size = new System.Drawing.Size(952, 482); + this.groupBox1.Size = new System.Drawing.Size(952, 326); this.groupBox1.TabIndex = 96; this.groupBox1.TabStop = false; this.groupBox1.Text = "macOS specific settings"; @@ -1272,7 +1284,7 @@ namespace SebWindowsConfig this.groupBox10.Controls.Add(this.textBoxLogDirectoryWin); this.groupBox10.Controls.Add(this.label4); this.groupBox10.Controls.Add(this.checkBoxUseStandardDirectory); - this.groupBox10.Location = new System.Drawing.Point(34, 305); + this.groupBox10.Location = new System.Drawing.Point(34, 324); this.groupBox10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox10.Name = "groupBox10"; this.groupBox10.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -1685,8 +1697,8 @@ namespace SebWindowsConfig // // Type // - dataGridViewCellStyle3.BackColor = System.Drawing.Color.Silver; - this.Type.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle11.BackColor = System.Drawing.Color.Silver; + this.Type.DefaultCellStyle = dataGridViewCellStyle11; this.Type.HeaderText = "Type"; this.Type.Name = "Type"; this.Type.ReadOnly = true; @@ -2858,6 +2870,7 @@ namespace SebWindowsConfig // // tabPageExam // + this.tabPageExam.Controls.Add(this.groupBox2); this.tabPageExam.Controls.Add(this.groupBox9); this.tabPageExam.Controls.Add(this.groupBox8); this.tabPageExam.Controls.Add(this.groupBox7); @@ -3963,7 +3976,7 @@ namespace SebWindowsConfig this.spellCheckerGroupBox.Controls.Add(this.checkBoxAllowSpellCheck); this.spellCheckerGroupBox.Location = new System.Drawing.Point(790, 182); this.spellCheckerGroupBox.Name = "spellCheckerGroupBox"; - this.spellCheckerGroupBox.Size = new System.Drawing.Size(1036, 598); + this.spellCheckerGroupBox.Size = new System.Drawing.Size(1036, 628); this.spellCheckerGroupBox.TabIndex = 87; this.spellCheckerGroupBox.TabStop = false; this.spellCheckerGroupBox.Text = "Spell Checker"; @@ -3971,7 +3984,7 @@ namespace SebWindowsConfig // // dictionariesDescriptionLabel // - this.dictionariesDescriptionLabel.Location = new System.Drawing.Point(12, 497); + this.dictionariesDescriptionLabel.Location = new System.Drawing.Point(12, 516); this.dictionariesDescriptionLabel.Name = "dictionariesDescriptionLabel"; this.dictionariesDescriptionLabel.Size = new System.Drawing.Size(1012, 45); this.dictionariesDescriptionLabel.TabIndex = 3; @@ -4004,7 +4017,7 @@ namespace SebWindowsConfig // // removeDictionaryButton // - this.removeDictionaryButton.Location = new System.Drawing.Point(176, 549); + this.removeDictionaryButton.Location = new System.Drawing.Point(176, 571); this.removeDictionaryButton.Name = "removeDictionaryButton"; this.removeDictionaryButton.Size = new System.Drawing.Size(170, 35); this.removeDictionaryButton.TabIndex = 1; @@ -4014,7 +4027,7 @@ namespace SebWindowsConfig // // addDictionaryButton // - this.addDictionaryButton.Location = new System.Drawing.Point(12, 549); + this.addDictionaryButton.Location = new System.Drawing.Point(12, 571); this.addDictionaryButton.Name = "addDictionaryButton"; this.addDictionaryButton.Size = new System.Drawing.Size(158, 35); this.addDictionaryButton.TabIndex = 1; @@ -4038,7 +4051,7 @@ namespace SebWindowsConfig this.spellCheckerDataGridView.Location = new System.Drawing.Point(16, 120); this.spellCheckerDataGridView.Name = "spellCheckerDataGridView"; this.spellCheckerDataGridView.RowTemplate.Height = 28; - this.spellCheckerDataGridView.Size = new System.Drawing.Size(1002, 365); + this.spellCheckerDataGridView.Size = new System.Drawing.Size(1002, 380); this.spellCheckerDataGridView.TabIndex = 0; this.spellCheckerDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.spellCheckerDataGridView_CellValueChanged); this.spellCheckerDataGridView.CurrentCellDirtyStateChanged += new System.EventHandler(this.spellCheckerDataGridView_CurrentCellDirtyStateChanged); @@ -4065,8 +4078,8 @@ namespace SebWindowsConfig // spellCheckerDictionaryFilesColumn // this.spellCheckerDictionaryFilesColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle12; this.spellCheckerDictionaryFilesColumn.HeaderText = "Files"; this.spellCheckerDictionaryFilesColumn.Name = "spellCheckerDictionaryFilesColumn"; this.spellCheckerDictionaryFilesColumn.ReadOnly = true; @@ -4155,14 +4168,16 @@ namespace SebWindowsConfig // // groupBox6 // + this.groupBox6.Controls.Add(this.checkBoxAllowAdditionalWindowAddressBar); + this.groupBox6.Controls.Add(this.checkBoxAllowMainWindowAddressBar); this.groupBox6.Controls.Add(this.checkBoxEnableBrowserWindowToolbar); this.groupBox6.Controls.Add(this.checkBoxHideBrowserWindowToolbar); this.groupBox6.Controls.Add(this.checkBoxShowMenuBar); - this.groupBox6.Location = new System.Drawing.Point(34, 335); + this.groupBox6.Location = new System.Drawing.Point(34, 319); this.groupBox6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox6.Name = "groupBox6"; this.groupBox6.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox6.Size = new System.Drawing.Size(750, 106); + this.groupBox6.Size = new System.Drawing.Size(750, 152); this.groupBox6.TabIndex = 83; this.groupBox6.TabStop = false; this.groupBox6.Text = "Browser Window Toolbar"; @@ -4170,7 +4185,7 @@ namespace SebWindowsConfig // checkBoxEnableBrowserWindowToolbar // this.checkBoxEnableBrowserWindowToolbar.AutoSize = true; - this.checkBoxEnableBrowserWindowToolbar.Location = new System.Drawing.Point(15, 29); + this.checkBoxEnableBrowserWindowToolbar.Location = new System.Drawing.Point(14, 29); this.checkBoxEnableBrowserWindowToolbar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxEnableBrowserWindowToolbar.Name = "checkBoxEnableBrowserWindowToolbar"; this.checkBoxEnableBrowserWindowToolbar.Size = new System.Drawing.Size(254, 24); @@ -4185,7 +4200,7 @@ namespace SebWindowsConfig // this.checkBoxHideBrowserWindowToolbar.AutoSize = true; this.checkBoxHideBrowserWindowToolbar.Enabled = false; - this.checkBoxHideBrowserWindowToolbar.Location = new System.Drawing.Point(38, 62); + this.checkBoxHideBrowserWindowToolbar.Location = new System.Drawing.Point(44, 118); this.checkBoxHideBrowserWindowToolbar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxHideBrowserWindowToolbar.Name = "checkBoxHideBrowserWindowToolbar"; this.checkBoxHideBrowserWindowToolbar.Size = new System.Drawing.Size(239, 24); @@ -4211,6 +4226,7 @@ namespace SebWindowsConfig // // groupBox5 // + this.groupBox5.Controls.Add(this.checkBoxShowSideMenu); this.groupBox5.Controls.Add(this.checkBoxShowTaskBar); this.groupBox5.Controls.Add(this.checkboxAllowWlan); this.groupBox5.Controls.Add(this.comboBoxTaskBarHeight); @@ -4218,14 +4234,14 @@ namespace SebWindowsConfig this.groupBox5.Controls.Add(this.labelTaskBarHeight); this.groupBox5.Controls.Add(this.checkBoxShowTime); this.groupBox5.Controls.Add(this.checkBoxShowReloadButton); - this.groupBox5.Location = new System.Drawing.Point(34, 458); + this.groupBox5.Location = new System.Drawing.Point(34, 481); this.groupBox5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox5.Name = "groupBox5"; this.groupBox5.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.groupBox5.Size = new System.Drawing.Size(750, 202); + this.groupBox5.Size = new System.Drawing.Size(750, 201); this.groupBox5.TabIndex = 82; this.groupBox5.TabStop = false; - this.groupBox5.Text = "SEB taskbar/dock"; + this.groupBox5.Text = "Taskbar / Dock / Side Menu"; // // checkBoxShowTaskBar // @@ -4233,9 +4249,9 @@ namespace SebWindowsConfig this.checkBoxShowTaskBar.Location = new System.Drawing.Point(15, 29); this.checkBoxShowTaskBar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxShowTaskBar.Name = "checkBoxShowTaskBar"; - this.checkBoxShowTaskBar.Size = new System.Drawing.Size(169, 24); + this.checkBoxShowTaskBar.Size = new System.Drawing.Size(178, 24); this.checkBoxShowTaskBar.TabIndex = 5; - this.checkBoxShowTaskBar.Text = "Show SEB taskbar"; + this.checkBoxShowTaskBar.Text = "Show taskbar / dock"; this.toolTip1.SetToolTip(this.checkBoxShowTaskBar, "The SEB taskbar shows and switches between open browser windows, allowed resource" + "s and applications and displays additional controls"); this.checkBoxShowTaskBar.UseVisualStyleBackColor = true; @@ -4245,7 +4261,7 @@ namespace SebWindowsConfig // this.checkboxAllowWlan.AutoSize = true; this.checkboxAllowWlan.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkboxAllowWlan.Location = new System.Drawing.Point(44, 62); + this.checkboxAllowWlan.Location = new System.Drawing.Point(388, 29); this.checkboxAllowWlan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkboxAllowWlan.Name = "checkboxAllowWlan"; this.checkboxAllowWlan.Size = new System.Drawing.Size(208, 24); @@ -4258,7 +4274,7 @@ namespace SebWindowsConfig // comboBoxTaskBarHeight // this.comboBoxTaskBarHeight.FormattingEnabled = true; - this.comboBoxTaskBarHeight.Location = new System.Drawing.Point(574, 26); + this.comboBoxTaskBarHeight.Location = new System.Drawing.Point(574, 156); this.comboBoxTaskBarHeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxTaskBarHeight.Name = "comboBoxTaskBarHeight"; this.comboBoxTaskBarHeight.Size = new System.Drawing.Size(136, 28); @@ -4270,7 +4286,7 @@ namespace SebWindowsConfig // checkBoxShowKeyboardLayout // this.checkBoxShowKeyboardLayout.AutoSize = true; - this.checkBoxShowKeyboardLayout.Location = new System.Drawing.Point(44, 158); + this.checkBoxShowKeyboardLayout.Location = new System.Drawing.Point(388, 125); this.checkBoxShowKeyboardLayout.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxShowKeyboardLayout.Name = "checkBoxShowKeyboardLayout"; this.checkBoxShowKeyboardLayout.Size = new System.Drawing.Size(190, 24); @@ -4285,7 +4301,7 @@ namespace SebWindowsConfig // this.labelTaskBarHeight.AutoSize = true; this.labelTaskBarHeight.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelTaskBarHeight.Location = new System.Drawing.Point(399, 31); + this.labelTaskBarHeight.Location = new System.Drawing.Point(384, 159); this.labelTaskBarHeight.Name = "labelTaskBarHeight"; this.labelTaskBarHeight.Size = new System.Drawing.Size(152, 20); this.labelTaskBarHeight.TabIndex = 63; @@ -4295,7 +4311,7 @@ namespace SebWindowsConfig // checkBoxShowTime // this.checkBoxShowTime.AutoSize = true; - this.checkBoxShowTime.Location = new System.Drawing.Point(44, 126); + this.checkBoxShowTime.Location = new System.Drawing.Point(388, 93); this.checkBoxShowTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxShowTime.Name = "checkBoxShowTime"; this.checkBoxShowTime.Size = new System.Drawing.Size(109, 24); @@ -4308,7 +4324,7 @@ namespace SebWindowsConfig // checkBoxShowReloadButton // this.checkBoxShowReloadButton.AutoSize = true; - this.checkBoxShowReloadButton.Location = new System.Drawing.Point(44, 94); + this.checkBoxShowReloadButton.Location = new System.Drawing.Point(388, 61); this.checkBoxShowReloadButton.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.checkBoxShowReloadButton.Name = "checkBoxShowReloadButton"; this.checkBoxShowReloadButton.Size = new System.Drawing.Size(173, 24); @@ -4322,7 +4338,7 @@ namespace SebWindowsConfig // this.groupBoxEnableZoom.Controls.Add(this.checkBoxEnableZoomPage); this.groupBoxEnableZoom.Controls.Add(this.checkBoxEnableZoomText); - this.groupBoxEnableZoom.Location = new System.Drawing.Point(34, 675); + this.groupBoxEnableZoom.Location = new System.Drawing.Point(33, 704); this.groupBoxEnableZoom.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBoxEnableZoom.Name = "groupBoxEnableZoom"; this.groupBoxEnableZoom.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -4361,7 +4377,7 @@ namespace SebWindowsConfig // this.groupBoxZoomMode.Controls.Add(this.radioButtonUseZoomPage); this.groupBoxZoomMode.Controls.Add(this.radioButtonUseZoomText); - this.groupBoxZoomMode.Location = new System.Drawing.Point(423, 675); + this.groupBoxZoomMode.Location = new System.Drawing.Point(422, 704); this.groupBoxZoomMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBoxZoomMode.Name = "groupBoxZoomMode"; this.groupBoxZoomMode.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -4478,7 +4494,7 @@ namespace SebWindowsConfig this.groupBoxMainBrowserWindow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupBoxMainBrowserWindow.Name = "groupBoxMainBrowserWindow"; this.groupBoxMainBrowserWindow.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.groupBoxMainBrowserWindow.Size = new System.Drawing.Size(750, 138); + this.groupBoxMainBrowserWindow.Size = new System.Drawing.Size(750, 122); this.groupBoxMainBrowserWindow.TabIndex = 57; this.groupBoxMainBrowserWindow.TabStop = false; this.groupBoxMainBrowserWindow.Text = "Main browser window size and position"; @@ -4486,7 +4502,7 @@ namespace SebWindowsConfig // comboBoxMainBrowserWindowHeight // this.comboBoxMainBrowserWindowHeight.FormattingEnabled = true; - this.comboBoxMainBrowserWindowHeight.Location = new System.Drawing.Point(106, 86); + this.comboBoxMainBrowserWindowHeight.Location = new System.Drawing.Point(106, 74); this.comboBoxMainBrowserWindowHeight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxMainBrowserWindowHeight.Name = "comboBoxMainBrowserWindowHeight"; this.comboBoxMainBrowserWindowHeight.Size = new System.Drawing.Size(136, 28); @@ -4498,7 +4514,7 @@ namespace SebWindowsConfig // comboBoxMainBrowserWindowWidth // this.comboBoxMainBrowserWindowWidth.FormattingEnabled = true; - this.comboBoxMainBrowserWindowWidth.Location = new System.Drawing.Point(106, 42); + this.comboBoxMainBrowserWindowWidth.Location = new System.Drawing.Point(106, 30); this.comboBoxMainBrowserWindowWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.comboBoxMainBrowserWindowWidth.Name = "comboBoxMainBrowserWindowWidth"; this.comboBoxMainBrowserWindowWidth.Size = new System.Drawing.Size(136, 28); @@ -4511,7 +4527,7 @@ namespace SebWindowsConfig // this.labelMainWindowHeight.AutoSize = true; this.labelMainWindowHeight.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelMainWindowHeight.Location = new System.Drawing.Point(36, 91); + this.labelMainWindowHeight.Location = new System.Drawing.Point(36, 79); this.labelMainWindowHeight.Name = "labelMainWindowHeight"; this.labelMainWindowHeight.Size = new System.Drawing.Size(56, 20); this.labelMainWindowHeight.TabIndex = 60; @@ -4521,7 +4537,7 @@ namespace SebWindowsConfig // this.labelMainWindowWidth.AutoSize = true; this.labelMainWindowWidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelMainWindowWidth.Location = new System.Drawing.Point(36, 48); + this.labelMainWindowWidth.Location = new System.Drawing.Point(36, 36); this.labelMainWindowWidth.Name = "labelMainWindowWidth"; this.labelMainWindowWidth.Size = new System.Drawing.Size(50, 20); this.labelMainWindowWidth.TabIndex = 59; @@ -4531,7 +4547,7 @@ namespace SebWindowsConfig // this.labelMainWindowPosition.AutoSize = true; this.labelMainWindowPosition.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelMainWindowPosition.Location = new System.Drawing.Point(406, 48); + this.labelMainWindowPosition.Location = new System.Drawing.Point(406, 53); this.labelMainWindowPosition.Name = "labelMainWindowPosition"; this.labelMainWindowPosition.Size = new System.Drawing.Size(161, 20); this.labelMainWindowPosition.TabIndex = 58; @@ -4543,7 +4559,7 @@ namespace SebWindowsConfig this.listBoxMainBrowserWindowPositioning.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.listBoxMainBrowserWindowPositioning.FormattingEnabled = true; this.listBoxMainBrowserWindowPositioning.ItemHeight = 20; - this.listBoxMainBrowserWindowPositioning.Location = new System.Drawing.Point(576, 25); + this.listBoxMainBrowserWindowPositioning.Location = new System.Drawing.Point(576, 30); this.listBoxMainBrowserWindowPositioning.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.listBoxMainBrowserWindowPositioning.Name = "listBoxMainBrowserWindowPositioning"; this.listBoxMainBrowserWindowPositioning.Size = new System.Drawing.Size(134, 64); @@ -5402,6 +5418,104 @@ namespace SebWindowsConfig this.applyAndStartSEBToolStripMenuItem.Visible = false; this.applyAndStartSEBToolStripMenuItem.Click += new System.EventHandler(this.applyAndStartSEBToolStripMenuItem_Click); // + // groupBox2 + // + this.groupBox2.Controls.Add(this.label15); + this.groupBox2.Controls.Add(this.checkBoxClearSessionOnEnd); + this.groupBox2.Controls.Add(this.checkBoxClearSessionOnStart); + this.groupBox2.Location = new System.Drawing.Point(907, 23); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(832, 182); + this.groupBox2.TabIndex = 122; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Session Handling"; + // + // checkBoxClearSessionOnStart + // + this.checkBoxClearSessionOnStart.AutoSize = true; + this.checkBoxClearSessionOnStart.Location = new System.Drawing.Point(22, 94); + this.checkBoxClearSessionOnStart.Name = "checkBoxClearSessionOnStart"; + this.checkBoxClearSessionOnStart.Size = new System.Drawing.Size(465, 24); + this.checkBoxClearSessionOnStart.TabIndex = 0; + this.checkBoxClearSessionOnStart.Text = "Clear browser session when starting an exam or starting SEB"; + this.checkBoxClearSessionOnStart.UseVisualStyleBackColor = true; + this.checkBoxClearSessionOnStart.CheckedChanged += new System.EventHandler(this.checkBoxClearSessionOnStart_CheckedChanged); + // + // checkBoxClearSessionOnEnd + // + this.checkBoxClearSessionOnEnd.AutoSize = true; + this.checkBoxClearSessionOnEnd.Location = new System.Drawing.Point(22, 135); + this.checkBoxClearSessionOnEnd.Name = "checkBoxClearSessionOnEnd"; + this.checkBoxClearSessionOnEnd.Size = new System.Drawing.Size(486, 24); + this.checkBoxClearSessionOnEnd.TabIndex = 1; + this.checkBoxClearSessionOnEnd.Text = "Clear browser session when ending an exam or terminating SEB"; + this.checkBoxClearSessionOnEnd.UseVisualStyleBackColor = true; + this.checkBoxClearSessionOnEnd.CheckedChanged += new System.EventHandler(this.checkBoxClearSessionOnEnd_CheckedChanged); + // + // label15 + // + this.label15.Location = new System.Drawing.Point(18, 35); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(792, 56); + this.label15.TabIndex = 2; + this.label15.Text = "Use the following parameters to control whether a browser session is persisted on" + + " disk, e.g. to keep users logged in after a reconfiguration."; + // + // checkBoxAllowMainWindowAddressBar + // + this.checkBoxAllowMainWindowAddressBar.AutoSize = true; + this.checkBoxAllowMainWindowAddressBar.Location = new System.Drawing.Point(44, 59); + this.checkBoxAllowMainWindowAddressBar.Name = "checkBoxAllowMainWindowAddressBar"; + this.checkBoxAllowMainWindowAddressBar.Size = new System.Drawing.Size(318, 24); + this.checkBoxAllowMainWindowAddressBar.TabIndex = 5; + this.checkBoxAllowMainWindowAddressBar.Text = "Allow address bar for main window (Win)"; + this.checkBoxAllowMainWindowAddressBar.UseVisualStyleBackColor = true; + this.checkBoxAllowMainWindowAddressBar.CheckedChanged += new System.EventHandler(this.checkBoxAllowMainWindowAddressBar_CheckedChanged); + // + // checkBoxAllowAdditionalWindowAddressBar + // + this.checkBoxAllowAdditionalWindowAddressBar.AutoSize = true; + this.checkBoxAllowAdditionalWindowAddressBar.Location = new System.Drawing.Point(44, 89); + this.checkBoxAllowAdditionalWindowAddressBar.Name = "checkBoxAllowAdditionalWindowAddressBar"; + this.checkBoxAllowAdditionalWindowAddressBar.Size = new System.Drawing.Size(360, 24); + this.checkBoxAllowAdditionalWindowAddressBar.TabIndex = 6; + this.checkBoxAllowAdditionalWindowAddressBar.Text = "Allow address bar for additional windows (Win)"; + this.checkBoxAllowAdditionalWindowAddressBar.UseVisualStyleBackColor = true; + this.checkBoxAllowAdditionalWindowAddressBar.CheckedChanged += new System.EventHandler(this.checkBoxAllowAdditionalWindowAddressBar_CheckedChanged); + // + // checkBoxShowSideMenu + // + this.checkBoxShowSideMenu.AutoSize = true; + this.checkBoxShowSideMenu.Location = new System.Drawing.Point(15, 61); + this.checkBoxShowSideMenu.Name = "checkBoxShowSideMenu"; + this.checkBoxShowSideMenu.Size = new System.Drawing.Size(152, 24); + this.checkBoxShowSideMenu.TabIndex = 82; + this.checkBoxShowSideMenu.Text = "Show side menu"; + this.checkBoxShowSideMenu.UseVisualStyleBackColor = true; + this.checkBoxShowSideMenu.CheckedChanged += new System.EventHandler(this.checkBoxShowSideMenu_CheckedChanged); + // + // checkBoxAllowLogAccess + // + this.checkBoxAllowLogAccess.AutoSize = true; + this.checkBoxAllowLogAccess.Location = new System.Drawing.Point(34, 257); + this.checkBoxAllowLogAccess.Name = "checkBoxAllowLogAccess"; + this.checkBoxAllowLogAccess.Size = new System.Drawing.Size(290, 24); + this.checkBoxAllowLogAccess.TabIndex = 99; + this.checkBoxAllowLogAccess.Text = "Allow access to application log (Win)"; + this.checkBoxAllowLogAccess.UseVisualStyleBackColor = true; + this.checkBoxAllowLogAccess.CheckedChanged += new System.EventHandler(this.checkBoxAllowLogAccess_CheckedChanged); + // + // checkBoxShowLogButton + // + this.checkBoxShowLogButton.AutoSize = true; + this.checkBoxShowLogButton.Location = new System.Drawing.Point(80, 287); + this.checkBoxShowLogButton.Name = "checkBoxShowLogButton"; + this.checkBoxShowLogButton.Size = new System.Drawing.Size(264, 24); + this.checkBoxShowLogButton.TabIndex = 100; + this.checkBoxShowLogButton.Text = "Show log button in taskbar (Win)"; + this.checkBoxShowLogButton.UseVisualStyleBackColor = true; + this.checkBoxShowLogButton.CheckedChanged += new System.EventHandler(this.checkBoxShowLogButton_CheckedChanged); + // // SebWindowsConfigForm // this.AllowDrop = true; @@ -5514,6 +5628,8 @@ namespace SebWindowsConfig this.tabControlSebWindowsConfig.ResumeLayout(false); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -5907,6 +6023,15 @@ namespace SebWindowsConfig private System.Windows.Forms.CheckBox checkBoxAllowScreenSharing; private System.Windows.Forms.CheckBox checkBoxEnablePrivateClipboard; private System.Windows.Forms.ToolStripMenuItem collectLogFilesToolStripMenuItem; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.CheckBox checkBoxClearSessionOnEnd; + private System.Windows.Forms.CheckBox checkBoxClearSessionOnStart; + private System.Windows.Forms.CheckBox checkBoxAllowAdditionalWindowAddressBar; + private System.Windows.Forms.CheckBox checkBoxAllowMainWindowAddressBar; + private System.Windows.Forms.CheckBox checkBoxShowSideMenu; + private System.Windows.Forms.CheckBox checkBoxAllowLogAccess; + private System.Windows.Forms.CheckBox checkBoxShowLogButton; } } diff --git a/SebWindowsConfig/SebWindowsConfigForm.cs b/SebWindowsConfig/SebWindowsConfigForm.cs index 386e1644..2a031fd1 100644 --- a/SebWindowsConfig/SebWindowsConfigForm.cs +++ b/SebWindowsConfig/SebWindowsConfigForm.cs @@ -365,9 +365,12 @@ namespace SebWindowsConfig checkBoxHideBrowserWindowToolbar .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyHideBrowserWindowToolbar]; checkBoxShowMenuBar .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyShowMenuBar]; checkBoxShowTaskBar .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyShowTaskBar]; + checkBoxShowSideMenu.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyShowSideMenu]; checkBoxShowReloadButton.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyShowReloadButton]; comboBoxTaskBarHeight.Text = (String)SEBSettings.settingsCurrent[SEBSettings.KeyTaskBarHeight].ToString(); checkBoxEnableTouchExit .Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyEnableTouchExit]; + checkBoxAllowMainWindowAddressBar.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyBrowserWindowAllowAddressBar]; + checkBoxAllowAdditionalWindowAddressBar.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyNewBrowserWindowAllowAddressBar]; var defaultText = "(part of application)"; var defaultStyle = new DataGridViewCellStyle { BackColor = Color.LightGray }; @@ -525,6 +528,8 @@ namespace SebWindowsConfig // Group "Exam" checkBoxSendBrowserExamKey.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeySendBrowserExamKey]; + checkBoxClearSessionOnEnd.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyExamSessionClearCookiesOnEnd]; + checkBoxClearSessionOnStart.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyExamSessionClearCookiesOnStart]; textBoxBrowserExamKey.Enabled = checkBoxSendBrowserExamKey.Checked; textBoxQuitURL.Text = (String)SEBSettings.settingsCurrent[SEBSettings.KeyQuitURL]; checkBoxQuitURLConfirm.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyQuitURLConfirm]; @@ -751,6 +756,9 @@ namespace SebWindowsConfig radioNoKiosMode.Checked = !(Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyKillExplorerShell] && !(Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyCreateNewDesktop]; checkBoxEnableLogging.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyEnableLogging]; textBoxLogDirectoryWin.Text = (String)SEBSettings.settingsCurrent[SEBSettings.KeyLogDirectoryWin]; + checkBoxAllowLogAccess.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowApplicationLog]; + checkBoxShowLogButton.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyShowApplicationLogButton]; + if (String.IsNullOrEmpty(textBoxLogDirectoryWin.Text)) { checkBoxUseStandardDirectory.Checked = true; @@ -1723,6 +1731,8 @@ namespace SebWindowsConfig { SEBSettings.settingsCurrent[SEBSettings.KeyEnableBrowserWindowToolbar] = checkBoxEnableBrowserWindowToolbar.Checked; checkBoxHideBrowserWindowToolbar.Enabled = checkBoxEnableBrowserWindowToolbar.Checked; + checkBoxAllowMainWindowAddressBar.Enabled = checkBoxEnableBrowserWindowToolbar.Checked; + checkBoxAllowAdditionalWindowAddressBar.Enabled = checkBoxEnableBrowserWindowToolbar.Checked; } private void checkBoxHideBrowserWindowToolbar_CheckedChanged(object sender, EventArgs e) @@ -4463,5 +4473,41 @@ namespace SebWindowsConfig { new LogCollector(this).Run(); } + + private void checkBoxAllowMainWindowAddressBar_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyBrowserWindowAllowAddressBar] = checkBoxAllowMainWindowAddressBar.Checked; + } + + private void checkBoxAllowAdditionalWindowAddressBar_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyNewBrowserWindowAllowAddressBar] = checkBoxAllowAdditionalWindowAddressBar.Checked; + } + + private void checkBoxClearSessionOnStart_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyExamSessionClearCookiesOnStart] = checkBoxClearSessionOnStart.Checked; + } + + private void checkBoxClearSessionOnEnd_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyExamSessionClearCookiesOnEnd] = checkBoxClearSessionOnEnd.Checked; + } + + private void checkBoxShowSideMenu_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyShowSideMenu] = checkBoxShowSideMenu.Checked; + } + + private void checkBoxAllowLogAccess_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyAllowApplicationLog] = checkBoxAllowLogAccess.Checked; + checkBoxShowLogButton.Enabled = checkBoxAllowLogAccess.Checked; + } + + private void checkBoxShowLogButton_CheckedChanged(object sender, EventArgs e) + { + SEBSettings.settingsCurrent[SEBSettings.KeyShowApplicationLogButton] = checkBoxShowLogButton.Checked; + } } } diff --git a/SebWindowsConfig/SebWindowsConfigForm.resx b/SebWindowsConfig/SebWindowsConfigForm.resx index 30980ed4..d435f8b4 100644 --- a/SebWindowsConfig/SebWindowsConfigForm.resx +++ b/SebWindowsConfig/SebWindowsConfigForm.resx @@ -1082,18 +1082,6 @@ True - - True - - - True - - - True - - - True - True @@ -1148,12 +1136,27 @@ True + + True + + + True + + + True + + + True + Disabling browsing to previously visited pages (by Ctrl-Cursor left or the button in the browser toolbar, if enabled) might not be desired for additional resources and other content opening in additional browser windows, therefore this separate setting. Disabling browsing to previously visited pages (by Ctrl-Cursor left or the button in the browser toolbar, if enabled) increases security, because it might be possible to leave an exam by browsing back to an external start page. + + 17, 17 + True @@ -1184,9 +1187,6 @@ 968, 17 - - 17, 17 - 1222, 17