From be95c10e99bba8e2799edec44ac39ee2cf10bdaf Mon Sep 17 00:00:00 2001 From: codeimp Date: Wed, 31 Oct 2007 21:57:49 +0000 Subject: [PATCH] better things icon, example things filter in toolbar --- Resources/Filter.png | Bin 0 -> 405 bytes Resources/Icons/Filter.png | Bin 0 -> 481 bytes Resources/Icons/ThingsMode.png | Bin 906 -> 938 bytes Source/Builder.csproj | 1 + Source/Interface/MainForm.Designer.cs | 62 +++++++++++++++++++----- Source/Properties/Resources.Designer.cs | 7 +++ Source/Properties/Resources.resx | 3 ++ Source/Resources/Filter.png | Bin 0 -> 481 bytes 8 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 Resources/Filter.png create mode 100644 Resources/Icons/Filter.png create mode 100644 Source/Resources/Filter.png diff --git a/Resources/Filter.png b/Resources/Filter.png new file mode 100644 index 0000000000000000000000000000000000000000..b0129d55c62e4278447749cc7b1bff636a9f98a1 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMkYI^x zM2T~LZf{eAP&))})#g%fF{lSy|Jr7MQW^TIqf$?I| zqqk=KjVhi2(^OyWa=Tudaa+vy@`6=bG3&!cTpJ&Mydm7CXmkE>)>b8-%Pp%`)h3k9 zUaq^#ea4)F*DB{duCe>?u}h>Sc+wLsDqB2iKzWc|%{E213 zYIKq!#l*T<6=Vcbl9Nd_hyYs`3t3UA22IDsdcz)^5{I%o5yvf x*Eu+O1SKne#oNTD1-H+gb~C|c?t<&{{5`X$b{MbzrU(pD22WQ%mvv4FO#lX1s=fdK literal 0 HcmV?d00001 diff --git a/Resources/Icons/Filter.png b/Resources/Icons/Filter.png new file mode 100644 index 0000000000000000000000000000000000000000..334c89b0a3ae3dbb7ddab713ccbb238d7db6b1c8 GIT binary patch literal 481 zcmV<70UrK|P)pF33NqRbVF}#ZDnqB004<9jRpV!0e(qDK~#90-BCYl!f+5Z8WL1Q z(H7#Mpa@34L9xZpASHr}i#j;Cb}!QJAg0B^MFepbL;?;@B9bgtaB*-dsdRAc>-~OU zp|$_A_Q7$tym#;3xm^DSNTpIxRTY^`hWB(j%`2Hq@=7EUh{xlI#bQtt1s;zFvMk>o z1)ds>25j5L;c&oyzsGL3!)CL=a=FBOK8Il#7!HT%bUG-NN{}Q8!C>%)v)yj@H8s0l zuVcI2V!d9&G)*iP3(RISjK^d2`+exT4o%Y_isGx^@7KfOu=0L`AP5?@=US}>%d#+? zPBEEGFdB_Gx!rDaGPCaWdha8V$T`g)gCHkG=A>LMbK+nyK(E(3+04i^3ty&rbW$i3 z(Cv27YPC)_6Zz+tkVui-yi}`IG@DI?LLo+eAoAI_o4GJt}VjvKZSrH_s4*rBU XMp(DLU%$Y|00000NkvXXu0mjf<#W>N literal 0 HcmV?d00001 diff --git a/Resources/Icons/ThingsMode.png b/Resources/Icons/ThingsMode.png index 70773256025036ce84ab9ffcf42962c403c9ff09..2bfc8a8fe187bf7b4240c03d436c7cfc6135f6c4 100644 GIT binary patch delta 873 zcmV-v1D5=X2dW2LD6uwlGJa4Lr32#q>2Q7bY{r_QPr%dOl3f^LpEm0(m7Gbe7$WKl9@ z6tKUY?VWv_@o@RNuuYZof~LfK7-ymqW#ba8vf6)5h3&7F|b0_F>&x8qJevg#{(g`vDl zh4saCLftvt?GsiBm-gT~-Uo+nK-sSnz680R=VaA;S$W}K63>m2 zg=hT+%I@2*P=9;+4(z)I+kb@oj&VL|8YZV=9wJW2(z?irc9g00?Sqc0s>Sx{?rppKm0?~p}Q>2KdzXDi_8Xen>t|k zRrt7ZgtXc*-m(46D^sSbyDEBJXD0EyS87x>i8=OwxAIRY|Du%yy4+USb{W=ryja}h zgrskqgnt#i`q~UM3Arql$1+q85OefCZ*H>t4c5BH#hQ9p-v*ftW0)O-1kIj12`ht} zzBqzK*1f#D{~E^c9}{WoVez`J{RXR@PeiJ7sNdomM!q_i9#XoVaf_RewJq{`3&qqKmw}^(^w$sZfG*SnVrk zH^`oLZyO6g+{r?{MY+Z~!d!h%BpvP(DV5jTqQ2?H@ZF#~X$3Gk9;=FzR~Kvl9o?R0 zLb7)e9Ffwh##aoIj`Rsr#V^8G-YJsH+q+j3H_L@BXm@)E-`T*jBDWfO$)^#-Wb0*?tmjf^Q>Wxa^HF9`F|0s}tW4-3r8%{IyT7YR9r$wL zazEemJ(oj~m7s_U3-NPI;Y{n8LMxyQHXuTww~$=-ljOx8NPkiIn*25G=wgCqkfS7xLqI9U!r?_{McYZrbRE-?=K3YM%bGX4mN(N`N zL4UaeIQtyPddlGYKy1x#L{*v*T>1A68S#p!07V(0)U*SIFM)(6 z7P;Dt)!J@&oirh+WDsi%zu~s;BCM^g;hds}@AdBp&TUK`HDC#1YVfAu1#p7Ryz`zJ z5k?D^?!JWSPJWP=1CF~iU{7JcY6GO&FI>KPZN2Qyj(^rOgPnDN`WX;cZ$VgDKl`vj z%y3a)qKysah9$zv%8J86XW6YE+`udMsbK0%kyY3hUk{|U0$YuP2rVCmhx!pFOq|5K z3YzJvfPaaZX^5LhuYH9_HaAcT3AV)60!hulmKrm{3?rBqo-_^%nmol0BEMKHVPi>( zx>zKdmvw^^574*BT@`2FA6#eWyxVp)<7i~KjLnSm=Qin=J^Tn7be zo|!!J+9A2p!+)9sY*sD?`dsaWSn~?bhe`za5${ekjRMYhkSzZ(NmUIbSJgGGIBtT+ zsaAOAckrl!R_46G@?$1A#$OQNhhwlaUnE&>D@oP&Nphlwyi?045O)TPV^wenjqhe~_J6QYQgstaGHXekes}y%Bof)OW9iuAf91|(Pyf^({g4=o T?Q}cd00000NkvXXu0mjf&lH~F diff --git a/Source/Builder.csproj b/Source/Builder.csproj index 79ab1ce9..cf7615b9 100644 --- a/Source/Builder.csproj +++ b/Source/Builder.csproj @@ -264,6 +264,7 @@ + diff --git a/Source/Interface/MainForm.Designer.cs b/Source/Interface/MainForm.Designer.cs index 594d7816..67261773 100644 --- a/Source/Interface/MainForm.Designer.cs +++ b/Source/Interface/MainForm.Designer.cs @@ -70,6 +70,10 @@ namespace CodeImp.DoomBuilder.Interface this.buttonlinedefsmode = new System.Windows.Forms.ToolStripButton(); this.buttonsectorsmode = new System.Windows.Forms.ToolStripButton(); this.buttonthingsmode = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.buttonthingsfilter = new System.Windows.Forms.ToolStripButton(); + this.thingfilters = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.statusbar = new System.Windows.Forms.StatusStrip(); this.statuslabel = new System.Windows.Forms.ToolStripStatusLabel(); this.zoomlabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -91,7 +95,6 @@ namespace CodeImp.DoomBuilder.Interface this.linedefinfo = new CodeImp.DoomBuilder.Interface.LinedefInfoPanel(); this.redrawtimer = new System.Windows.Forms.Timer(this.components); this.display = new CodeImp.DoomBuilder.Interface.RenderTargetControl(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); @@ -358,7 +361,10 @@ namespace CodeImp.DoomBuilder.Interface this.buttonlinedefsmode, this.buttonsectorsmode, this.buttonthingsmode, - this.toolStripSeparator7}); + this.toolStripSeparator7, + this.buttonthingsfilter, + this.thingfilters, + this.toolStripSeparator8}); this.toolbar.Location = new System.Drawing.Point(0, 24); this.toolbar.Name = "toolbar"; this.toolbar.Size = new System.Drawing.Size(839, 25); @@ -464,6 +470,42 @@ namespace CodeImp.DoomBuilder.Interface this.buttonthingsmode.Text = "Things Mode"; this.buttonthingsmode.Click += new System.EventHandler(this.InvokeTaggedAction); // + // toolStripSeparator7 + // + this.toolStripSeparator7.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25); + // + // buttonthingsfilter + // + this.buttonthingsfilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonthingsfilter.Enabled = false; + this.buttonthingsfilter.Image = global::CodeImp.DoomBuilder.Properties.Resources.Filter; + this.buttonthingsfilter.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonthingsfilter.Name = "buttonthingsfilter"; + this.buttonthingsfilter.Size = new System.Drawing.Size(23, 22); + this.buttonthingsfilter.Text = "Configure Things Filters"; + // + // thingfilters + // + this.thingfilters.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.thingfilters.Enabled = false; + this.thingfilters.Items.AddRange(new object[] { + "(none)", + "(custom)", + "Easy skill items only", + "Medium skill items only", + "Hard skill items only"}); + this.thingfilters.Name = "thingfilters"; + this.thingfilters.Size = new System.Drawing.Size(130, 25); + this.thingfilters.ToolTipText = "Things Filter"; + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(6, 25); + // // statusbar // this.statusbar.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -668,22 +710,15 @@ namespace CodeImp.DoomBuilder.Interface this.display.Name = "display"; this.display.Size = new System.Drawing.Size(839, 367); this.display.TabIndex = 5; - this.display.TabStop = false; this.display.MouseLeave += new System.EventHandler(this.display_MouseLeave); this.display.MouseDown += new System.Windows.Forms.MouseEventHandler(this.display_MouseDown); this.display.MouseMove += new System.Windows.Forms.MouseEventHandler(this.display_MouseMove); - this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint); + this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick); this.display.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseDoubleClick); this.display.Resize += new System.EventHandler(this.display_Resize); - this.display.MouseClick += new System.Windows.Forms.MouseEventHandler(this.display_MouseClick); - this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp); this.display.MouseEnter += new System.EventHandler(this.display_MouseEnter); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(6, 25); + this.display.Paint += new System.Windows.Forms.PaintEventHandler(this.display_Paint); + this.display.MouseUp += new System.Windows.Forms.MouseEventHandler(this.display_MouseUp); // // MainForm // @@ -778,5 +813,8 @@ namespace CodeImp.DoomBuilder.Interface private SectorInfoPanel sectorinfo; private ThingInfoPanel thinginfo; private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; + private System.Windows.Forms.ToolStripButton buttonthingsfilter; + private System.Windows.Forms.ToolStripComboBox thingfilters; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; } } \ No newline at end of file diff --git a/Source/Properties/Resources.Designer.cs b/Source/Properties/Resources.Designer.cs index e872005d..345dd71f 100644 --- a/Source/Properties/Resources.Designer.cs +++ b/Source/Properties/Resources.Designer.cs @@ -74,6 +74,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap Filter { + get { + object obj = ResourceManager.GetObject("Filter", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap LinesMode { get { object obj = ResourceManager.GetObject("LinesMode", resourceCulture); diff --git a/Source/Properties/Resources.resx b/Source/Properties/Resources.resx index a4350dbd..87ed9287 100644 --- a/Source/Properties/Resources.resx +++ b/Source/Properties/Resources.resx @@ -169,4 +169,7 @@ ..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Source/Resources/Filter.png b/Source/Resources/Filter.png new file mode 100644 index 0000000000000000000000000000000000000000..334c89b0a3ae3dbb7ddab713ccbb238d7db6b1c8 GIT binary patch literal 481 zcmV<70UrK|P)pF33NqRbVF}#ZDnqB004<9jRpV!0e(qDK~#90-BCYl!f+5Z8WL1Q z(H7#Mpa@34L9xZpASHr}i#j;Cb}!QJAg0B^MFepbL;?;@B9bgtaB*-dsdRAc>-~OU zp|$_A_Q7$tym#;3xm^DSNTpIxRTY^`hWB(j%`2Hq@=7EUh{xlI#bQtt1s;zFvMk>o z1)ds>25j5L;c&oyzsGL3!)CL=a=FBOK8Il#7!HT%bUG-NN{}Q8!C>%)v)yj@H8s0l zuVcI2V!d9&G)*iP3(RISjK^d2`+exT4o%Y_isGx^@7KfOu=0L`AP5?@=US}>%d#+? zPBEEGFdB_Gx!rDaGPCaWdha8V$T`g)gCHkG=A>LMbK+nyK(E(3+04i^3ty&rbW$i3 z(Cv27YPC)_6Zz+tkVui-yi}`IG@DI?LLo+eAoAI_o4GJt}VjvKZSrH_s4*rBU XMp(DLU%$Y|00000NkvXXu0mjf<#W>N literal 0 HcmV?d00001