summaryrefslogtreecommitdiffstats
path: root/win/C#
diff options
context:
space:
mode:
Diffstat (limited to 'win/C#')
-rw-r--r--win/C#/HandBrakeCS.csproj2
-rw-r--r--win/C#/Properties/Resources.Designer.cs7
-rw-r--r--win/C#/Properties/Resources.resx3
-rw-r--r--win/C#/Resources/tempSplash.jpgbin0 -> 54972 bytes
-rw-r--r--win/C#/frmMain.cs11
-rw-r--r--win/C#/frmReadDVD.cs4
-rw-r--r--win/C#/frmSplashScreen.Designer.cs94
-rw-r--r--win/C#/frmSplashScreen.cs4
8 files changed, 29 insertions, 96 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 829bad5d0..86d6e8a14 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -10,6 +10,7 @@
<RootNamespace>Handbrake</RootNamespace>
<AssemblyName>Handbrake</AssemblyName>
<ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
+ <StartupObject>Handbrake.Program</StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -173,6 +174,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="handbrakepineapple.ico" />
+ <None Include="Resources\tempSplash.jpg" />
<None Include="splash.jpg" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 845bedbbf..877f63b1b 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -66,5 +66,12 @@ namespace Handbrake.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ internal static System.Drawing.Bitmap tempSplash {
+ get {
+ object obj = ResourceManager.GetObject("tempSplash", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index ede73750e..98a62259e 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -121,4 +121,7 @@
<data name="splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="tempSplash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\tempSplash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root> \ No newline at end of file
diff --git a/win/C#/Resources/tempSplash.jpg b/win/C#/Resources/tempSplash.jpg
new file mode 100644
index 000000000..0bc46b5f0
--- /dev/null
+++ b/win/C#/Resources/tempSplash.jpg
Binary files differ
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 794a571c6..e70994e7f 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -31,6 +31,9 @@ namespace Handbrake
public frmMain()
{
+
+ ThreadPool.QueueUserWorkItem(showSplash);
+ Thread.Sleep(3000);
InitializeComponent();
@@ -49,6 +52,13 @@ namespace Handbrake
loadUserDefaults();
}
+ public void showSplash(object sender)
+ {
+ Form splash = new frmSplashScreen();
+ splash.Show();
+ Thread.Sleep(3000);
+ splash.Close();
+ }
public void loadUserDefaults()
{
try
@@ -1383,6 +1393,7 @@ namespace Handbrake
return querySource+ queryDestination+ queryPictureSettings+ queryVideoSettings+ h264Settings+ queryAudioSettings+ queryAdvancedSettings+ verbose;
}
+
// This is the END of the road ------------------------------------------------------------------------------
}
} \ No newline at end of file
diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 6c73291e5..b06d1009d 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -32,7 +32,7 @@ namespace Handbrake
private void btn_ok_Click(object sender, EventArgs e)
{
btn_ok.Enabled = false;
- btn_skip.Visible = true;
+ //btn_skip.Visible = true;
lbl_pressOk.Visible = false;
lbl_progress.Text = "0%";
lbl_progress.Visible = true;
@@ -66,6 +66,8 @@ namespace Handbrake
Parsing.Parser readData = new Parsing.Parser(hbProc.StandardError.BaseStream);
readData.OnScanProgress += Parser_OnScanProgress;
+
+
readData.OnReadLine += dvdInfo.HandleParsedData;
readData.OnReadToEnd += dvdInfo.HandleParsedData;
hbProc.Close();
diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 9201edd87..b85def35c 100644
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -29,119 +29,27 @@ namespace Handbrake
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSplashScreen));
- this.productName = new System.Windows.Forms.Label();
- this.cliVersion = new System.Windows.Forms.Label();
- this.guiVerison = new System.Windows.Forms.Label();
- this.lbl_cli = new System.Windows.Forms.Label();
- this.lbl_gui = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
- // productName
- //
- this.productName.AutoSize = true;
- this.productName.Font = new System.Drawing.Font("Verdana", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.productName.Location = new System.Drawing.Point(177, 69);
- this.productName.Name = "productName";
- this.productName.Size = new System.Drawing.Size(180, 32);
- this.productName.TabIndex = 0;
- this.productName.Text = "Handbrake";
- //
- // cliVersion
- //
- this.cliVersion.AutoSize = true;
- this.cliVersion.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cliVersion.Location = new System.Drawing.Point(180, 197);
- this.cliVersion.Name = "cliVersion";
- this.cliVersion.Size = new System.Drawing.Size(145, 13);
- this.cliVersion.TabIndex = 1;
- this.cliVersion.Text = "Handbrake CLI Version:";
- //
- // guiVerison
- //
- this.guiVerison.AutoSize = true;
- this.guiVerison.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.guiVerison.Location = new System.Drawing.Point(180, 170);
- this.guiVerison.Name = "guiVerison";
- this.guiVerison.Size = new System.Drawing.Size(55, 13);
- this.guiVerison.TabIndex = 2;
- this.guiVerison.Text = "Version:";
- //
- // lbl_cli
- //
- this.lbl_cli.AutoSize = true;
- this.lbl_cli.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_cli.Location = new System.Drawing.Point(331, 197);
- this.lbl_cli.Name = "lbl_cli";
- this.lbl_cli.Size = new System.Drawing.Size(88, 13);
- this.lbl_cli.TabIndex = 4;
- this.lbl_cli.Text = "{CLI Version}";
- //
- // lbl_gui
- //
- this.lbl_gui.AutoSize = true;
- this.lbl_gui.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbl_gui.Location = new System.Drawing.Point(331, 170);
- this.lbl_gui.Name = "lbl_gui";
- this.lbl_gui.Size = new System.Drawing.Size(90, 13);
- this.lbl_gui.TabIndex = 5;
- this.lbl_gui.Text = "{GUI Version}";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(418, 170);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(43, 13);
- this.label1.TabIndex = 6;
- this.label1.Text = "(Beta)";
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(418, 197);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(43, 13);
- this.label4.TabIndex = 7;
- this.label4.Text = "(Beta)";
- //
// frmSplashScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
- this.BackgroundImage = global::Handbrake.Properties.Resources.splash;
+ this.BackgroundImage = global::Handbrake.Properties.Resources.tempSplash;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.ClientSize = new System.Drawing.Size(496, 276);
this.ControlBox = false;
- this.Controls.Add(this.label4);
- this.Controls.Add(this.label1);
- this.Controls.Add(this.lbl_gui);
- this.Controls.Add(this.lbl_cli);
- this.Controls.Add(this.guiVerison);
- this.Controls.Add(this.cliVersion);
- this.Controls.Add(this.productName);
this.Font = new System.Drawing.Font("Corbel", 8.25F);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmSplashScreen";
this.Text = "SplashScreen";
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- private System.Windows.Forms.Label productName;
- private System.Windows.Forms.Label cliVersion;
- private System.Windows.Forms.Label guiVerison;
- private System.Windows.Forms.Label lbl_cli;
- private System.Windows.Forms.Label lbl_gui;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label4;
}
} \ No newline at end of file
diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs
index d45d0ca26..f86122ce9 100644
--- a/win/C#/frmSplashScreen.cs
+++ b/win/C#/frmSplashScreen.cs
@@ -14,8 +14,8 @@ namespace Handbrake
public frmSplashScreen()
{
InitializeComponent();
- lbl_cli.Text = Properties.Settings.Default.CliVersion;
- lbl_gui.Text = Properties.Settings.Default.GuiVersion;
+ //lbl_cli.Text = Properties.Settings.Default.CliVersion;
+ //lbl_gui.Text = Properties.Settings.Default.GuiVersion;
}
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 08:55:29 +0000