zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-413: Made find functionality configurable.

Browse source
This commit is contained in:
Damian Büchel 2020-08-11 17:52:51 +02:00
parent 7a91d34ca8
commit af71bbd72e
11 changed files with 951 additions and 955 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SafeExamBrowser.Browser/BrowserApplicationInstance.cs
View file

@ -357,7 +357,10 @@ namespace SafeExamBrowser.Browser
private void KeyboardHandler_FindRequested()
{
window.ShowFindbar();
if (settings.AllowFind)
{
window.ShowFindbar();
}
}
private void LifeSpanHandler_PopupRequested(PopupRequestedEventArgs args)
@ -501,7 +504,10 @@ namespace SafeExamBrowser.Browser
private void Window_FindRequested(string term, bool isInitial, bool caseSensitive, bool forward = true)
{
control.Find(term, isInitial, caseSensitive, forward);
if (settings.AllowFind)
{
control.Find(term, isInitial, caseSensitive, forward);
}
}
private void Window_ForwardNavigationRequested()

11
SafeExamBrowser.Configuration/ConfigurationData/DataMapping/BrowserDataMapper.cs
View file

@ -33,6 +33,9 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
case Keys.Browser.AllowDownloadsAndUploads:
MapAllowDownloadsAndUploads(settings, value);
break;
case Keys.Browser.AllowFind:
MapAllowFind(settings, value);
break;
case Keys.Browser.AllowPageZoom:
MapAllowPageZoom(settings, value);
break;
@ -195,6 +198,14 @@ namespace SafeExamBrowser.Configuration.ConfigurationData.DataMapping
}
}
private void MapAllowFind(AppSettings settings, object value)
{
if (value is bool allow)
{
settings.Browser.AllowFind = allow;
}
}
private void MapAllowNavigation(AppSettings settings, object value)
{
if (value is bool allow)

1
SafeExamBrowser.Configuration/ConfigurationData/DataValues.cs
View file

@ -117,6 +117,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
settings.Browser.AllowConfigurationDownloads = true;
settings.Browser.AllowCustomDownAndUploadLocation = false;
settings.Browser.AllowDownloads = true;
settings.Browser.AllowFind = true;
settings.Browser.AllowPageZoom = true;
settings.Browser.AllowPdfReader = true;
settings.Browser.AllowPdfReaderToolbar = false;

1
SafeExamBrowser.Configuration/ConfigurationData/Keys.cs
View file

@ -45,6 +45,7 @@ namespace SafeExamBrowser.Configuration.ConfigurationData
internal const string AllowCustomDownUploadLocation = "allowCustomDownUploadLocation";
internal const string AllowDeveloperConsole = "allowDeveloperConsole";
internal const string AllowDownloadsAndUploads = "allowDownUploads";
internal const string AllowFind = "allowFind";
internal const string AllowPageZoom = "enableZoomPage";
internal const string AllowPdfReaderToolbar = "allowPDFReaderToolbar";
internal const string AllowSpellChecking = "allowSpellCheck";

5
SafeExamBrowser.Settings/Browser/BrowserSettings.cs
View file

@ -36,6 +36,11 @@ namespace SafeExamBrowser.Settings.Browser
/// </summary>
public bool AllowDownloads { get; set; }
/// <summary>
/// Determines whether the user will be allowed to search page contents.
/// </summary>
public bool AllowFind { get; set; }
/// <summary>
/// Determines whether the user will be allowed to zoom webpages.
/// </summary>

4
SafeExamBrowser.UserInterface.Desktop/Windows/BrowserWindow.xaml.cs
View file

@ -197,7 +197,7 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
ReloadRequested?.Invoke();
}
if ((Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) && e.Key == Key.F)
if (settings.AllowFind && (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) && e.Key == Key.F)
{
ShowFindbar();
}
@ -323,6 +323,8 @@ namespace SafeExamBrowser.UserInterface.Desktop.Windows
DeveloperConsoleMenuItem.Visibility = WindowSettings.AllowDeveloperConsole ? Visibility.Visible : Visibility.Collapsed;
FindMenuItem.Visibility = settings.AllowFind ? Visibility.Visible : Visibility.Collapsed;
ForwardButton.IsEnabled = WindowSettings.AllowForwardNavigation;
ForwardButton.Visibility = WindowSettings.AllowForwardNavigation ? Visibility.Visible : Visibility.Collapsed;

