stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Converted solution/project files to Visual Studio 2008

Browse source 
- Changed code to use .NET Framework 3.5
This commit is contained in:
codeimp 2009-04-11 07:46:53 +00:00
parent d130fbc7ad
commit 201e8556a3
7 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Builder.sln
View file

@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Builder", "Source\Builder.csproj", "{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuilderModes", "Source\BuilderModes\BuilderModes.csproj", "{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}"

13
Source/Builder.csproj
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{818B3D10-F791-4C3F-9AF5-BB2D0079B63C}</ProjectGuid>
<OutputType>WinExe</OutputType>
@ -15,6 +15,12 @@
<Win32Resource>
</Win32Resource>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@ -507,6 +513,9 @@
</Reference>
<Reference Include="SlimDX, Version=2.0.6.40, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" />
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="Trackbar, Version=1.0.2486.37933, Culture=neutral, PublicKeyToken=503bf28f63ad27b4" />

13
Source/BuilderModes/BuilderModes.csproj
View file

@ -1,8 +1,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{B42D5AA0-F9A6-4234-9C4B-A05B11A64851}</ProjectGuid>
<OutputType>Library</OutputType>
@ -10,6 +10,12 @@
<RootNamespace>CodeImp.DoomBuilder.BuilderModes</RootNamespace>
<AssemblyName>BuilderModes</AssemblyName>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@ -39,6 +45,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>

2
Source/BuilderModes/ClassicModes/BaseClassicMode.cs
View file

@ -119,7 +119,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Double select-click? Make that the same as single edit-click
if(General.Actions.GetActionByName("builder_classicselect").KeyMatches(k))
{
Action a = General.Actions.GetActionByName("builder_classicedit");
Actions.Action a = General.Actions.GetActionByName("builder_classicedit");
if(a != null) a.Invoke();
}
}

2
Source/Editing/CopyPasteManager.cs
View file

@ -288,7 +288,7 @@ namespace CodeImp.DoomBuilder.Editing
if(DoCopySelection("Cut selected elements."))
{
// Get the delete action and check if it's bound
Action deleteitem = General.Actions["builder_deleteitem"];
Actions.Action deleteitem = General.Actions["builder_deleteitem"];
if(deleteitem.BeginBound)
{
// Perform delete action

6
Source/Windows/MainForm.cs
View file

@ -1127,7 +1127,7 @@ namespace CodeImp.DoomBuilder.Windows
if((e.KeyCode == Keys.F1) && (e.Modifiers == Keys.None))
{
// No action bound to F1?
Action[] f1actions = General.Actions.GetActionsByKey((int)e.KeyData);
Actions.Action[] f1actions = General.Actions.GetActionsByKey((int)e.KeyData);
if(f1actions.Length == 0)
{
// If we don't have any map open, show the Main Window help
@ -1527,7 +1527,7 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Actions.Exists(actionname))
{
// Put the action shortcut key on the menu item
menuitem.ShortcutKeyDisplayString = Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
menuitem.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
}
}
// Edit mode info set for this item?
@ -1539,7 +1539,7 @@ namespace CodeImp.DoomBuilder.Windows
if(General.Actions.Exists(actionname))
{
// Put the action shortcut key on the menu item
menuitem.ShortcutKeyDisplayString = Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
menuitem.ShortcutKeyDisplayString = Actions.Action.GetShortcutKeyDesc(General.Actions[actionname].ShortcutKey);
}
}

20
Source/Windows/PreferencesForm.cs
View file

@ -49,7 +49,7 @@ namespace CodeImp.DoomBuilder.Windows
// Constructor
public PreferencesForm()
{
Action[] actions;
Actions.Action[] actions;
ListViewItem item;
// Initialize
@ -96,11 +96,11 @@ namespace CodeImp.DoomBuilder.Windows
// Fill list of actions
actions = General.Actions.GetAllActions();
foreach(Action a in actions)
foreach(Actions.Action a in actions)
{
// Create item
item = listactions.Items.Add(a.Name, a.Title, 0);
item.SubItems.Add(Action.GetShortcutKeyDesc(a.ShortcutKey));
item.SubItems.Add(Actions.Action.GetShortcutKeyDesc(a.ShortcutKey));
item.SubItems[1].Tag = a.ShortcutKey;
// Put in category, if the category exists
@ -372,7 +372,7 @@ namespace CodeImp.DoomBuilder.Windows
// Don't count the selected action
if(item != listactions.SelectedItems[0])
{
Action a = General.Actions[item.Name];
Actions.Action a = General.Actions[item.Name];
int akey = (int)item.SubItems[1].Tag;
// Check if the key combination matches
@ -400,7 +400,7 @@ namespace CodeImp.DoomBuilder.Windows
}
// This fills the list of available controls for the specified action
private void FillControlsList(Action a)
private void FillControlsList(Actions.Action a)
{
actioncontrol.Items.Clear();
@ -462,7 +462,7 @@ namespace CodeImp.DoomBuilder.Windows
// Item selected
private void listactions_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)
{
Action action;
Actions.Action action;
KeyControl keycontrol;
int key;
@ -498,7 +498,7 @@ namespace CodeImp.DoomBuilder.Windows
// Otherwise display the key in the textbox
if(actioncontrol.SelectedIndex == -1)
actionkey.Text = Action.GetShortcutKeyDesc(key);
actionkey.Text = Actions.Action.GetShortcutKeyDesc(key);
// Show actions with same key
UpdateKeyUsedActions();
@ -561,9 +561,9 @@ namespace CodeImp.DoomBuilder.Windows
actioncontrol.SelectedIndex = -1;
// Apply the key combination
listactions.SelectedItems[0].SubItems[1].Text = Action.GetShortcutKeyDesc(key);
listactions.SelectedItems[0].SubItems[1].Text = Actions.Action.GetShortcutKeyDesc(key);
listactions.SelectedItems[0].SubItems[1].Tag = key;
actionkey.Text = Action.GetShortcutKeyDesc(key);
actionkey.Text = Actions.Action.GetShortcutKeyDesc(key);
// Show actions with same key
UpdateKeyUsedActions();
@ -602,7 +602,7 @@ namespace CodeImp.DoomBuilder.Windows
key = (KeyControl)actioncontrol.SelectedItem;
// Apply the key combination
listactions.SelectedItems[0].SubItems[1].Text = Action.GetShortcutKeyDesc(key.key);
listactions.SelectedItems[0].SubItems[1].Text = Actions.Action.GetShortcutKeyDesc(key.key);
listactions.SelectedItems[0].SubItems[1].Tag = key.key;
// Show actions with same key