mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2025-01-31 04:40:55 +00:00
small user-interface improvements regarding texture sets and texture browsers
This commit is contained in:
parent
8702f7c60c
commit
6d6b594c24
22 changed files with 336 additions and 100 deletions
8
Documents/credits.txt
Normal file
8
Documents/credits.txt
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
|
||||||
|
- Thomas van der Velden
|
||||||
|
Logo art
|
||||||
|
|
||||||
|
- Agent Spork
|
||||||
|
Texture Sets?
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
- Make sector gradient features
|
- Make sector gradient features
|
||||||
|
|
||||||
- Make textureset filters
|
|
||||||
|
|
||||||
- Make error checking feature
|
- Make error checking feature
|
||||||
|
|
||||||
- Make quick sector draw (square/circle) mode
|
- Make quick sector draw (square/circle) mode
|
||||||
|
|
BIN
Resources/Icons/KnownTextureSet.ico
Normal file
BIN
Resources/Icons/KnownTextureSet.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
BIN
Resources/Icons/KnownTextureSet.png
Normal file
BIN
Resources/Icons/KnownTextureSet.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 476 B |
BIN
Resources/Icons/KnownTextureSet2.ico
Normal file
BIN
Resources/Icons/KnownTextureSet2.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
BIN
Resources/Icons/OthersTextureSet.ico
Normal file
BIN
Resources/Icons/OthersTextureSet.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
BIN
Resources/Icons/OthersTextureSet2.ico
Normal file
BIN
Resources/Icons/OthersTextureSet2.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
|
@ -611,6 +611,7 @@
|
||||||
<None Include="Resources\Copy.png" />
|
<None Include="Resources\Copy.png" />
|
||||||
<None Include="Resources\Cut.png" />
|
<None Include="Resources\Cut.png" />
|
||||||
<Content Include="Resources\DB2.ico" />
|
<Content Include="Resources\DB2.ico" />
|
||||||
|
<None Include="Resources\KnownTextureSet.png" />
|
||||||
<EmbeddedResource Include="Resources\Hourglass3D.png" />
|
<EmbeddedResource Include="Resources\Hourglass3D.png" />
|
||||||
<None Include="Resources\Failed.png" />
|
<None Include="Resources\Failed.png" />
|
||||||
<None Include="Resources\Monster2.png" />
|
<None Include="Resources\Monster2.png" />
|
||||||
|
|
7
Source/Properties/Resources.Designer.cs
generated
7
Source/Properties/Resources.Designer.cs
generated
|
@ -137,6 +137,13 @@ namespace CodeImp.DoomBuilder.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static System.Drawing.Bitmap KnownTextureSet {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("KnownTextureSet", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal static System.Drawing.Bitmap mergegeometry {
|
internal static System.Drawing.Bitmap mergegeometry {
|
||||||
get {
|
get {
|
||||||
object obj = ResourceManager.GetObject("mergegeometry", resourceCulture);
|
object obj = ResourceManager.GetObject("mergegeometry", resourceCulture);
|
||||||
|
|
|
@ -118,77 +118,26 @@
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
|
||||||
<data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="MissingTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
</data>
|
||||||
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Status0" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Status0.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="NewMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="UnknownImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\NewMap2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\UnknownImage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
|
||||||
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="WarningOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Grid2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Grid2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
</data>
|
||||||
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="SaveMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Redo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Status2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Status2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
@ -196,31 +145,85 @@
|
||||||
<data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Splash3_trans" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="UnknownImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\UnknownImage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="mergegeometry2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Status1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Status1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
|
||||||
<value>..\Resources\Cut.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
|
||||||
</data>
|
|
||||||
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Zoom_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Zoom_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="OpenMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="treeview" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\treeview.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Monster2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Monster2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Monster2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Monster2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\NewMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="mergegeometry" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\mergegeometry.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="NewMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\NewMap2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Grid2_arrowup" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Grid2_arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="SaveMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\SaveMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
<data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="Failed" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\Failed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\Failed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="MissingTexture" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Zoom.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Test.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="SlimDX_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="WarningOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Splash3_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="mergegeometry2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="ColorPick" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Filter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Grid4" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="OpenMap" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="Warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
|
<data name="KnownTextureSet" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
BIN
Source/Resources/KnownTextureSet.png
Normal file
BIN
Source/Resources/KnownTextureSet.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 476 B |
12
Source/Windows/ConfigForm.Designer.cs
generated
12
Source/Windows/ConfigForm.Designer.cs
generated
|
@ -28,6 +28,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
|
this.components = new System.ComponentModel.Container();
|
||||||
System.Windows.Forms.Label label5;
|
System.Windows.Forms.Label label5;
|
||||||
System.Windows.Forms.Label label6;
|
System.Windows.Forms.Label label6;
|
||||||
System.Windows.Forms.Label label3;
|
System.Windows.Forms.Label label3;
|
||||||
|
@ -58,6 +59,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.testapplication = new System.Windows.Forms.TextBox();
|
this.testapplication = new System.Windows.Forms.TextBox();
|
||||||
this.tabtextures = new System.Windows.Forms.TabPage();
|
this.tabtextures = new System.Windows.Forms.TabPage();
|
||||||
this.listtextures = new System.Windows.Forms.ListView();
|
this.listtextures = new System.Windows.Forms.ListView();
|
||||||
|
this.smallimages = new System.Windows.Forms.ImageList(this.components);
|
||||||
this.restoretexturesets = new System.Windows.Forms.Button();
|
this.restoretexturesets = new System.Windows.Forms.Button();
|
||||||
this.edittextureset = new System.Windows.Forms.Button();
|
this.edittextureset = new System.Windows.Forms.Button();
|
||||||
this.pastetexturesets = new System.Windows.Forms.Button();
|
this.pastetexturesets = new System.Windows.Forms.Button();
|
||||||
|
@ -436,12 +438,19 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.listtextures.Name = "listtextures";
|
this.listtextures.Name = "listtextures";
|
||||||
this.listtextures.ShowGroups = false;
|
this.listtextures.ShowGroups = false;
|
||||||
this.listtextures.Size = new System.Drawing.Size(382, 147);
|
this.listtextures.Size = new System.Drawing.Size(382, 147);
|
||||||
|
this.listtextures.SmallImageList = this.smallimages;
|
||||||
this.listtextures.Sorting = System.Windows.Forms.SortOrder.Ascending;
|
this.listtextures.Sorting = System.Windows.Forms.SortOrder.Ascending;
|
||||||
this.listtextures.TabIndex = 32;
|
this.listtextures.TabIndex = 32;
|
||||||
this.listtextures.UseCompatibleStateImageBehavior = false;
|
this.listtextures.UseCompatibleStateImageBehavior = false;
|
||||||
this.listtextures.View = System.Windows.Forms.View.List;
|
this.listtextures.View = System.Windows.Forms.View.List;
|
||||||
this.listtextures.SelectedIndexChanged += new System.EventHandler(this.listtextures_SelectedIndexChanged);
|
|
||||||
this.listtextures.DoubleClick += new System.EventHandler(this.listtextures_DoubleClick);
|
this.listtextures.DoubleClick += new System.EventHandler(this.listtextures_DoubleClick);
|
||||||
|
this.listtextures.SelectedIndexChanged += new System.EventHandler(this.listtextures_SelectedIndexChanged);
|
||||||
|
//
|
||||||
|
// smallimages
|
||||||
|
//
|
||||||
|
this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
|
||||||
|
this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
|
||||||
|
this.smallimages.Images.SetKeyName(0, "KnownTextureSet.ico");
|
||||||
//
|
//
|
||||||
// restoretexturesets
|
// restoretexturesets
|
||||||
//
|
//
|
||||||
|
@ -600,5 +609,6 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
private System.Windows.Forms.Button copytexturesets;
|
private System.Windows.Forms.Button copytexturesets;
|
||||||
private System.Windows.Forms.Button removetextureset;
|
private System.Windows.Forms.Button removetextureset;
|
||||||
private System.Windows.Forms.ListView listtextures;
|
private System.Windows.Forms.ListView listtextures;
|
||||||
|
private System.Windows.Forms.ImageList smallimages;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -151,6 +151,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
{
|
{
|
||||||
ListViewItem item = listtextures.Items.Add(ts.Name);
|
ListViewItem item = listtextures.Items.Add(ts.Name);
|
||||||
item.Tag = ts;
|
item.Tag = ts;
|
||||||
|
item.ImageIndex = 0;
|
||||||
}
|
}
|
||||||
listtextures.Sort();
|
listtextures.Sort();
|
||||||
}
|
}
|
||||||
|
@ -357,6 +358,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
configinfo.TextureSets.Add(s);
|
configinfo.TextureSets.Add(s);
|
||||||
ListViewItem item = listtextures.Items.Add(s.Name);
|
ListViewItem item = listtextures.Items.Add(s.Name);
|
||||||
item.Tag = s;
|
item.Tag = s;
|
||||||
|
item.ImageIndex = 0;
|
||||||
listtextures.Sort();
|
listtextures.Sort();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -429,6 +431,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
DefinedTextureSet s = ts.Copy();
|
DefinedTextureSet s = ts.Copy();
|
||||||
ListViewItem item = listtextures.Items.Add(s.Name);
|
ListViewItem item = listtextures.Items.Add(s.Name);
|
||||||
item.Tag = s;
|
item.Tag = s;
|
||||||
|
item.ImageIndex = 0;
|
||||||
configinfo.TextureSets.Add(s);
|
configinfo.TextureSets.Add(s);
|
||||||
}
|
}
|
||||||
listtextures.Sort();
|
listtextures.Sort();
|
||||||
|
@ -448,6 +451,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
DefinedTextureSet s = ts.Copy();
|
DefinedTextureSet s = ts.Copy();
|
||||||
ListViewItem item = listtextures.Items.Add(s.Name);
|
ListViewItem item = listtextures.Items.Add(s.Name);
|
||||||
item.Tag = s;
|
item.Tag = s;
|
||||||
|
item.ImageIndex = 0;
|
||||||
configinfo.TextureSets.Add(s);
|
configinfo.TextureSets.Add(s);
|
||||||
}
|
}
|
||||||
listtextures.Sort();
|
listtextures.Sort();
|
||||||
|
|
|
@ -234,6 +234,52 @@
|
||||||
<metadata name="tabtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="tabtextures.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>159, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>
|
||||||
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
|
||||||
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABA
|
||||||
|
CAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARMBAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
|
||||||
|
AUwDAAEQAwABAQEAAQgFAAHAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
|
AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
|
||||||
|
AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
|
||||||
|
AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
|
||||||
|
ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
|
||||||
|
AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
|
||||||
|
AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
|
||||||
|
AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
|
||||||
|
AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
|
||||||
|
AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
|
||||||
|
AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
|
||||||
|
AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
|
||||||
|
AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
|
||||||
|
ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
|
||||||
|
Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
|
||||||
|
AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
|
||||||
|
AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
|
||||||
|
AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
|
||||||
|
ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
|
||||||
|
Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
|
||||||
|
AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
|
||||||
|
AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
|
||||||
|
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
|
||||||
|
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
|
||||||
|
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
|
||||||
|
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/5sAAfcCrgFtAWwB6gJs
|
||||||
|
BGZAAAH3A/8C9QL0AxkBZkAAAbUC/wKTAZkBBwG7AbQCGQNmPgABtQL/AZMBmgF6AZ8BngG7AfQB8wFm
|
||||||
|
ARkBZj4AAbUC/wG7AQgCnwF+AXkC9AFsARkDZjwAAbUC/wLbAQkBCAF+AXkB9QH0AWwB8wFmARkBZjwA
|
||||||
|
AQcI/wL1AWwB9AFsARkBZjwAAgcEtQH3AbUC7QKRAfQBbAHzAWY+AAEHCP8C9QFsAfQBbD4AAgcEtQH3
|
||||||
|
AbUC7QKRAfQBbEAAAQcI/wL1AWxAAAIHBLUB9wG1Au0CkdIAAUIBTQE+BwABPgMAASgDAAFMAwABEAMA
|
||||||
|
AQEBAAEBBQABwBcAA/8BAAL/AeAJAAL/AeAJAAHAAQMB4AkAAcABAwHgCQABwAEAAeAJAAHAAQAB4AkA
|
||||||
|
AcABAAEgCQABwAEAASAJAAHAAQABIAkAAcABAAEgCQAB8AEAASAJAAHwAQABIAkAAfwBAAEgCQAB/AEA
|
||||||
|
ASAJAAL/AeAJAAL/AeAJAAs=
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
<metadata name="restoretexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="restoretexturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
27
Source/Windows/FlatBrowserForm.Designer.cs
generated
27
Source/Windows/FlatBrowserForm.Designer.cs
generated
|
@ -28,11 +28,14 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
|
this.components = new System.ComponentModel.Container();
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FlatBrowserForm));
|
||||||
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
||||||
this.cancel = new System.Windows.Forms.Button();
|
this.cancel = new System.Windows.Forms.Button();
|
||||||
this.apply = new System.Windows.Forms.Button();
|
this.apply = new System.Windows.Forms.Button();
|
||||||
this.texturesets = new System.Windows.Forms.ListView();
|
this.texturesets = new System.Windows.Forms.ListView();
|
||||||
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
|
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
|
||||||
|
this.smallimages = new System.Windows.Forms.ImageList(this.components);
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// browser
|
// browser
|
||||||
|
@ -43,10 +46,10 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.browser.HideInputBox = false;
|
this.browser.HideInputBox = false;
|
||||||
this.browser.LabelText = "Select or enter a flat name:";
|
this.browser.LabelText = "Select or enter a flat name:";
|
||||||
this.browser.Location = new System.Drawing.Point(187, 9);
|
this.browser.Location = new System.Drawing.Point(197, 9);
|
||||||
this.browser.Name = "browser";
|
this.browser.Name = "browser";
|
||||||
this.browser.PreventSelection = false;
|
this.browser.PreventSelection = false;
|
||||||
this.browser.Size = new System.Drawing.Size(589, 510);
|
this.browser.Size = new System.Drawing.Size(590, 510);
|
||||||
this.browser.TabIndex = 0;
|
this.browser.TabIndex = 0;
|
||||||
this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
|
this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
|
||||||
//
|
//
|
||||||
|
@ -54,7 +57,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||||
this.cancel.Location = new System.Drawing.Point(676, 496);
|
this.cancel.Location = new System.Drawing.Point(687, 496);
|
||||||
this.cancel.Name = "cancel";
|
this.cancel.Name = "cancel";
|
||||||
this.cancel.Size = new System.Drawing.Size(100, 25);
|
this.cancel.Size = new System.Drawing.Size(100, 25);
|
||||||
this.cancel.TabIndex = 22;
|
this.cancel.TabIndex = 22;
|
||||||
|
@ -65,7 +68,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// apply
|
// apply
|
||||||
//
|
//
|
||||||
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.apply.Location = new System.Drawing.Point(570, 496);
|
this.apply.Location = new System.Drawing.Point(581, 496);
|
||||||
this.apply.Name = "apply";
|
this.apply.Name = "apply";
|
||||||
this.apply.Size = new System.Drawing.Size(100, 25);
|
this.apply.Size = new System.Drawing.Size(100, 25);
|
||||||
this.apply.TabIndex = 21;
|
this.apply.TabIndex = 21;
|
||||||
|
@ -79,13 +82,15 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
| System.Windows.Forms.AnchorStyles.Left)));
|
| System.Windows.Forms.AnchorStyles.Left)));
|
||||||
this.texturesets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
this.texturesets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||||
this.columnHeader1});
|
this.columnHeader1});
|
||||||
|
this.texturesets.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.texturesets.FullRowSelect = true;
|
this.texturesets.FullRowSelect = true;
|
||||||
this.texturesets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
this.texturesets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||||
this.texturesets.HideSelection = false;
|
this.texturesets.HideSelection = false;
|
||||||
this.texturesets.Location = new System.Drawing.Point(12, 9);
|
this.texturesets.Location = new System.Drawing.Point(12, 9);
|
||||||
this.texturesets.MultiSelect = false;
|
this.texturesets.MultiSelect = false;
|
||||||
this.texturesets.Name = "texturesets";
|
this.texturesets.Name = "texturesets";
|
||||||
this.texturesets.Size = new System.Drawing.Size(166, 476);
|
this.texturesets.Size = new System.Drawing.Size(176, 476);
|
||||||
|
this.texturesets.SmallImageList = this.smallimages;
|
||||||
this.texturesets.TabIndex = 24;
|
this.texturesets.TabIndex = 24;
|
||||||
this.texturesets.UseCompatibleStateImageBehavior = false;
|
this.texturesets.UseCompatibleStateImageBehavior = false;
|
||||||
this.texturesets.View = System.Windows.Forms.View.Details;
|
this.texturesets.View = System.Windows.Forms.View.Details;
|
||||||
|
@ -94,14 +99,21 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// columnHeader1
|
// columnHeader1
|
||||||
//
|
//
|
||||||
this.columnHeader1.Text = "Name";
|
this.columnHeader1.Text = "Name";
|
||||||
this.columnHeader1.Width = 141;
|
this.columnHeader1.Width = 152;
|
||||||
|
//
|
||||||
|
// smallimages
|
||||||
|
//
|
||||||
|
this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
|
||||||
|
this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
|
||||||
|
this.smallimages.Images.SetKeyName(0, "KnownTextureSet2.ico");
|
||||||
|
this.smallimages.Images.SetKeyName(1, "OthersTextureSet2.ico");
|
||||||
//
|
//
|
||||||
// FlatBrowserForm
|
// FlatBrowserForm
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.apply;
|
this.AcceptButton = this.apply;
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.CancelButton = this.cancel;
|
this.CancelButton = this.cancel;
|
||||||
this.ClientSize = new System.Drawing.Size(788, 531);
|
this.ClientSize = new System.Drawing.Size(799, 531);
|
||||||
this.Controls.Add(this.texturesets);
|
this.Controls.Add(this.texturesets);
|
||||||
this.Controls.Add(this.cancel);
|
this.Controls.Add(this.cancel);
|
||||||
this.Controls.Add(this.apply);
|
this.Controls.Add(this.apply);
|
||||||
|
@ -132,5 +144,6 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
private System.Windows.Forms.Button apply;
|
private System.Windows.Forms.Button apply;
|
||||||
private System.Windows.Forms.ListView texturesets;
|
private System.Windows.Forms.ListView texturesets;
|
||||||
private System.Windows.Forms.ColumnHeader columnHeader1;
|
private System.Windows.Forms.ColumnHeader columnHeader1;
|
||||||
|
private System.Windows.Forms.ImageList smallimages;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -64,12 +64,14 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
{
|
{
|
||||||
item = texturesets.Items.Add(ts.Name);
|
item = texturesets.Items.Add(ts.Name);
|
||||||
item.Tag = ts;
|
item.Tag = ts;
|
||||||
|
item.ImageIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort and add other textures set
|
// Sort and add other textures set
|
||||||
texturesets.Sort();
|
texturesets.Sort();
|
||||||
item = texturesets.Items.Add(General.Map.Data.OthersTextureSet.Name);
|
item = texturesets.Items.Add(General.Map.Data.OthersTextureSet.Name);
|
||||||
item.Tag = General.Map.Data.OthersTextureSet;
|
item.Tag = General.Map.Data.OthersTextureSet;
|
||||||
|
item.ImageIndex = 1;
|
||||||
|
|
||||||
// Select the last one that was selected
|
// Select the last one that was selected
|
||||||
string selectname = General.Settings.ReadSetting("browserwindow.flatstextureset", "");
|
string selectname = General.Settings.ReadSetting("browserwindow.flatstextureset", "");
|
||||||
|
|
|
@ -129,6 +129,55 @@
|
||||||
<metadata name="texturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="texturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>
|
||||||
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
|
||||||
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
|
||||||
|
CQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
|
AwABQAMAARYDAAEBAQABCAUAAYABBRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
|
||||||
|
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
|
||||||
|
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
|
||||||
|
AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
|
||||||
|
AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
|
||||||
|
AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
|
||||||
|
AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
|
||||||
|
ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
|
||||||
|
AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
|
||||||
|
AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
|
||||||
|
AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
|
||||||
|
AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
|
||||||
|
AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
|
||||||
|
Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
|
||||||
|
AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
|
||||||
|
AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
|
||||||
|
ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
|
||||||
|
ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
|
||||||
|
AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
|
||||||
|
AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
|
||||||
|
AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
|
||||||
|
AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
|
||||||
|
AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
|
||||||
|
AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
|
||||||
|
AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
|
||||||
|
ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
|
||||||
|
AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
|
||||||
|
AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP//wBCAAH3Aq4BbQFs
|
||||||
|
AeoCbARmBAAB9wKuAW0BbAHqAmwEZiQAAfcD/wL1AvQDGQFmBAAB9wT/AQkBzwLzAhkBZiQAAbUC/wKT
|
||||||
|
AZkBBwG7AbQCGQNmAgABtQT/AfQB3QH1AvMBGQNmIgABtQL/AZMBmgF6AZ8BngG7AfQB8wFmARkBZgIA
|
||||||
|
AbUE/wH0Aa0B9QHzAfQB8wFmARkBZiIAAbUC/wG7AQgCnwF+AXkC9AFsARkDZgG1Bf8BCQHPA/QBbAEZ
|
||||||
|
A2YgAAG1Av8C2wEJAQgBfgF5AfUB9AFsAfMBZgEZAWYBtQP/AQkBGQH/AbQBGQH1AfQBbAHzAWYBGQFm
|
||||||
|
IAABBwj/AvUBbAH0AWwBGQFmAQcD/wHdArQB3QH/AvUBbAH0AWwBGQFmIAACBwS1AfcBtQLtApEB9AFs
|
||||||
|
AfMBZgIHBLUB9wG1Au0CkQH0AWwB8wFmIgABBwj/AvUBbAH0AWwCAAEHCP8C9QFsAfQBbCIAAgcEtQH3
|
||||||
|
AbUC7QKRAfQBbAIAAgcEtQH3AbUC7QKRAfQBbCQAAQcI/wL1AWwEAAEHCP8C9QFsJAACBwS1AfcBtQLt
|
||||||
|
ApEEAAIHBLUB9wG1Au0Ckf8AYQABQgFNAT4HAAE+AwABKAMAAUADAAEWAwABAQEAAQEFAAGwFwAD/wEA
|
||||||
|
BP8EAAT/BAAE/wQABP8EAAT/BQABDwEAAQ8FAAEPAQABDwUAAQMBAAEDBQABAwEAAQMkAAHAAQABwAUA
|
||||||
|
AcABAAHABQAB8AEAAfAFAAHwAQAB8AUABP8EAAT/BAAE/wQABP8EAAT/BAAL
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
27
Source/Windows/TextureBrowserForm.Designer.cs
generated
27
Source/Windows/TextureBrowserForm.Designer.cs
generated
|
@ -28,11 +28,14 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
|
this.components = new System.ComponentModel.Container();
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TextureBrowserForm));
|
||||||
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
this.browser = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
||||||
this.cancel = new System.Windows.Forms.Button();
|
this.cancel = new System.Windows.Forms.Button();
|
||||||
this.apply = new System.Windows.Forms.Button();
|
this.apply = new System.Windows.Forms.Button();
|
||||||
this.texturesets = new System.Windows.Forms.ListView();
|
this.texturesets = new System.Windows.Forms.ListView();
|
||||||
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
|
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
|
||||||
|
this.smallimages = new System.Windows.Forms.ImageList(this.components);
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// browser
|
// browser
|
||||||
|
@ -43,10 +46,10 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.browser.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.browser.HideInputBox = false;
|
this.browser.HideInputBox = false;
|
||||||
this.browser.LabelText = "Select or enter a texture name:";
|
this.browser.LabelText = "Select or enter a texture name:";
|
||||||
this.browser.Location = new System.Drawing.Point(187, 9);
|
this.browser.Location = new System.Drawing.Point(197, 9);
|
||||||
this.browser.Name = "browser";
|
this.browser.Name = "browser";
|
||||||
this.browser.PreventSelection = false;
|
this.browser.PreventSelection = false;
|
||||||
this.browser.Size = new System.Drawing.Size(589, 510);
|
this.browser.Size = new System.Drawing.Size(590, 510);
|
||||||
this.browser.TabIndex = 0;
|
this.browser.TabIndex = 0;
|
||||||
this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
|
this.browser.SelectedItemChanged += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemChangedDelegate(this.browser_SelectedItemChanged);
|
||||||
//
|
//
|
||||||
|
@ -54,7 +57,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||||
this.cancel.Location = new System.Drawing.Point(676, 496);
|
this.cancel.Location = new System.Drawing.Point(687, 496);
|
||||||
this.cancel.Name = "cancel";
|
this.cancel.Name = "cancel";
|
||||||
this.cancel.Size = new System.Drawing.Size(100, 25);
|
this.cancel.Size = new System.Drawing.Size(100, 25);
|
||||||
this.cancel.TabIndex = 22;
|
this.cancel.TabIndex = 22;
|
||||||
|
@ -65,7 +68,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// apply
|
// apply
|
||||||
//
|
//
|
||||||
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.apply.Location = new System.Drawing.Point(570, 496);
|
this.apply.Location = new System.Drawing.Point(581, 496);
|
||||||
this.apply.Name = "apply";
|
this.apply.Name = "apply";
|
||||||
this.apply.Size = new System.Drawing.Size(100, 25);
|
this.apply.Size = new System.Drawing.Size(100, 25);
|
||||||
this.apply.TabIndex = 21;
|
this.apply.TabIndex = 21;
|
||||||
|
@ -79,13 +82,15 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
| System.Windows.Forms.AnchorStyles.Left)));
|
| System.Windows.Forms.AnchorStyles.Left)));
|
||||||
this.texturesets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
this.texturesets.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
|
||||||
this.columnHeader1});
|
this.columnHeader1});
|
||||||
|
this.texturesets.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.texturesets.FullRowSelect = true;
|
this.texturesets.FullRowSelect = true;
|
||||||
this.texturesets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
this.texturesets.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||||
this.texturesets.HideSelection = false;
|
this.texturesets.HideSelection = false;
|
||||||
this.texturesets.Location = new System.Drawing.Point(12, 9);
|
this.texturesets.Location = new System.Drawing.Point(12, 9);
|
||||||
this.texturesets.MultiSelect = false;
|
this.texturesets.MultiSelect = false;
|
||||||
this.texturesets.Name = "texturesets";
|
this.texturesets.Name = "texturesets";
|
||||||
this.texturesets.Size = new System.Drawing.Size(166, 476);
|
this.texturesets.Size = new System.Drawing.Size(176, 476);
|
||||||
|
this.texturesets.SmallImageList = this.smallimages;
|
||||||
this.texturesets.TabIndex = 23;
|
this.texturesets.TabIndex = 23;
|
||||||
this.texturesets.UseCompatibleStateImageBehavior = false;
|
this.texturesets.UseCompatibleStateImageBehavior = false;
|
||||||
this.texturesets.View = System.Windows.Forms.View.Details;
|
this.texturesets.View = System.Windows.Forms.View.Details;
|
||||||
|
@ -94,14 +99,21 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
// columnHeader1
|
// columnHeader1
|
||||||
//
|
//
|
||||||
this.columnHeader1.Text = "Name";
|
this.columnHeader1.Text = "Name";
|
||||||
this.columnHeader1.Width = 141;
|
this.columnHeader1.Width = 152;
|
||||||
|
//
|
||||||
|
// smallimages
|
||||||
|
//
|
||||||
|
this.smallimages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("smallimages.ImageStream")));
|
||||||
|
this.smallimages.TransparentColor = System.Drawing.Color.Transparent;
|
||||||
|
this.smallimages.Images.SetKeyName(0, "KnownTextureSet2.ico");
|
||||||
|
this.smallimages.Images.SetKeyName(1, "OthersTextureSet2.ico");
|
||||||
//
|
//
|
||||||
// TextureBrowserForm
|
// TextureBrowserForm
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.apply;
|
this.AcceptButton = this.apply;
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.CancelButton = this.cancel;
|
this.CancelButton = this.cancel;
|
||||||
this.ClientSize = new System.Drawing.Size(788, 531);
|
this.ClientSize = new System.Drawing.Size(799, 531);
|
||||||
this.Controls.Add(this.texturesets);
|
this.Controls.Add(this.texturesets);
|
||||||
this.Controls.Add(this.cancel);
|
this.Controls.Add(this.cancel);
|
||||||
this.Controls.Add(this.apply);
|
this.Controls.Add(this.apply);
|
||||||
|
@ -132,5 +144,6 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
private System.Windows.Forms.Button apply;
|
private System.Windows.Forms.Button apply;
|
||||||
private System.Windows.Forms.ListView texturesets;
|
private System.Windows.Forms.ListView texturesets;
|
||||||
private System.Windows.Forms.ColumnHeader columnHeader1;
|
private System.Windows.Forms.ColumnHeader columnHeader1;
|
||||||
|
private System.Windows.Forms.ImageList smallimages;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -64,12 +64,14 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
{
|
{
|
||||||
item = texturesets.Items.Add(ts.Name);
|
item = texturesets.Items.Add(ts.Name);
|
||||||
item.Tag = ts;
|
item.Tag = ts;
|
||||||
|
item.ImageIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort and add other textures set
|
// Sort and add other textures set
|
||||||
texturesets.Sort();
|
texturesets.Sort();
|
||||||
item = texturesets.Items.Add(General.Map.Data.OthersTextureSet.Name);
|
item = texturesets.Items.Add(General.Map.Data.OthersTextureSet.Name);
|
||||||
item.Tag = General.Map.Data.OthersTextureSet;
|
item.Tag = General.Map.Data.OthersTextureSet;
|
||||||
|
item.ImageIndex = 1;
|
||||||
|
|
||||||
// Select the last one that was selected
|
// Select the last one that was selected
|
||||||
string selectname = General.Settings.ReadSetting("browserwindow.texturestextureset", "");
|
string selectname = General.Settings.ReadSetting("browserwindow.texturestextureset", "");
|
||||||
|
|
|
@ -117,4 +117,68 @@
|
||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<metadata name="browser.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="cancel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="apply.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="texturesets.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
|
<metadata name="smallimages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
|
<value>17, 17</value>
|
||||||
|
</metadata>
|
||||||
|
<data name="smallimages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>
|
||||||
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
|
||||||
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAQ
|
||||||
|
CQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARYBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
|
AwABQAMAARYDAAEBAQABCAUAAYABBRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
|
||||||
|
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
|
||||||
|
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
|
||||||
|
AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
|
||||||
|
AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
|
||||||
|
AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
|
||||||
|
AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
|
||||||
|
ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
|
||||||
|
AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
|
||||||
|
AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
|
||||||
|
AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
|
||||||
|
AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
|
||||||
|
AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
|
||||||
|
Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
|
||||||
|
AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
|
||||||
|
AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
|
||||||
|
ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
|
||||||
|
ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
|
||||||
|
AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
|
||||||
|
AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
|
||||||
|
AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
|
||||||
|
AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
|
||||||
|
AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
|
||||||
|
AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
|
||||||
|
AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
|
||||||
|
ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
|
||||||
|
AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
|
||||||
|
AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP//wBCAAH3Aq4BbQFs
|
||||||
|
AeoCbARmBAAB9wKuAW0BbAHqAmwEZiQAAfcD/wL1AvQDGQFmBAAB9wT/AQkBzwLzAhkBZiQAAbUC/wKT
|
||||||
|
AZkBBwG7AbQCGQNmAgABtQT/AfQB3QH1AvMBGQNmIgABtQL/AZMBmgF6AZ8BngG7AfQB8wFmARkBZgIA
|
||||||
|
AbUE/wH0Aa0B9QHzAfQB8wFmARkBZiIAAbUC/wG7AQgCnwF+AXkC9AFsARkDZgG1Bf8BCQHPA/QBbAEZ
|
||||||
|
A2YgAAG1Av8C2wEJAQgBfgF5AfUB9AFsAfMBZgEZAWYBtQP/AQkBGQH/AbQBGQH1AfQBbAHzAWYBGQFm
|
||||||
|
IAABBwj/AvUBbAH0AWwBGQFmAQcD/wHdArQB3QH/AvUBbAH0AWwBGQFmIAACBwS1AfcBtQLtApEB9AFs
|
||||||
|
AfMBZgIHBLUB9wG1Au0CkQH0AWwB8wFmIgABBwj/AvUBbAH0AWwCAAEHCP8C9QFsAfQBbCIAAgcEtQH3
|
||||||
|
AbUC7QKRAfQBbAIAAgcEtQH3AbUC7QKRAfQBbCQAAQcI/wL1AWwEAAEHCP8C9QFsJAACBwS1AfcBtQLt
|
||||||
|
ApEEAAIHBLUB9wG1Au0Ckf8AYQABQgFNAT4HAAE+AwABKAMAAUADAAEWAwABAQEAAQEFAAGwFwAD/wEA
|
||||||
|
BP8EAAT/BAAE/wQABP8EAAT/BQABDwEAAQ8FAAEPAQABDwUAAQMBAAEDBQABAwEAAQMkAAHAAQABwAUA
|
||||||
|
AcABAAHABQAB8AEAAfAFAAHwAQAB8AUABP8EAAT/BAAE/wQABP8EAAT/BAAL
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
23
Source/Windows/TextureSetForm.Designer.cs
generated
23
Source/Windows/TextureSetForm.Designer.cs
generated
|
@ -47,14 +47,16 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.matchesbutton = new System.Windows.Forms.RadioButton();
|
this.matchesbutton = new System.Windows.Forms.RadioButton();
|
||||||
this.noresultlabel = new System.Windows.Forms.Label();
|
this.noresultlabel = new System.Windows.Forms.Label();
|
||||||
this.matcheslist = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
this.matcheslist = new CodeImp.DoomBuilder.Controls.ImageBrowserControl();
|
||||||
|
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||||
this.groupBox1.SuspendLayout();
|
this.groupBox1.SuspendLayout();
|
||||||
this.groupBox2.SuspendLayout();
|
this.groupBox2.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// label1
|
// label1
|
||||||
//
|
//
|
||||||
this.label1.AutoSize = true;
|
this.label1.AutoSize = true;
|
||||||
this.label1.Location = new System.Drawing.Point(30, 24);
|
this.label1.Location = new System.Drawing.Point(36, 24);
|
||||||
this.label1.Name = "label1";
|
this.label1.Name = "label1";
|
||||||
this.label1.Size = new System.Drawing.Size(37, 14);
|
this.label1.Size = new System.Drawing.Size(37, 14);
|
||||||
this.label1.TabIndex = 0;
|
this.label1.TabIndex = 0;
|
||||||
|
@ -62,9 +64,9 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
//
|
//
|
||||||
// name
|
// name
|
||||||
//
|
//
|
||||||
this.name.Location = new System.Drawing.Point(73, 21);
|
this.name.Location = new System.Drawing.Point(79, 21);
|
||||||
this.name.Name = "name";
|
this.name.Name = "name";
|
||||||
this.name.Size = new System.Drawing.Size(179, 20);
|
this.name.Size = new System.Drawing.Size(173, 20);
|
||||||
this.name.TabIndex = 1;
|
this.name.TabIndex = 1;
|
||||||
//
|
//
|
||||||
// filters
|
// filters
|
||||||
|
@ -249,12 +251,21 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.matcheslist.TabIndex = 10;
|
this.matcheslist.TabIndex = 10;
|
||||||
this.matcheslist.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.matcheslist_SelectedItemDoubleClicked);
|
this.matcheslist.SelectedItemDoubleClicked += new CodeImp.DoomBuilder.Controls.ImageBrowserControl.SelectedItemDoubleClickDelegate(this.matcheslist_SelectedItemDoubleClicked);
|
||||||
//
|
//
|
||||||
|
// pictureBox1
|
||||||
|
//
|
||||||
|
this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.KnownTextureSet;
|
||||||
|
this.pictureBox1.Location = new System.Drawing.Point(12, 23);
|
||||||
|
this.pictureBox1.Name = "pictureBox1";
|
||||||
|
this.pictureBox1.Size = new System.Drawing.Size(19, 16);
|
||||||
|
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
|
||||||
|
this.pictureBox1.TabIndex = 12;
|
||||||
|
this.pictureBox1.TabStop = false;
|
||||||
|
//
|
||||||
// TextureSetForm
|
// TextureSetForm
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.apply;
|
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.CancelButton = this.cancel;
|
|
||||||
this.ClientSize = new System.Drawing.Size(642, 455);
|
this.ClientSize = new System.Drawing.Size(642, 455);
|
||||||
|
this.Controls.Add(this.pictureBox1);
|
||||||
this.Controls.Add(this.groupBox2);
|
this.Controls.Add(this.groupBox2);
|
||||||
this.Controls.Add(this.cancel);
|
this.Controls.Add(this.cancel);
|
||||||
this.Controls.Add(this.apply);
|
this.Controls.Add(this.apply);
|
||||||
|
@ -275,6 +286,7 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
this.groupBox1.ResumeLayout(false);
|
this.groupBox1.ResumeLayout(false);
|
||||||
this.groupBox1.PerformLayout();
|
this.groupBox1.PerformLayout();
|
||||||
this.groupBox2.ResumeLayout(false);
|
this.groupBox2.ResumeLayout(false);
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
this.PerformLayout();
|
||||||
|
|
||||||
|
@ -300,5 +312,6 @@ namespace CodeImp.DoomBuilder.Windows
|
||||||
private System.Windows.Forms.Label noresultlabel;
|
private System.Windows.Forms.Label noresultlabel;
|
||||||
private System.Windows.Forms.RadioButton nomatchesbutton;
|
private System.Windows.Forms.RadioButton nomatchesbutton;
|
||||||
private System.Windows.Forms.RadioButton matchesbutton;
|
private System.Windows.Forms.RadioButton matchesbutton;
|
||||||
|
private System.Windows.Forms.PictureBox pictureBox1;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -168,6 +168,9 @@
|
||||||
<metadata name="matcheslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="matcheslist.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="pictureBox1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
|
Loading…
Reference in a new issue