ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/EmuXPortal/branches/uienhancements/EmuXPortal/Form1.cs

Comparing branches/uienhancements/EmuXPortal/Form1.cs (file contents):
Revision 55 by william, Sun Apr 8 13:25:33 2012 UTC vs.
Revision 56 by william, Sun Apr 8 13:45:24 2012 UTC

#	Line 11 | Line 11 | using EmuXPortal.Logging;
11		using System.Diagnostics;
12		using System.Reflection;
13		using System.Threading;
14	–	using Utilities.TransparentControls;
14
15		namespace EmuXPortal
16		{
#	Line 232 | Line 231 | namespace EmuXPortal
231		Stopwatch t = e.Argument as Stopwatch;
232		RomParser parser = new RomParser(CurrentSelectedRom);
233
234	<	ProgressBarWithPercentageLabel bar = new ProgressBarWithPercentageLabel();
234	>	ProgressBar bar = new ProgressBar();
235		AddGameControl(bar);
236		UpdateGameControls();
237		Application.DoEvents();
238		Thread.Sleep(10);
239		bar.Invoke(new MethodInvoker(delegate
240		{
241	<	bar.Message = "Please Wait...";
242	<	bar.ShowPercentageLabel = true;
241	>	//bar.Message = "Please Wait...";
242	>	//bar.ShowPercentageLabel = true;
243		bar.Margin = new System.Windows.Forms.Padding(0);
244		bar.Size = new Size(GetFormWidth() - 25, 100);
245		}));
#	Line 289 | Line 288 | namespace EmuXPortal
288		PlatformParser parser = new PlatformParser(Config.RomPath);
289		double count = 0;
290		double total_count = parser.Platforms.Count;
291	<	ProgressBarWithPercentageLabel bar = new ProgressBarWithPercentageLabel();
292	<	AddPlatformControl(bar);
291	>	ProgressBar bar = new ProgressBar();
292	>	AddPlatformControl(bar);
293		UpdatePlatformControls();
294		Application.DoEvents();
295		Thread.Sleep(10);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines