summaryrefslogtreecommitdiffstats
path: root/win/C#/frmMain.cs
diff options
context:
space:
mode:
authorsr55 <[email protected]>2007-11-21 14:50:50 +0000
committersr55 <[email protected]>2007-11-21 14:50:50 +0000
commit29d3f70f98a37961181bc995d47062f43201f142 (patch)
tree8ed358fd7e207e05defbaef80269deb1e41d3fc9 /win/C#/frmMain.cs
parentacd2da1da6770674b3411c788246a2556d92ae09 (diff)
WinGui:
- Cleaned up the status update code for the splash screen. - Added option to turn off automatic preset update on each launch. - Removed some unneeded variables. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1072 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmMain.cs')
-rw-r--r--win/C#/frmMain.cs55
1 files changed, 29 insertions, 26 deletions
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 97db9218d..094587357 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -68,32 +68,43 @@ namespace Handbrake
Version.Text = "Version " + Properties.Settings.Default.CliVersion;
// update the status
- lblStatus.Text = "Checking for updates ...";
- // redraw the splash screen
- Application.DoEvents();
- // Run the update checker.
if (Properties.Settings.Default.updateStatus == "Checked")
+ {
+ lblStatus.Text = "Checking for updates ...";
+ // redraw the splash screen
+ Application.DoEvents();
+ // Run the update checker.
updateCheck();
- Thread.Sleep(200);
+ Thread.Sleep(200);
+ }
// Update the presets
- lblStatus.Text = "Updaing Presets ...";
- Application.DoEvents();
- updatePresets();
- Thread.Sleep(200);
+ if (Properties.Settings.Default.updatePresets == "Checked")
+ {
+ lblStatus.Text = "Updaing Presets ...";
+ Application.DoEvents();
+ updatePresets();
+ Thread.Sleep(200);
+ }
// Now load the users default if required. (Will overide the above setting)
- lblStatus.Text = "Loading User Default Settings...";
- Application.DoEvents();
- loadNormalPreset();
- loadUserDefaults();
- Thread.Sleep(100);
+ if (Properties.Settings.Default.defaultSettings == "Checked")
+ {
+ lblStatus.Text = "Loading User Default Settings...";
+ Application.DoEvents();
+ loadNormalPreset();
+ loadUserDefaults();
+ Thread.Sleep(100);
+ }
// Enable or disable tooltips
- lblStatus.Text = "Loading Tooltips ...";
- Application.DoEvents();
- tooltip();
- Thread.Sleep(100);
+ if (Properties.Settings.Default.tooltipEnable == "Checked")
+ {
+ lblStatus.Text = "Loading Tooltips ...";
+ Application.DoEvents();
+ ToolTip.Active = true;
+ Thread.Sleep(100);
+ }
// Hide the preset bar if required.
hidePresetBar();
@@ -161,14 +172,6 @@ namespace Handbrake
}
}
- private void tooltip()
- {
- if (Properties.Settings.Default.tooltipEnable == "Checked")
- {
- ToolTip.Active = true;
- }
- }
-
private void hidePresetBar()
{
if (Properties.Settings.Default.hidePresets == "Checked")