4
SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs
View file

@ -197,7 +197,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
ReloadRequested?.Invoke();
}
if ((Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) && e.Key == Key.F)
if (settings.AllowFind && (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)) && e.Key == Key.F)
{
ShowFindbar();
}
@ -323,6 +323,8 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
DeveloperConsoleMenuItem.Visibility = WindowSettings.AllowDeveloperConsole ? Visibility.Visible : Visibility.Collapsed;
FindMenuItem.Visibility = settings.AllowFind ? Visibility.Visible : Visibility.Collapsed;
ForwardButton.IsEnabled = WindowSettings.AllowForwardNavigation;
ForwardButton.Visibility = WindowSettings.AllowForwardNavigation ? Visibility.Visible : Visibility.Collapsed;

2
SebWindowsConfig/SEBSettings.cs
View file

@ -170,6 +170,7 @@ namespace SebWindowsConfig
public const String KeyBrowserUserAgentMacCustom = "browserUserAgentMacCustom";
public const String KeyBrowserWindowTitleSuffix = "browserWindowTitleSuffix";
public const String KeyAllowPDFReaderToolbar = "allowPDFReaderToolbar";
public const String KeyAllowFind = "allowFind";
// Group "DownUploads"
public const String KeyAllowDownUploads = "allowDownUploads";
@ -679,6 +680,7 @@ namespace SebWindowsConfig
SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserUserAgentMacCustom, "");
SEBSettings.settingsDefault.Add(SEBSettings.KeyBrowserWindowTitleSuffix, "");
SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowPDFReaderToolbar, false);
SEBSettings.settingsDefault.Add(SEBSettings.KeyAllowFind, true);
// NewBrowserWindow Width and Height is stored additionally
SEBSettings.intArrayDefault[SEBSettings.ValNewBrowserWindowByLinkWidth ] = 4;
SEBSettings.intArrayDefault[SEBSettings.ValNewBrowserWindowByLinkHeight] = 2;

56
SebWindowsConfig/SebWindowsConfigForm.Designer.cs generated
View file

