From 754e130f3401e2ff630d2746b5f99ea66330f119 Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 1 Aug 2008 18:15:19 +0000 Subject: [PATCH] WinGui: - Changed the layout of the Options window. - Added a "Stop" button to stop encodes. - Moved Encode status label onto a status bar at the bottom of the window. Now includes scanning status. - Added and Removed some png images git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1600 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/HandBrakeCS.csproj | 5 + win/C#/Properties/AssemblyInfo.cs | 2 +- win/C#/Properties/Resources.Designer.cs | 42 +-- win/C#/Properties/Resources.resx | 42 +-- win/C#/Resources/Help16.png | Bin 0 -> 3499 bytes win/C#/Resources/hb16.png | Bin 0 -> 3746 bytes win/C#/Resources/hb32.png | Bin 0 -> 5935 bytes win/C#/Resources/info16.png | Bin 0 -> 3495 bytes win/C#/Resources/stop.png | Bin 0 -> 1341 bytes win/C#/frmMain.Designer.cs | 255 +++++++------- win/C#/frmMain.cs | 25 +- win/C#/frmMain.resx | 94 +++-- win/C#/frmOptions.Designer.cs | 443 ++++++++++++------------ win/C#/frmOptions.cs | 33 +- win/C#/frmOptions.resx | 3 + 15 files changed, 471 insertions(+), 473 deletions(-) create mode 100644 win/C#/Resources/Help16.png create mode 100644 win/C#/Resources/hb16.png create mode 100644 win/C#/Resources/hb32.png create mode 100644 win/C#/Resources/info16.png create mode 100644 win/C#/Resources/stop.png diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index cb4fa7295..43bc6c014 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -236,6 +236,10 @@ + + + + @@ -243,6 +247,7 @@ + diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs index f7ea463b2..834ae795a 100644 --- a/win/C#/Properties/AssemblyInfo.cs +++ b/win/C#/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ using System.Resources; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("HandBrake")] [assembly: AssemblyProduct("HandBrake")] -[assembly: AssemblyCopyright("Copyright © 2007")] +[assembly: AssemblyCopyright("Copyright © 2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index 60a12a5c2..f03af9328 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -81,20 +81,6 @@ namespace Handbrake.Properties { } } - internal static System.Drawing.Bitmap Delete { - get { - object obj = ResourceManager.GetObject("Delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - internal static System.Drawing.Bitmap Disc { - get { - object obj = ResourceManager.GetObject("Disc", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap disc_small { get { object obj = ResourceManager.GetObject("disc_small", resourceCulture); @@ -102,37 +88,37 @@ namespace Handbrake.Properties { } } - internal static System.Drawing.Bitmap Emoticon { + internal static System.Drawing.Bitmap General_Preferences { get { - object obj = ResourceManager.GetObject("Emoticon", resourceCulture); + object obj = ResourceManager.GetObject("General_Preferences", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - internal static System.Drawing.Bitmap General_Preferences { + internal static System.Drawing.Bitmap hb16 { get { - object obj = ResourceManager.GetObject("General_Preferences", resourceCulture); + object obj = ResourceManager.GetObject("hb16", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - internal static System.Drawing.Bitmap Help { + internal static System.Drawing.Bitmap hb32 { get { - object obj = ResourceManager.GetObject("Help", resourceCulture); + object obj = ResourceManager.GetObject("hb32", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - internal static System.Drawing.Bitmap History { + internal static System.Drawing.Bitmap Help16 { get { - object obj = ResourceManager.GetObject("History", resourceCulture); + object obj = ResourceManager.GetObject("Help16", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - internal static System.Drawing.Bitmap info { + internal static System.Drawing.Bitmap info16 { get { - object obj = ResourceManager.GetObject("info", resourceCulture); + object obj = ResourceManager.GetObject("info16", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -207,16 +193,16 @@ namespace Handbrake.Properties { } } - internal static System.Drawing.Bitmap Remove { + internal static System.Drawing.Bitmap SplashScreen { get { - object obj = ResourceManager.GetObject("Remove", resourceCulture); + object obj = ResourceManager.GetObject("SplashScreen", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - internal static System.Drawing.Bitmap SplashScreen { + internal static System.Drawing.Bitmap stop { get { - object obj = ResourceManager.GetObject("SplashScreen", resourceCulture); + object obj = ResourceManager.GetObject("stop", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index 7f07815fc..4fe140efd 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -124,30 +124,15 @@ ..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Disc.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Pref_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\History.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\logo128.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ActivityWindow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,21 +145,12 @@ ..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Queue_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Movies.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Emoticon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Movies_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,4 +163,22 @@ ..\resources\activitywindow_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\hb16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\hb32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Help16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\info16.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/win/C#/Resources/Help16.png b/win/C#/Resources/Help16.png new file mode 100644 index 0000000000000000000000000000000000000000..bb5ef99ce839944c2f0ba8bb663b0a5891d53c55 GIT binary patch literal 3499 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 ZH2^#seg-WWC2Rly002ovPDHLkV1g3;k$eCE literal 0 HcmV?d00001 diff --git a/win/C#/Resources/hb16.png b/win/C#/Resources/hb16.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f72077571f15dddd08fc70670f7d09b390302c GIT binary patch literal 3746 zcmV;T4qfqyP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}000BMNklp$t%F%B!VN z!J#c!$0n$0rKz#$Mr&#`rW@0hF>#}AT(~iDsU{i|A1igEn376MOEFav2!f&%Iv@-T z^I{(N-kJM4F02c`<(GWR4?Q$={G+yKXQEC|L~ioqUns%>n(R!_l*2(lDFHwLAV@$! zK~n%^0EAhL`zoyY>akQ@aymIlZ|8P#1aE}m^d2eLH;9uB@&W%<;&mpu zO)aui`i3axB%_qJ94xKJ>D(><$3Lg9nN+f3by(eb2W`!eX{KUkzlIzPD^FUy=RM=G z5l^QSGSiA=Z)+PYo8O<^SkH>Zihr;W^sH2>+TlYT`lYs5*O6G0Ie6h|rEhMYe5G>s zlxr;Vx}A``oC1yIy3I4n=K_GVg7Zw!&RoTUu<8zySF>i$Kv09i8Z&+ z+kf$N@P$|);J>j(kPQe}uQsk57JtA-TVrp%HGUSjK4hA?y4%HCg5^dzGAlo@*mhG#?#`GU6n?2`R296JFA>X4p@T0pZ z^$hV}_bkG79WIe0=r+;NZ7^z~sx;vDFx*+lPY^}`Q6OlEg~L97`S}+wJ^A6E_jea& zZ?8_C>^ksvPrQjVv>GIl!+?aKo1&&@C~G#pnA{l?I0!%pN+q?h_Q3cg7klj^9}2sSDzB0&bNuK&GLH0K2yKwY;{*Hr*OwYi1;&glap=Z{&D!)}UY$#P7nKHmF0}UNu zf(xapUY?rUd%vb=5FUmBS(aZpdFs^52w;8L=X0_E>4>V{B?kdP!t1HpeUDg zd_B4KLqj)<03d*K0wCaad%C01Xz<60iR@l3*Kjzb+Uk~iy<8}@cej~inhtNJrtd7J zD>sW3{WAb1{5LrO20#K31rP*a0LTHT0&oCm1>gfv0FZg;IRN}K09*^Khn7pAU;qFB M07*qoM6N<$g0a>6X8-^I literal 0 HcmV?d00001 diff --git a/win/C#/Resources/hb32.png b/win/C#/Resources/hb32.png new file mode 100644 index 0000000000000000000000000000000000000000..5054264d31b720060ba4db7a08144bb1aa8b8cea GIT binary patch literal 5935 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 + + True + + + True + 223, 15 @@ -164,65 +170,16 @@ Note: Do not change any of the chapter numbers! 329, 15 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I - k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC - TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p - AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 - BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr - UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG - CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 - F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS - rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt - NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp - 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W - AAAAAElFTkSuQmCC - - 106, 15 731, 18 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I - k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC - TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p - AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 - BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr - UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG - CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 - F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS - rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt - NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp - 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W - AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL - U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI - VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ - QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4 - /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9 - cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j - 3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR - dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb - NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE - s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC - - 830, 18 + AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA @@ -600,6 +557,43 @@ Note: Do not change any of the chapter numbers! MFwCR0mXBU9PBAJJSwIGBQMCBQUEJQQHAyUFDwJcBAYCIxM9BAEtDpYAHAByLFEls+ERAC4EEgIuAAkf IwAGUV0ABDQzSwkyMgQBNTQAFCIPAAYCBQUGBAQABAAEOwUEBAAAAAEB//8AAOAHAADgAwAA+gMAAPoB AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA== + + + + 1060, 18 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I + k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC + TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p + AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 + BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr + UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG + CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 + F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS + rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt + NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp + 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W + AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I + k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC + TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p + AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 + BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr + UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG + CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 + F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS + rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt + NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp + 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W + AAAAAElFTkSuQmCC diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index 6bcf91a2c..b2f2152dc 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -34,41 +34,40 @@ namespace Handbrake /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions)); this.btn_close = new System.Windows.Forms.Button(); this.drp_completeOption = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); this.tab_options = new System.Windows.Forms.TabControl(); this.tab_general = new System.Windows.Forms.TabPage(); - this.check_tooltip = new System.Windows.Forms.CheckBox(); - this.check_updateCheck = new System.Windows.Forms.CheckBox(); - this.check_userDefaultSettings = new System.Windows.Forms.CheckBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.btn_drive_detect = new System.Windows.Forms.CheckBox(); - this.label6 = new System.Windows.Forms.Label(); this.btn_browse = new System.Windows.Forms.Button(); this.label10 = new System.Windows.Forms.Label(); this.text_an_path = new System.Windows.Forms.TextBox(); this.check_autoNaming = new System.Windows.Forms.CheckBox(); - this.label9 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.check_tooltip = new System.Windows.Forms.CheckBox(); + this.check_updateCheck = new System.Windows.Forms.CheckBox(); + this.check_userDefaultSettings = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.tab_debug = new System.Windows.Forms.TabPage(); - this.label3 = new System.Windows.Forms.Label(); + this.tab_cli = new System.Windows.Forms.TabPage(); + this.check_cli_minimized = new System.Windows.Forms.CheckBox(); + this.label12 = new System.Windows.Forms.Label(); this.drp_Priority = new System.Windows.Forms.ComboBox(); this.Label11 = new System.Windows.Forms.Label(); this.drp_processors = new System.Windows.Forms.ComboBox(); this.Label4 = new System.Windows.Forms.Label(); + this.tab_advanced = new System.Windows.Forms.TabPage(); + this.btn_drive_detect = new System.Windows.Forms.CheckBox(); + this.label6 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.label7 = new System.Windows.Forms.Label(); this.pathFinder = new System.Windows.Forms.FolderBrowserDialog(); - this.check_cli_minimized = new System.Windows.Forms.CheckBox(); - this.label12 = new System.Windows.Forms.Label(); + this.ToolTip = new System.Windows.Forms.ToolTip(this.components); this.tab_options.SuspendLayout(); this.tab_general.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tab_debug.SuspendLayout(); + this.tab_cli.SuspendLayout(); + this.tab_advanced.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // @@ -78,7 +77,7 @@ namespace Handbrake this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_close.Location = new System.Drawing.Point(320, 383); + this.btn_close.Location = new System.Drawing.Point(395, 344); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(107, 22); this.btn_close.TabIndex = 53; @@ -99,57 +98,110 @@ namespace Handbrake "Lock System", "Log Off", "Quit HandBrake"}); - this.drp_completeOption.Location = new System.Drawing.Point(193, 39); + this.drp_completeOption.Location = new System.Drawing.Point(114, 103); this.drp_completeOption.Name = "drp_completeOption"; - this.drp_completeOption.Size = new System.Drawing.Size(111, 21); + this.drp_completeOption.Size = new System.Drawing.Size(166, 21); this.drp_completeOption.TabIndex = 43; + this.ToolTip.SetToolTip(this.drp_completeOption, "Performs an action when an encode or queue has completed."); this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.drp_completeOption_SelectedIndexChanged); // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(14, 42); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(173, 13); - this.label5.TabIndex = 42; - this.label5.Text = "When the encode completes:"; - // // tab_options // this.tab_options.Controls.Add(this.tab_general); - this.tab_options.Controls.Add(this.tabPage1); - this.tab_options.Controls.Add(this.tab_debug); - this.tab_options.Location = new System.Drawing.Point(12, 63); + this.tab_options.Controls.Add(this.tab_cli); + this.tab_options.Controls.Add(this.tab_advanced); + this.tab_options.Location = new System.Drawing.Point(12, 55); this.tab_options.Name = "tab_options"; this.tab_options.SelectedIndex = 0; - this.tab_options.Size = new System.Drawing.Size(419, 314); + this.tab_options.Size = new System.Drawing.Size(490, 278); this.tab_options.TabIndex = 58; // // tab_general // + this.tab_general.Controls.Add(this.btn_browse); + this.tab_general.Controls.Add(this.label10); + this.tab_general.Controls.Add(this.text_an_path); + this.tab_general.Controls.Add(this.check_autoNaming); + this.tab_general.Controls.Add(this.label13); this.tab_general.Controls.Add(this.check_tooltip); this.tab_general.Controls.Add(this.check_updateCheck); this.tab_general.Controls.Add(this.check_userDefaultSettings); this.tab_general.Controls.Add(this.label1); + this.tab_general.Controls.Add(this.label2); + this.tab_general.Controls.Add(this.drp_completeOption); this.tab_general.Location = new System.Drawing.Point(4, 22); this.tab_general.Name = "tab_general"; - this.tab_general.Padding = new System.Windows.Forms.Padding(3); - this.tab_general.Size = new System.Drawing.Size(411, 232); - this.tab_general.TabIndex = 0; - this.tab_general.Text = "Startup"; + this.tab_general.Size = new System.Drawing.Size(482, 252); + this.tab_general.TabIndex = 3; + this.tab_general.Text = "General"; this.tab_general.UseVisualStyleBackColor = true; // + // btn_browse + // + this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); + this.btn_browse.Location = new System.Drawing.Point(386, 174); + this.btn_browse.Name = "btn_browse"; + this.btn_browse.Size = new System.Drawing.Size(68, 22); + this.btn_browse.TabIndex = 78; + this.btn_browse.Text = "Browse"; + this.btn_browse.UseVisualStyleBackColor = true; + this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click); + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label10.Location = new System.Drawing.Point(111, 177); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(82, 13); + this.label10.TabIndex = 77; + this.label10.Text = "Default Path:"; + // + // text_an_path + // + this.text_an_path.Location = new System.Drawing.Point(199, 174); + this.text_an_path.Name = "text_an_path"; + this.text_an_path.Size = new System.Drawing.Size(181, 21); + this.text_an_path.TabIndex = 76; + this.ToolTip.SetToolTip(this.text_an_path, "Default location where Auto named files are stored."); + this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged); + // + // check_autoNaming + // + this.check_autoNaming.AutoSize = true; + this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.check_autoNaming.Location = new System.Drawing.Point(114, 151); + this.check_autoNaming.Name = "check_autoNaming"; + this.check_autoNaming.Size = new System.Drawing.Size(340, 17); + this.check_autoNaming.TabIndex = 72; + this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)"; + this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files"); + this.check_autoNaming.UseVisualStyleBackColor = true; + this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged); + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.Location = new System.Drawing.Point(10, 152); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(86, 13); + this.label13.TabIndex = 71; + this.label13.Text = "Output files:"; + // // check_tooltip // this.check_tooltip.AutoSize = true; this.check_tooltip.BackColor = System.Drawing.Color.Transparent; this.check_tooltip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_tooltip.Location = new System.Drawing.Point(16, 56); + this.check_tooltip.Location = new System.Drawing.Point(114, 41); this.check_tooltip.Name = "check_tooltip"; this.check_tooltip.Size = new System.Drawing.Size(135, 17); - this.check_tooltip.TabIndex = 57; + this.check_tooltip.TabIndex = 70; this.check_tooltip.Text = "Enable GUI tooltips"; + this.ToolTip.SetToolTip(this.check_tooltip, "Enable the built in tooltips for gui controls."); this.check_tooltip.UseVisualStyleBackColor = false; this.check_tooltip.CheckedChanged += new System.EventHandler(this.check_tooltip_CheckedChanged); // @@ -158,11 +210,13 @@ namespace Handbrake this.check_updateCheck.AutoSize = true; this.check_updateCheck.BackColor = System.Drawing.Color.Transparent; this.check_updateCheck.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_updateCheck.Location = new System.Drawing.Point(16, 33); + this.check_updateCheck.Location = new System.Drawing.Point(114, 18); this.check_updateCheck.Name = "check_updateCheck"; this.check_updateCheck.Size = new System.Drawing.Size(131, 17); - this.check_updateCheck.TabIndex = 55; + this.check_updateCheck.TabIndex = 68; this.check_updateCheck.Text = "Check for updates"; + this.ToolTip.SetToolTip(this.check_updateCheck, "Enables the built in update checker. This check is performed when the application" + + " starts."); this.check_updateCheck.UseVisualStyleBackColor = false; this.check_updateCheck.CheckedChanged += new System.EventHandler(this.check_updateCheck_CheckedChanged); // @@ -171,11 +225,12 @@ namespace Handbrake this.check_userDefaultSettings.AutoSize = true; this.check_userDefaultSettings.BackColor = System.Drawing.Color.Transparent; this.check_userDefaultSettings.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_userDefaultSettings.Location = new System.Drawing.Point(16, 79); + this.check_userDefaultSettings.Location = new System.Drawing.Point(114, 64); this.check_userDefaultSettings.Name = "check_userDefaultSettings"; this.check_userDefaultSettings.Size = new System.Drawing.Size(166, 17); - this.check_userDefaultSettings.TabIndex = 56; + this.check_userDefaultSettings.TabIndex = 69; this.check_userDefaultSettings.Text = "Load my default settings"; + this.ToolTip.SetToolTip(this.check_userDefaultSettings, "Loads the users default settings rather than the Normal preset."); this.check_userDefaultSettings.UseVisualStyleBackColor = false; this.check_userDefaultSettings.CheckedChanged += new System.EventHandler(this.check_userDefaultSettings_CheckedChanged); // @@ -184,142 +239,59 @@ namespace Handbrake this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(13, 13); + this.label1.Location = new System.Drawing.Point(21, 19); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(76, 13); - this.label1.TabIndex = 0; - this.label1.Text = "On Startup"; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.check_cli_minimized); - this.tabPage1.Controls.Add(this.label12); - this.tabPage1.Controls.Add(this.btn_drive_detect); - this.tabPage1.Controls.Add(this.label6); - this.tabPage1.Controls.Add(this.btn_browse); - this.tabPage1.Controls.Add(this.label10); - this.tabPage1.Controls.Add(this.text_an_path); - this.tabPage1.Controls.Add(this.check_autoNaming); - this.tabPage1.Controls.Add(this.label9); - this.tabPage1.Controls.Add(this.label2); - this.tabPage1.Controls.Add(this.drp_completeOption); - this.tabPage1.Controls.Add(this.label5); - this.tabPage1.Location = new System.Drawing.Point(4, 22); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(411, 288); - this.tabPage1.TabIndex = 3; - this.tabPage1.Text = "General"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // btn_drive_detect - // - this.btn_drive_detect.AutoSize = true; - this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_drive_detect.Location = new System.Drawing.Point(17, 204); - this.btn_drive_detect.Name = "btn_drive_detect"; - this.btn_drive_detect.Size = new System.Drawing.Size(383, 17); - this.btn_drive_detect.TabIndex = 64; - this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu"; - this.btn_drive_detect.UseVisualStyleBackColor = true; - this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(14, 182); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(108, 13); - this.label6.TabIndex = 63; - this.label6.Text = "Drive Detection"; - // - // btn_browse - // - this.btn_browse.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_browse.Location = new System.Drawing.Point(326, 146); - this.btn_browse.Name = "btn_browse"; - this.btn_browse.Size = new System.Drawing.Size(68, 22); - this.btn_browse.TabIndex = 62; - this.btn_browse.Text = "Browse"; - this.btn_browse.UseVisualStyleBackColor = true; - this.btn_browse.Click += new System.EventHandler(this.btn_browse_Click); - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(14, 131); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(145, 13); - this.label10.TabIndex = 61; - this.label10.Text = "Default AutoName Path:"; - // - // text_an_path - // - this.text_an_path.Location = new System.Drawing.Point(17, 147); - this.text_an_path.Name = "text_an_path"; - this.text_an_path.Size = new System.Drawing.Size(303, 21); - this.text_an_path.TabIndex = 60; - this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged); - // - // check_autoNaming - // - this.check_autoNaming.AutoSize = true; - this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_autoNaming.Location = new System.Drawing.Point(17, 101); - this.check_autoNaming.Name = "check_autoNaming"; - this.check_autoNaming.Size = new System.Drawing.Size(340, 17); - this.check_autoNaming.TabIndex = 56; - this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)"; - this.check_autoNaming.UseVisualStyleBackColor = true; - this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged); - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(14, 78); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(90, 13); - this.label9.TabIndex = 55; - this.label9.Text = "Auto Naming"; + this.label1.Size = new System.Drawing.Size(75, 13); + this.label1.TabIndex = 67; + this.label1.Text = "At Launch:"; // // label2 // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(14, 19); + this.label2.Location = new System.Drawing.Point(12, 106); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(80, 13); + this.label2.Size = new System.Drawing.Size(84, 13); this.label2.TabIndex = 54; - this.label2.Text = "When Done"; - // - // tab_debug - // - this.tab_debug.Controls.Add(this.label3); - this.tab_debug.Controls.Add(this.drp_Priority); - this.tab_debug.Controls.Add(this.Label11); - this.tab_debug.Controls.Add(this.drp_processors); - this.tab_debug.Controls.Add(this.Label4); - this.tab_debug.Location = new System.Drawing.Point(4, 22); - this.tab_debug.Name = "tab_debug"; - this.tab_debug.Size = new System.Drawing.Size(411, 232); - this.tab_debug.TabIndex = 2; - this.tab_debug.Text = "Performance"; - this.tab_debug.UseVisualStyleBackColor = true; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(13, 13); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(176, 13); - this.label3.TabIndex = 44; - this.label3.Text = "Process(or) Configuration"; + this.label2.Text = "When Done:"; + // + // tab_cli + // + this.tab_cli.Controls.Add(this.check_cli_minimized); + this.tab_cli.Controls.Add(this.label12); + this.tab_cli.Controls.Add(this.drp_Priority); + this.tab_cli.Controls.Add(this.Label11); + this.tab_cli.Controls.Add(this.drp_processors); + this.tab_cli.Controls.Add(this.Label4); + this.tab_cli.Location = new System.Drawing.Point(4, 22); + this.tab_cli.Name = "tab_cli"; + this.tab_cli.Size = new System.Drawing.Size(482, 252); + this.tab_cli.TabIndex = 2; + this.tab_cli.Text = "CLI"; + this.tab_cli.UseVisualStyleBackColor = true; + // + // check_cli_minimized + // + this.check_cli_minimized.AutoSize = true; + this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.check_cli_minimized.Location = new System.Drawing.Point(71, 18); + this.check_cli_minimized.Name = "check_cli_minimized"; + this.check_cli_minimized.Size = new System.Drawing.Size(155, 17); + this.check_cli_minimized.TabIndex = 76; + this.check_cli_minimized.Text = "Use window minimized"; + this.ToolTip.SetToolTip(this.check_cli_minimized, "Starts a CLI window minimized."); + this.check_cli_minimized.UseVisualStyleBackColor = true; + this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(21, 19); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(32, 13); + this.label12.TabIndex = 75; + this.label12.Text = "CLI:"; // // drp_Priority // @@ -333,10 +305,12 @@ namespace Handbrake "Normal", "Below Normal", "Low"}); - this.drp_Priority.Location = new System.Drawing.Point(163, 68); + this.drp_Priority.Location = new System.Drawing.Point(177, 72); this.drp_Priority.Name = "drp_Priority"; this.drp_Priority.Size = new System.Drawing.Size(111, 21); this.drp_Priority.TabIndex = 43; + this.ToolTip.SetToolTip(this.drp_Priority, "Set the application priority level for the CLI. \r\nIt\'s best to leave this on Belo" + + "w Normal if you wish to use your system whilst encoding with HandBrake.\r\n"); this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged); // // Label11 @@ -344,11 +318,11 @@ namespace Handbrake this.Label11.AutoSize = true; this.Label11.BackColor = System.Drawing.Color.Transparent; this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label11.Location = new System.Drawing.Point(15, 44); + this.Label11.Location = new System.Drawing.Point(68, 48); this.Label11.Name = "Label11"; - this.Label11.Size = new System.Drawing.Size(142, 13); + this.Label11.Size = new System.Drawing.Size(103, 13); this.Label11.TabIndex = 40; - this.Label11.Text = "Number of processors: "; + this.Label11.Text = "Processor cores:"; // // drp_processors // @@ -365,10 +339,12 @@ namespace Handbrake "6", "7", "8"}); - this.drp_processors.Location = new System.Drawing.Point(163, 41); + this.drp_processors.Location = new System.Drawing.Point(177, 45); this.drp_processors.Name = "drp_processors"; this.drp_processors.Size = new System.Drawing.Size(111, 21); this.drp_processors.TabIndex = 41; + this.ToolTip.SetToolTip(this.drp_processors, "The number of processor\'s / processor cores. Unless your having problems, leave o" + + "n Automatic."); this.drp_processors.SelectedIndexChanged += new System.EventHandler(this.drp_processors_SelectedIndexChanged); // // Label4 @@ -376,11 +352,47 @@ namespace Handbrake this.Label4.AutoSize = true; this.Label4.BackColor = System.Drawing.Color.Transparent; 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(15, 71); + this.Label4.Location = new System.Drawing.Point(68, 75); this.Label4.Name = "Label4"; - this.Label4.Size = new System.Drawing.Size(132, 13); + this.Label4.Size = new System.Drawing.Size(84, 13); this.Label4.TabIndex = 42; - this.Label4.Text = "Default Priority Level:"; + this.Label4.Text = "Priority level:"; + // + // tab_advanced + // + this.tab_advanced.Controls.Add(this.btn_drive_detect); + this.tab_advanced.Controls.Add(this.label6); + this.tab_advanced.Location = new System.Drawing.Point(4, 22); + this.tab_advanced.Name = "tab_advanced"; + this.tab_advanced.Padding = new System.Windows.Forms.Padding(3); + this.tab_advanced.Size = new System.Drawing.Size(482, 252); + this.tab_advanced.TabIndex = 4; + this.tab_advanced.Text = "Advanced"; + this.tab_advanced.UseVisualStyleBackColor = true; + // + // btn_drive_detect + // + this.btn_drive_detect.AutoSize = true; + this.btn_drive_detect.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_drive_detect.Location = new System.Drawing.Point(62, 19); + this.btn_drive_detect.Name = "btn_drive_detect"; + this.btn_drive_detect.Size = new System.Drawing.Size(383, 17); + this.btn_drive_detect.TabIndex = 72; + this.btn_drive_detect.Text = "Enable Drive Detection in the \"Source\" button dropdown menu"; + this.ToolTip.SetToolTip(this.btn_drive_detect, "Enables the Source button\'s ability to detect DVD\'s.\r\nIf this option is enabled, " + + "DVD\'s will be listed in the source menu."); + this.btn_drive_detect.UseVisualStyleBackColor = true; + this.btn_drive_detect.CheckedChanged += new System.EventHandler(this.btn_drive_detect_CheckedChanged); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(21, 19); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(35, 13); + this.label6.TabIndex = 71; + this.label6.Text = "GUI:"; // // label8 // @@ -401,41 +413,16 @@ namespace Handbrake this.pictureBox2.TabIndex = 60; this.pictureBox2.TabStop = false; // - // label7 + // ToolTip // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(50, 39); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(146, 13); - this.label7.TabIndex = 59; - this.label7.Text = "Modify program options."; - // - // check_cli_minimized - // - this.check_cli_minimized.AutoSize = true; - this.check_cli_minimized.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.check_cli_minimized.Location = new System.Drawing.Point(17, 257); - this.check_cli_minimized.Name = "check_cli_minimized"; - this.check_cli_minimized.Size = new System.Drawing.Size(138, 17); - this.check_cli_minimized.TabIndex = 66; - this.check_cli_minimized.Text = "Start CLI Minimized"; - this.check_cli_minimized.UseVisualStyleBackColor = true; - this.check_cli_minimized.CheckedChanged += new System.EventHandler(this.check_cli_minimized_CheckedChanged); - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(14, 235); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(28, 13); - this.label12.TabIndex = 65; - this.label12.Text = "CLI"; + this.ToolTip.Active = false; + this.ToolTip.AutomaticDelay = 1000; + this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info; + this.ToolTip.ToolTipTitle = "Tooltip"; // // frmOptions // - this.ClientSize = new System.Drawing.Size(443, 412); - this.Controls.Add(this.label7); + this.ClientSize = new System.Drawing.Size(521, 374); this.Controls.Add(this.label8); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.tab_options); @@ -451,10 +438,10 @@ namespace Handbrake this.tab_options.ResumeLayout(false); this.tab_general.ResumeLayout(false); this.tab_general.PerformLayout(); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.tab_debug.ResumeLayout(false); - this.tab_debug.PerformLayout(); + this.tab_cli.ResumeLayout(false); + this.tab_cli.PerformLayout(); + this.tab_advanced.ResumeLayout(false); + this.tab_advanced.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -465,33 +452,31 @@ namespace Handbrake internal System.Windows.Forms.Button btn_close; internal System.Windows.Forms.ComboBox drp_completeOption; - internal System.Windows.Forms.Label label5; private System.Windows.Forms.TabControl tab_options; - private System.Windows.Forms.TabPage tab_general; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - internal System.Windows.Forms.CheckBox check_tooltip; - internal System.Windows.Forms.CheckBox check_updateCheck; - internal System.Windows.Forms.CheckBox check_userDefaultSettings; - private System.Windows.Forms.TabPage tab_debug; + private System.Windows.Forms.TabPage tab_cli; private System.Windows.Forms.Label label8; private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.Label label9; - internal System.Windows.Forms.CheckBox check_autoNaming; - private System.Windows.Forms.TextBox text_an_path; - internal System.Windows.Forms.Button btn_browse; - internal System.Windows.Forms.Label label10; + private System.Windows.Forms.TabPage tab_general; private System.Windows.Forms.FolderBrowserDialog pathFinder; - private System.Windows.Forms.Label label3; internal System.Windows.Forms.ComboBox drp_Priority; internal System.Windows.Forms.Label Label11; internal System.Windows.Forms.Label Label4; internal System.Windows.Forms.ComboBox drp_processors; + internal System.Windows.Forms.CheckBox check_tooltip; + internal System.Windows.Forms.CheckBox check_updateCheck; + internal System.Windows.Forms.CheckBox check_userDefaultSettings; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TabPage tab_advanced; internal System.Windows.Forms.CheckBox btn_drive_detect; private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label13; + internal System.Windows.Forms.Button btn_browse; + internal System.Windows.Forms.Label label10; + private System.Windows.Forms.TextBox text_an_path; + internal System.Windows.Forms.CheckBox check_autoNaming; internal System.Windows.Forms.CheckBox check_cli_minimized; private System.Windows.Forms.Label label12; + internal System.Windows.Forms.ToolTip ToolTip; } } \ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index 66e5460d5..a314046e4 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -16,45 +16,41 @@ namespace Handbrake { public partial class frmOptions : Form { + private frmMain mainWindow; /// /// When the form loads, Initialise all the setting components with their correct values /// - public frmOptions() + public frmOptions(frmMain window) { InitializeComponent(); + mainWindow = window; + + // Enable Tooltips. + if (Properties.Settings.Default.tooltipEnable == "Checked") + ToolTip.Active = true; + // Setup Widgets to match settings. if (Properties.Settings.Default.updateStatus == "Checked") - { check_updateCheck.CheckState = CheckState.Checked; - } if (Properties.Settings.Default.defaultSettings == "Checked") - { check_userDefaultSettings.CheckState = CheckState.Checked; - } + drp_processors.Text = Properties.Settings.Default.Processors; drp_Priority.Text = Properties.Settings.Default.processPriority; drp_completeOption.Text = Properties.Settings.Default.CompletionOption; if (Properties.Settings.Default.tooltipEnable == "Checked") - { check_tooltip.CheckState = CheckState.Checked; - } if (Properties.Settings.Default.autoNaming == "Checked") - { check_autoNaming.CheckState = CheckState.Checked; - } if (Properties.Settings.Default.drive_detection == "Checked") - { btn_drive_detect.CheckState = CheckState.Checked; - } if (Properties.Settings.Default.cli_minimized == "Checked") - { check_cli_minimized.CheckState = CheckState.Checked; - } text_an_path.Text = Properties.Settings.Default.autoNamePath; @@ -92,6 +88,16 @@ namespace Handbrake private void check_tooltip_CheckedChanged(object sender, EventArgs e) { Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString(); + if (check_tooltip.Checked) + { + ToolTip.Active = true; + mainWindow.ToolTip.Active = true; + } + else + { + ToolTip.Active = false; + mainWindow.ToolTip.Active = false; + } } private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e) @@ -132,5 +138,6 @@ namespace Handbrake } #endregion + } } \ No newline at end of file diff --git a/win/C#/frmOptions.resx b/win/C#/frmOptions.resx index 49352476c..74bf18620 100644 --- a/win/C#/frmOptions.resx +++ b/win/C#/frmOptions.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 132, 18 + 17, 17 -- 2.40.0