Skip to content

Commit af802ea

Browse files
l4km47l4km47
authored
Merge pull request #12 from l4km47/dev
Dev
2 parents 07d5c79 + 11be1d7 commit af802ea

File tree

9 files changed

+669
-358
lines changed

9 files changed

+669
-358
lines changed

‎TubeDl/MsgBox.Designer.cs‎

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TubeDl/MsgBox.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace TubeDl
12+
{
13+
public partial class MsgBox : Form
14+
{
15+
DialogResult d;
16+
DialogResult dd;
17+
public MsgBox(string text, string caption, string b1, string b2,DialogResult d1,DialogResult d2)
18+
{
19+
InitializeComponent();
20+
label1.Text = text;
21+
Text = caption;
22+
button1.Text = b1;
23+
button2.Text = b2;
24+
d = d1;
25+
dd = d2;
26+
}
27+
28+
private void button1_Click(object sender, EventArgs e)
29+
{
30+
DialogResult = d;
31+
}
32+
33+
private void button2_Click(object sender, EventArgs e)
34+
{
35+
DialogResult = dd;
36+
}
37+
38+
private void MsgBox_Load(object sender, EventArgs e)
39+
{
40+
button2.Left = button1.Left + button1.Width + 5;
41+
}
42+
}
43+
}

‎TubeDl/MsgBox.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎TubeDl/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Unknown Devt")]
1111
[assembly: AssemblyProduct("Unknown Devt TubeDl")]
12-
[assembly: AssemblyCopyright("Copyright © 2018 Unkdevt")]
13-
[assembly: AssemblyTrademark("beta")]
12+
[assembly: AssemblyCopyright("Copyright © 2018 Unkdevt")]
13+
[assembly: AssemblyTrademark("beta2")]
1414
[assembly: AssemblyCulture("")]
1515

1616
// Setting ComVisible to false makes the types in this assembly not visible

‎TubeDl/TubeDl.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
<Compile Include="frmAddlink.Designer.cs">
8080
<DependentUpon>frmAddlink.cs</DependentUpon>
8181
</Compile>
82+
<Compile Include="MsgBox.cs">
83+
<SubType>Form</SubType>
84+
</Compile>
85+
<Compile Include="MsgBox.Designer.cs">
86+
<DependentUpon>MsgBox.cs</DependentUpon>
87+
</Compile>
8288
<Compile Include="TubeDlHelpers.cs" />
8389
<Compile Include="ExTextBox.cs">
8490
<SubType>Component</SubType>
@@ -112,6 +118,9 @@
112118
<DependentUpon>frmDownloadDialog.cs</DependentUpon>
113119
<SubType>Designer</SubType>
114120
</EmbeddedResource>
121+
<EmbeddedResource Include="MsgBox.resx">
122+
<DependentUpon>MsgBox.cs</DependentUpon>
123+
</EmbeddedResource>
115124
<EmbeddedResource Include="Properties\Resources.resx">
116125
<Generator>ResXFileCodeGenerator</Generator>
117126
<LastGenOutput>Resources.Designer.cs</LastGenOutput>

‎TubeDl/TubeDlHelpers.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static string Extention()
6060

6161
}
6262

63-
63+
public static Double filesize;
6464
public static string GetFileSize(Uri uriPath)
6565
{
6666
var webRequest = HttpWebRequest.Create(uriPath);
@@ -71,6 +71,7 @@ public static string GetFileSize(Uri uriPath)
7171
var fileSize = webResponse.Headers.Get("Content-Length");
7272
var fileSizeInMegaByte = Unkdevt.StringHelpers.GetLengthString(Math.Round(
7373
Convert.ToDouble(fileSize)));
74+
filesize = Convert.ToDouble(fileSize);
7475
return fileSizeInMegaByte;
7576
}
7677
}

‎TubeDl/frmDownloadDialog.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ public frmDownloadDialog(string url)
1818
Close();
1919
InitializeComponent();
2020
url_ = exTextBox1.Text = url;
21-
cmbQuality.SelectedIndex = 1;
21+
cmbQuality.SelectedIndex = 3;
2222
}
2323

2424
private void frmSelect_Load(object sender, EventArgs e)
2525
{
26-
26+
pictureBox1.Image = null;
2727
try
2828
{
29-
if (Unkdevt.ConnectionHelpers.IsNetworkAvailablex)
30-
catchlink();
31-
else
29+
if (!Unkdevt.ConnectionHelpers.IsNetworkAvailablex)
30+
3231
{
3332
MessageBox.Show("Internet connection required!", Text, MessageBoxButtons.OK,
3433
MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
3534
Close();
3635
}
36+
catchlink();
3737
}
3838
catch (Exception wx)
3939
{
@@ -45,10 +45,10 @@ private void frmSelect_Load(object sender, EventArgs e)
4545
private void btnOk_Click(object sender, EventArgs e)
4646
{
4747
TubeDlHelpers.Combine = false;
48-
if (cmbQuality.SelectedIndex == 2 || cmbQuality.SelectedIndex == 4)
49-
{
50-
TubeDlHelpers.Combine = true;
51-
}
48+
//if (cmbQuality.SelectedIndex == 2 || cmbQuality.SelectedIndex == 4)
49+
//{
50+
// TubeDlHelpers.Combine = true;
51+
//}
5252
DialogResult = DialogResult.OK;
5353
Close();
5454
}

0 commit comments

Comments
 (0)