@ -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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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);
@ -256,6 +256,7 @@ namespace SebWindowsConfig
this.labelBrowserExamKey = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.tabPageDownUploads = new System.Windows.Forms.TabPage();
this.checkBoxAllowCustomDownloadLocation = new System.Windows.Forms.CheckBox();
this.checkBoxAllowPDFPlugIn = new System.Windows.Forms.CheckBox();
this.textBoxDownloadDirectoryWin = new System.Windows.Forms.TextBox();
this.checkBoxDownloadOpenSEBFiles = new System.Windows.Forms.CheckBox();
@ -439,7 +440,7 @@ namespace SebWindowsConfig
this.editDuplicateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.configureClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.applyAndStartSEBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.checkBoxAllowCustomDownloadLocation = new System.Windows.Forms.CheckBox();
this.checkBoxAllowFind = new System.Windows.Forms.CheckBox();
this.tabPageHookedKeys.SuspendLayout();
this.groupBoxFunctionKeys.SuspendLayout();
this.groupBoxSpecialKeys.SuspendLayout();
@ -1808,8 +1809,8 @@ namespace SebWindowsConfig
//
// Type
//
dataGridViewCellStyle5.BackColor = System.Drawing.Color.Silver;
this.Type.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.Silver;
this.Type.DefaultCellStyle = dataGridViewCellStyle1;
this.Type.HeaderText = "Type";
this.Type.Name = "Type";
this.Type.ReadOnly = true;
@ -3363,6 +3364,17 @@ namespace SebWindowsConfig
this.tabPageDownUploads.Text = "Down/Uploads";
this.tabPageDownUploads.UseVisualStyleBackColor = true;
//
// checkBoxAllowCustomDownloadLocation
//
this.checkBoxAllowCustomDownloadLocation.AutoSize = true;
this.checkBoxAllowCustomDownloadLocation.Location = new System.Drawing.Point(114, 122);
this.checkBoxAllowCustomDownloadLocation.Name = "checkBoxAllowCustomDownloadLocation";
this.checkBoxAllowCustomDownloadLocation.Size = new System.Drawing.Size(289, 17);
this.checkBoxAllowCustomDownloadLocation.TabIndex = 89;
this.checkBoxAllowCustomDownloadLocation.Text = "Allow user to select custom download / upload directory";
this.checkBoxAllowCustomDownloadLocation.UseVisualStyleBackColor = true;
this.checkBoxAllowCustomDownloadLocation.CheckedChanged += new System.EventHandler(this.checkBoxAllowCustomDownloadLocation_CheckedChanged);
//
// checkBoxAllowPDFPlugIn
//
this.checkBoxAllowPDFPlugIn.AutoSize = true;
@ -3797,6 +3809,7 @@ namespace SebWindowsConfig
//
// groupBox11
//
this.groupBox11.Controls.Add(this.checkBoxAllowFind);
this.groupBox11.Controls.Add(this.checkBoxAllowPdfReaderToolbar);
this.groupBox11.Controls.Add(this.checkBoxShowReloadWarningNewWindow);
this.groupBox11.Controls.Add(this.checkBoxAllowReloadNewWindow);
@ -3814,7 +3827,7 @@ namespace SebWindowsConfig
this.groupBox11.Controls.Add(this.checkBoxEnableJava);
this.groupBox11.Location = new System.Drawing.Point(24, 202);
this.groupBox11.Name = "groupBox11";
this.groupBox11.Size = new System.Drawing.Size(522, 158);
this.groupBox11.Size = new System.Drawing.Size(522, 187);
this.groupBox11.TabIndex = 71;
this.groupBox11.TabStop = false;
this.groupBox11.Text = "Browser security";
@ -3822,7 +3835,7 @@ namespace SebWindowsConfig
// checkBoxAllowPdfReaderToolbar
//
this.checkBoxAllowPdfReaderToolbar.AutoSize = true;
this.checkBoxAllowPdfReaderToolbar.Location = new System.Drawing.Point(14, 89);
this.checkBoxAllowPdfReaderToolbar.Location = new System.Drawing.Point(14, 114);
this.checkBoxAllowPdfReaderToolbar.Name = "checkBoxAllowPdfReaderToolbar";
this.checkBoxAllowPdfReaderToolbar.Size = new System.Drawing.Size(485, 17);
this.checkBoxAllowPdfReaderToolbar.TabIndex = 14;
@ -3945,7 +3958,7 @@ namespace SebWindowsConfig
//
// checkBoxRemoveProfile
//
this.checkBoxRemoveProfile.Location = new System.Drawing.Point(14, 112);
this.checkBoxRemoveProfile.Location = new System.Drawing.Point(14, 137);
this.checkBoxRemoveProfile.Name = "checkBoxRemoveProfile";
this.checkBoxRemoveProfile.Size = new System.Drawing.Size(481, 36);
this.checkBoxRemoveProfile.TabIndex = 6;
@ -4046,7 +4059,7 @@ namespace SebWindowsConfig
// labelUseSEBWithoutBrowser
//
this.labelUseSEBWithoutBrowser.AutoSize = true;
this.labelUseSEBWithoutBrowser.Location = new System.Drawing.Point(55, 396);
this.labelUseSEBWithoutBrowser.Location = new System.Drawing.Point(55, 435);
this.labelUseSEBWithoutBrowser.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelUseSEBWithoutBrowser.Name = "labelUseSEBWithoutBrowser";
this.labelUseSEBWithoutBrowser.Size = new System.Drawing.Size(436, 13);
@ -4057,7 +4070,7 @@ namespace SebWindowsConfig
// checkBoxUseSebWithoutBrowser
//
this.checkBoxUseSebWithoutBrowser.AutoSize = true;
this.checkBoxUseSebWithoutBrowser.Location = new System.Drawing.Point(38, 376);
this.checkBoxUseSebWithoutBrowser.Location = new System.Drawing.Point(38, 415);
this.checkBoxUseSebWithoutBrowser.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
this.checkBoxUseSebWithoutBrowser.Name = "checkBoxUseSebWithoutBrowser";
this.checkBoxUseSebWithoutBrowser.Size = new System.Drawing.Size(185, 17);
@ -4316,8 +4329,8 @@ namespace SebWindowsConfig
// spellCheckerDictionaryFilesColumn
//
this.spellCheckerDictionaryFilesColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.spellCheckerDictionaryFilesColumn.DefaultCellStyle = dataGridViewCellStyle2;
this.spellCheckerDictionaryFilesColumn.HeaderText = "Files";
this.spellCheckerDictionaryFilesColumn.Name = "spellCheckerDictionaryFilesColumn";
this.spellCheckerDictionaryFilesColumn.ReadOnly = true;
@ -5714,16 +5727,16 @@ namespace SebWindowsConfig
this.applyAndStartSEBToolStripMenuItem.Visible = false;
this.applyAndStartSEBToolStripMenuItem.Click += new System.EventHandler(this.applyAndStartSEBToolStripMenuItem_Click);
//
// checkBoxAllowCustomDownloadLocation
// checkBoxAllowFind
//
this.checkBoxAllowCustomDownloadLocation.AutoSize = true;
this.checkBoxAllowCustomDownloadLocation.Location = new System.Drawing.Point(114, 122);
this.checkBoxAllowCustomDownloadLocation.Name = "checkBoxAllowCustomDownloadLocation";
this.checkBoxAllowCustomDownloadLocation.Size = new System.Drawing.Size(289, 17);
this.checkBoxAllowCustomDownloadLocation.TabIndex = 89;
this.checkBoxAllowCustomDownloadLocation.Text = "Allow user to select custom download / upload directory";
this.checkBoxAllowCustomDownloadLocation.UseVisualStyleBackColor = true;
this.checkBoxAllowCustomDownloadLocation.CheckedChanged += new System.EventHandler(this.checkBoxAllowCustomDownloadLocation_CheckedChanged);
this.checkBoxAllowFind.AutoSize = true;
this.checkBoxAllowFind.Location = new System.Drawing.Point(14, 81);
this.checkBoxAllowFind.Name = "checkBoxAllowFind";
this.checkBoxAllowFind.Size = new System.Drawing.Size(106, 17);
this.checkBoxAllowFind.TabIndex = 15;
this.checkBoxAllowFind.Text = "Allow text search";
this.checkBoxAllowFind.UseVisualStyleBackColor = true;
this.checkBoxAllowFind.CheckedChanged += new System.EventHandler(this.checkBoxAllowFind_CheckedChanged);
//
// SebWindowsConfigForm
//
@ -6258,6 +6271,7 @@ namespace SebWindowsConfig
private System.Windows.Forms.Label labelSebServiceIgnore;
private System.Windows.Forms.GroupBox groupBoxSebService;
private System.Windows.Forms.CheckBox checkBoxAllowCustomDownloadLocation;
private System.Windows.Forms.CheckBox checkBoxAllowFind;
}
}

6
SebWindowsConfig/SebWindowsConfigForm.cs
View file

@ -488,6 +488,7 @@ namespace SebWindowsConfig
checkBoxEnableZoomText.CheckedChanged += checkBoxEnableZoomText_CheckedChanged;
checkBoxEnableZoomPage.CheckedChanged += checkBoxEnableZoomPage_CheckedChanged;
checkBoxAllowPdfReaderToolbar.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowPDFReaderToolbar];
checkBoxAllowFind.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowFind];
checkBoxAllowSpellCheck.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowSpellCheck];
checkBoxAllowDictionaryLookup.Checked = (Boolean)SEBSettings.settingsCurrent[SEBSettings.KeyAllowDictionaryLookup];
@ -4584,5 +4585,10 @@ namespace SebWindowsConfig
{
SEBSettings.settingsCurrent[SEBSettings.KeyAllowCustomDownUploadLocation] = checkBoxAllowCustomDownloadLocation.Checked;
}
private void checkBoxAllowFind_CheckedChanged(object sender, EventArgs e)
{
SEBSettings.settingsCurrent[SEBSettings.KeyAllowFind] = checkBoxAllowFind.Checked;
}
}
}

1806
SebWindowsConfig/SebWindowsConfigForm.resx
View file

File diff suppressed because it is too large Load diff