Menu
▾
▴
freetrain-svn
|
From: <ste...@us...> - 2007-08-22 11:25:15
|
Revision: 164
http://freetrain.svn.sourceforge.net/freetrain/?rev=164&view=rev
Author: stevenhoefel
Date: 2007-08-22 04:25:17 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
Initial solution, game loop and GUI. currently this will chew 100% CPU (but run very nice :)...) I need to get a proper timer event in there shortly... I suppose windows wants to use a bit of it's CPU every now and then.
Added Paths:
-----------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIDrawer.cs
Added: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj (rev 0)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-08-22 11:25:17 UTC (rev 164)
@@ -0,0 +1,75 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{B43DC0F1-5C4B-490F-8171-C3754A02D605}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>FreeTrainSDL</RootNamespace>
+ <AssemblyName>FreeTrainSDL</AssemblyName>
+ <StartupObject>FreeTrainSDL.FreeTrainSDL</StartupObject>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Deployment" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Tao.Platform.Windows, Version=1.0.0.4, Culture=neutral, PublicKeyToken=701104b2da67a104, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Debug\Tao.Platform.Windows.dll</HintPath>
+ </Reference>
+ <Reference Include="Tao.Sdl, Version=1.2.11.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Debug\Tao.Sdl.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Program.cs" />
+ <Compile Include="SDLGUI.cs" />
+ <Compile Include="SDLGUIDrawer.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="core\FreeTrain.Core.csproj">
+ <Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
+ <Name>FreeTrain.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="lib\SDLGFX.net\SDL.net.csproj">
+ <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
+ <Name>SDL.net</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Properties\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln (rev 0)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2007-08-22 11:25:17 UTC (rev 164)
@@ -0,0 +1,44 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C# Express 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrainSDL", "FreeTrainSDL.csproj", "{B43DC0F1-5C4B-490F-8171-C3754A02D605}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Core", "core\FreeTrain.Core.csproj", "{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Controls", "lib\Controls\FreeTrain.Controls.csproj", "{D3B86CCE-530E-4472-AE8E-3FA5F903C206}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DirectAudio.net", "lib\DirectAudio.net\DirectAudio.net.csproj", "{0616A314-BDF0-466D-AB4B-9FA1B071A8A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.net", "lib\SDLGFX.net\SDL.net.csproj", "{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B43DC0F1-5C4B-490F-8171-C3754A02D605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B43DC0F1-5C4B-490F-8171-C3754A02D605}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B43DC0F1-5C4B-490F-8171-C3754A02D605}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B43DC0F1-5C4B-490F-8171-C3754A02D605}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7746CF50-D84E-4E7B-83FB-AB43DB854DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7746CF50-D84E-4E7B-83FB-AB43DB854DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7746CF50-D84E-4E7B-83FB-AB43DB854DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7746CF50-D84E-4E7B-83FB-AB43DB854DA8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs (rev 0)
+++ branches/FreeTrainSDL/Program.cs 2007-08-22 11:25:17 UTC (rev 164)
@@ -0,0 +1,428 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+using Tao.Sdl;
+using Tao.Platform.Windows;
+using org.kohsuke.directdraw;
+
+using freetrain.world;
+using freetrain.world.rail;
+using freetrain.world.terrain;
+using freetrain.controllers.land;
+using freetrain.framework.plugin;
+using freetrain.framework.sound;
+using freetrain.util;
+using freetrain.util.command;
+using freetrain.controllers;
+using freetrain.controllers.rail;
+using freetrain.controllers.terrain;
+using freetrain.controllers.structs;
+using freetrain.framework;
+using freetrain.views;
+using freetrain.framework.graphics;
+
+namespace FreeTrainSDL
+{
+ public class FreeTrainSDL : IDisposable
+ {
+ int flags = (Sdl.SDL_HWSURFACE | Sdl.SDL_DOUBLEBUF | Sdl.SDL_ANYFORMAT | Sdl.SDL_RESIZABLE);
+
+ static int width = 640,height = 480;
+ private int MAP_X_OFFSET = 12, MAP_Y_OFFSET = 24;
+ private IntPtr screen;
+ private SDLGUI gui;
+ bool quitFlag = false;
+ Sdl.SDL_VideoInfo videoInfo;
+ Sdl.SDL_PixelFormat pixelFormat;
+
+ static int CURRENT_BPP = 16;
+
+ Surface tmp, satmap;
+
+ ModalController controller = null;
+
+ private bool dragMode = false;
+ private Point dragStartMousePos, dragStartScrollPos, AutoScrollPosition;
+
+ private Point scrollPos
+ {
+ get
+ {
+ Point pt = AutoScrollPosition;
+ return new Point(pt.X + MAP_X_OFFSET, pt.Y + MAP_Y_OFFSET);
+ }
+ set
+ {
+ AutoScrollPosition =new Point(
+ Math.Max(value.X - MAP_X_OFFSET,0),
+ Math.Max(value.Y - MAP_Y_OFFSET,0));
+ }
+ }
+
+ QuarterViewDrawer qview = null;
+ World w = null;
+ WeatherOverlay weatherOverlay;
+
+ Clock clock = null;
+
+ Sdl.SDL_Rect source_rect,dst;
+
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ FreeTrainSDL ftsdl = new FreeTrainSDL();
+ ftsdl.Go();
+ }
+
+ public void updateMessage(string msg, float progress)
+ {
+ //Console.WriteLine("LOADING: " + msg + "{" + progress + "}");
+ gui.addSplashText(msg.Replace('\n',' '), progress);
+ }
+
+ public void Go()
+ {
+ dragStartMousePos = new Point(0, 0);
+ dragStartScrollPos = new Point(0, 0);
+ scrollPos = new Point(0, 0);
+
+ Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING);
+ Sdl.SDL_WM_SetCaption("FreeTrain SDL", "");
+ screen = Sdl.SDL_SetVideoMode(
+ width,
+ height,
+ CURRENT_BPP,
+ flags);
+
+ IntPtr videoInfoPointer = Sdl.SDL_GetVideoInfo();
+
+ if (videoInfoPointer != IntPtr.Zero) {
+ videoInfo = (Sdl.SDL_VideoInfo)Marshal.PtrToStructure(videoInfoPointer, typeof(Sdl.SDL_VideoInfo));
+ pixelFormat = (Sdl.SDL_PixelFormat)Marshal.PtrToStructure(videoInfo.vfmt,typeof(Sdl.SDL_PixelFormat));
+ }
+
+ gui = new SDLGUI();
+ gui.SystemMenuClick += new EventHandler(sysMenuClick);
+ gui.initGUI(width, height, videoInfo.vfmt);
+ gui.clock_text = "Initialising...";
+
+ updateMessage("FreeTrain SDL Starting...", -1);
+ gui.SHOW_SPLASH = true;
+
+ finalDraw();
+
+ MainWindow.mainWindow = new MainWindow(null, true);
+ updateMessage("Loading plugins...",-1);
+ finalDraw();
+ Core.init(null, null, null, new ProgressHandler(updateMessage), true);
+ w = new World(new Distance(150,150, 7), 3);
+ World.world = w;
+
+ weatherOverlay = NullWeatherOverlay.theInstance;
+ tmp = new Surface(width, height);
+
+ updateMessage("Creating Map...",0);
+ finalDraw();
+ qview = new QuarterViewDrawer(w, new Rectangle(0, 0, w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8));
+ qview.offscreenBuffer = new Surface(w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8, videoInfo.vfmt);
+ qview.recreateDrawBuffer(new Size(width, height), true);
+ updateMessage("Creating Map...",100);
+ finalDraw();
+
+ qview.draw(new Rectangle(0, 0, w.size.x * 32 - 16, (w.size.y - 2 * w.size.z - 1) * 8), null);
+ qview.OnUpdated += new EventHandler(qview_OnUpdated);
+
+ gui.SHOW_SPLASH = false;
+
+ Sdl.SDL_Event evt;
+
+ int result;
+ while (quitFlag == false)
+ {
+ result = Sdl.SDL_PollEvent(out evt);
+ switch (evt.type)
+ {
+ case Sdl.SDL_QUIT:
+ quitFlag = true;
+ break;
+ case Sdl.SDL_KEYDOWN:
+ if ((evt.key.keysym.sym == (int)Sdl.SDLK_ESCAPE) || (evt.key.keysym.sym == (int)Sdl.SDLK_q)) quitFlag = true;
+ break;
+ case Sdl.SDL_VIDEORESIZE:
+ width = evt.resize.w;
+ height = evt.resize.h;
+ screen = Sdl.SDL_SetVideoMode(width, height, CURRENT_BPP, flags);
+ weatherOverlay.setSize(new Size(width,height));
+ qview.size = new Size(evt.resize.w, evt.resize.h);
+ break;
+ case Sdl.SDL_MOUSEBUTTONDOWN:
+ Events_MouseButtonDown(evt.button);
+ break;
+ case Sdl.SDL_MOUSEBUTTONUP:
+ Events_MouseButtonUp(evt.button);
+ break;
+ case Sdl.SDL_MOUSEMOTION:
+ Events_MouseMotion(evt.motion);
+ break;
+ }
+
+ //Sdl.SDL_Rect current_view = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
+ //Tao.Sdl.Sdl.SDL_FillRect(screen, ref current_view, Sdl.SDL_MapRGB(videoInfo.vfmt, 0, 100, 0));
+
+ if (qview != null)
+ {
+ controller = MainWindow.mainWindow.currentController;
+ clock = World.world.clock;
+ clock.tick();
+ //clock.tick();
+
+ qview.updateScreen();
+ if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
+ {
+ World.world.satellite = new Surface(150, 150, 32);
+ World.world.satellite.fill(Color.FromArgb(222,195,132));
+ }
+
+ for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
+ {
+ Train t = (Train)World.world.rootTrainGroup.items.get(i);
+ if (t.state == Train.State.Moving)
+ gui.updateTrainStatus(i, 3);
+ else if (t.isPlaced)
+ gui.updateTrainStatus(i, 2);
+ else
+ gui.updateTrainStatus(i, 1);
+ }
+
+ gui.updateSatellite(ref World.world.satellite);
+
+
+
+ source_rect = new Sdl.SDL_Rect((short)scrollPos.X, (short)scrollPos.Y, (short)width, (short)height);
+ dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(qview.offscreenBuffer.surfacePtr(), ref source_rect, screen, ref dst);
+ //Tao.Sdl.Sdl.SDL_BlitSurface(tmp.surfacePtr(), ref dst, screen, ref dst);
+ }
+
+
+ finalDraw();
+ }
+ }
+
+ void finalDraw()
+ {
+ if (gui != null)
+ {
+ gui.updateGUIElements(width, height);
+ if (clock != null) gui.clock_text = clock.displayString;
+ gui.drawGUI(width, height, screen);
+ }
+ int result = Sdl.SDL_Flip(screen);
+ }
+
+ private void weatherTimer_Tick(object sender, System.EventArgs e)
+ {
+ }
+
+ void sysMenuClick(object sender, EventArgs e)
+ {
+ switch ((int)sender)
+ {
+ case 0:
+ RailRoadController.create();
+ break;
+ case 1:
+ TrainTradingDialog t = new TrainTradingDialog();
+ t.ShowDialog();
+ t.Dispose();
+ TrainPlacementController.create();
+ break;
+ case 2:
+
+ MountainController.create();
+ break;
+ case 3:
+ /*if (screen.FullScreen)
+ {
+ width = old_width;
+ height = old_height;
+ }
+ else
+ {
+ old_width = width;
+ old_height = height;
+ width = 640;
+ height = 480;
+ }
+ bool new_FS = !screen.FullScreen;
+ screen = Video.SetVideoMode(width, height, CURRENT_BPP, true, false, new_FS);
+ //qview.size = new Size(width, height);
+ break;*/
+
+ StationaryStructPlacementController.create();
+ VarHeightBuildingController.create();
+ CommercialStructPlacementController.create();
+ break;
+
+ case 4:
+ quitFlag = true;
+ break;
+ }
+ }
+
+ void qview_OnUpdated(object sender, EventArgs e)
+ {
+ //if (qview.offscreenBuffer != null)
+ //{
+ //maybe do something? I don't know.
+ //}
+ //
+ }
+
+ short old_x, old_y;
+ void Events_MouseMotion(Sdl.SDL_MouseMotionEvent e)
+ {
+ if (dragMode)
+ {
+ scrollByDrag(new Point(e.x, e.y));
+
+ }
+ else
+ {
+ gui.checkMouseMovement(e);
+ if (controller != null)
+ {
+ Point ab = qview.fromClientToAB(e.x + scrollPos.X, e.y + scrollPos.Y);
+ controller.onMouseMove(null, qview.fromABToXYZ(ab, controller), ab);
+ }
+ old_x = e.x;
+ old_y = e.y;
+ }
+
+
+ }
+ byte lastMouseState;
+ void Events_MouseButtonDown(Sdl.SDL_MouseButtonEvent e)
+ {
+ lastMouseState = e.state;
+ if (e.button == Sdl.SDL_BUTTON_RIGHT && !dragMode)
+ {
+ dragMode = true;
+ dragStartMousePos = new Point(e.x, e.y);
+ dragStartScrollPos = scrollPos;
+ Sdl.SDL_ShowCursor(0);
+ }
+ }
+
+ void Events_MouseButtonUp(Sdl.SDL_MouseButtonEvent e)
+ {
+ if (dragMode)
+ {
+ dragMode = false;
+ //if (scrollByDrag(e.Position)) return;
+ Sdl.SDL_WarpMouse(old_x, old_y);
+ Sdl.SDL_ShowCursor(1);
+ }
+
+ if (lastMouseState == Sdl.SDL_PRESSED)
+ {
+ if (!gui.checkIfGUIClick(e))
+ {
+ if (controller != null)
+ {
+ Point ab = qview.fromClientToAB(e.x + scrollPos.X, e.y + scrollPos.Y);
+ Location xyz = qview.fromABToXYZ(ab, controller);
+
+ if (e.button == Sdl.SDL_BUTTON_LEFT) controller.onClick(null, xyz, ab);
+ }
+ }
+ }
+ lastMouseState = e.state;
+ }
+
+ private bool scrollByDrag(Point curMousePos)
+ {
+ int dragAccel = 1;
+ //if (controller == null)
+ //{
+ Point pt = this.dragStartScrollPos;
+ pt.X +=(curMousePos.X - dragStartMousePos.X) * dragAccel;
+ pt.Y += (curMousePos.Y - dragStartMousePos.Y) * dragAccel;
+ //pt.X *= -1;
+ //pt.Y *= -1;
+ //Console.WriteLine(pt);
+ scrollPos = pt;
+ qview.origin = scrollPos;
+ //if (qview.origin != scrollPos)
+ //{
+ // dragStartMousePos = curMousePos;
+ // dragStartScrollPos = curMousePos;
+ // scrollPos = qview.origin;
+ //}
+ //Console.Write(scrollPos);
+ return true;
+ //}
+ //return false;
+ }
+
+ private int distance(Point a, Point b)
+ {
+ return (int)Math.Sqrt((a.X - b.X) * (a.X - b.X) + (a.Y - b.Y) * (a.Y - b.Y));
+ }
+
+ //private void Tick(object sender, TickEventArgs args)
+ //{
+ //screen.Fill(Color.Black);
+ /*if (qview != null) {
+ controller = MainWindow.mainWindow.currentController;
+ clock = World.world.clock;
+ clock.tick();
+ clock.tick();
+ clock.tick();
+ clock.tick();
+
+ qview.updateScreen();
+
+ //if (scrollPos.X == source_rect.X && scrollPos.Y == source_rect.Y)
+ //{
+ //tst = screen.CreateScaledSurface(0.5);
+ // screen.Blit(qview.offscreenBuffer.handle, new Point(0,0), source_rect);
+ //screen.Draw(new SdlDotNet.Graphics.Primitives.Box(qview.offscreenBuffer.clipRect.Location, qview.offscreenBuffer.clipRect.Size),Color.Black);
+ //Rectangle r = new Rectangle(0, 0, width / 2, height / 2);
+
+ //screen.Blit(tst,new Point(0,0));
+ //tst.Dispose();
+
+ //}
+ //else
+ //{
+ source_rect = new Rectangle(scrollPos, new Size(width, height));
+ screen.Blit(qview.offscreenBuffer.handle, new Point(0, 0), source_rect);
+ //}
+
+ }*/
+
+ // if (gui != null) {
+ // gui.updateGUIElements(width,height);
+ // if (clock != null) gui.clock_text = clock.displayString;
+ // gui.drawGUI(width,height,screen);
+ // }
+
+ // screen.Update();
+ //}
+
+ public void Dispose()
+ {
+
+ weatherOverlay.Dispose();
+ Dispose();
+ }
+ }
+}
\ No newline at end of file
Added: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs (rev 0)
+++ branches/FreeTrainSDL/SDLGUI.cs 2007-08-22 11:25:17 UTC (rev 164)
@@ -0,0 +1,232 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.Windows.Forms;
+using System.Drawing;
+using Tao.Sdl;
+using org.kohsuke.directdraw;
+
+namespace FreeTrainSDL
+{
+ public class SDLGUI
+ {
+ private Color baseGUIColor, shadeGUIColor, drawerGUIColor;
+ private int baseColor, shadeColor;
+ private Surface bot_right, bot_left, top_bar, splash, satmap;
+ //private SdlDotNet.Graphics.Font font;
+ private IntPtr freesans;
+
+ int BOTTOM_GUI_HEIGHT = 25;
+ public int SIDE_GUI_WIDTH = 25;
+ public int TOP_GUI_HEIGHT = 24;
+
+ int MAX_SPLASH_LINES = 10;
+
+ public bool SHOW_SPLASH = false;
+ private string[] SPLASH_TEXT;
+ public string clock_text;
+ protected int SPLASH_TEXT_HEIGHT = 10;
+ protected int SPLASH_PERCENT = 0;
+
+ SDLGUIDrawer system;
+
+ SDLGUIDrawerSatellite sat;
+
+ public EventHandler SystemMenuClick;
+
+ public SDLGUI()
+ {
+ SdlTtf.TTF_Init();
+ baseGUIColor = Color.FromArgb(252, 252, 236);
+ shadeGUIColor = Color.FromArgb(152, 152, 116);
+ drawerGUIColor = Color.FromArgb(236, 236, 184);
+ }
+
+ public void updateTrainStatus(int index, int status)
+ {
+ sat.TrainStatus[index] = status;
+ }
+
+ public void initGUI(int width, int height, IntPtr pf)
+ {
+ baseColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
+ shadeColor = Sdl.SDL_MapRGB(pf, shadeGUIColor.R, shadeGUIColor.G, shadeGUIColor.B);
+
+ bot_right = new Surface(Application.StartupPath + "\\gui\\botright.bmp");
+ bot_left = new Surface(Application.StartupPath + "\\gui\\botleft.bmp");
+ top_bar = new Surface(Application.StartupPath + "\\gui\\top.bmp");
+ splash = new Surface(Application.StartupPath + "\\gui\\splash.bmp");
+ system = new SDLGUIDrawer(width, height, 400, 15, pf);
+ if (SystemMenuClick != null) system.MenuItemClicked += new EventHandler(SystemMenuClick);
+ sat = new SDLGUIDrawerSatellite(width, height, 34, 24, pf);
+ freesans = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", SPLASH_TEXT_HEIGHT);
+ SPLASH_TEXT = new string[MAX_SPLASH_LINES];
+ for (int cur = 0; cur < MAX_SPLASH_LINES; cur++) SPLASH_TEXT[cur] = string.Empty;
+ }
+
+ public void checkMouseMovement(Sdl.SDL_MouseMotionEvent e)
+ {
+ system.checkMovement(e);
+ sat.checkMovement(e);
+ }
+
+ public bool checkIfGUIClick(Sdl.SDL_MouseButtonEvent e)
+ {
+ bool wasGUIClick = false;
+ if (!system.checkClick(e))
+ {
+ if (!sat.checkClick(e))
+ {
+ //yada
+ }
+ else wasGUIClick = true;
+
+ } else wasGUIClick = true;
+ return wasGUIClick;
+ }
+
+ public void addSplashText(String nstr, float percent)
+ {
+ SPLASH_PERCENT = (int)(percent);
+ if (!SPLASH_TEXT[MAX_SPLASH_LINES - 1].Contains(nstr))
+ for (int cur = 0; cur < MAX_SPLASH_LINES; cur++)
+ {
+ if (cur < (MAX_SPLASH_LINES-1)) SPLASH_TEXT[cur] = SPLASH_TEXT[cur + 1];
+ else SPLASH_TEXT[cur] = nstr;
+ }
+ }
+
+ public void updateGUIElements(int width, int height)
+ {
+ system.updateDrawer(width, height);
+ sat.updateDrawer(width, height);
+ }
+
+ public void drawGUI(int width, int height, IntPtr screen)
+ {
+ int curXPos = -(top_bar.size.Width);
+
+ Sdl.SDL_Rect src, dst;
+
+ while (curXPos < width)
+ {
+ curXPos += top_bar.size.Width;
+ src = new Sdl.SDL_Rect((short)curXPos, 0, (short)top_bar.size.Width, (short)top_bar.size.Height);
+ dst = top_bar.clipSDLRect;
+ Tao.Sdl.Sdl.SDL_BlitSurface(top_bar.surfacePtr(), ref dst, screen, ref src);
+ }
+
+ system.drawDrawer(screen,width,height);
+
+ Sdl.SDL_Rect current = new Sdl.SDL_Rect((short)(width - SIDE_GUI_WIDTH), (short)TOP_GUI_HEIGHT, (short)width, (short)height);
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref current, baseColor);
+ current = new Sdl.SDL_Rect(0, (short)TOP_GUI_HEIGHT, (short)SIDE_GUI_WIDTH, (short)height);
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref current, baseColor);
+ current = new Sdl.SDL_Rect(0, (short)(height - BOTTOM_GUI_HEIGHT), (short)width, (short)height);
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref current, baseColor);
+
+
+ Tao.Sdl.SdlGfx.vlineColor(screen,(short)(width - (SIDE_GUI_WIDTH + 1)),(short)TOP_GUI_HEIGHT,(short)(height - BOTTOM_GUI_HEIGHT - 17),0);
+ Tao.Sdl.SdlGfx.vlineColor(screen, (short)(width - (SIDE_GUI_WIDTH)), (short)(TOP_GUI_HEIGHT + 2), (short)(height - BOTTOM_GUI_HEIGHT - 17), shadeColor);
+
+ sat.drawDrawer(screen, width, height, satmap);
+
+ src = bot_right.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)(width - (SIDE_GUI_WIDTH) - bot_right.size.Width), (short)(height - BOTTOM_GUI_HEIGHT - bot_right.size.Height + 1), (short)bot_right.size.Width, (short)bot_right.size.Height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(bot_right.surfacePtr(), ref src, screen, ref dst);
+
+
+ Tao.Sdl.SdlGfx.hlineColor(screen,
+ (short)(width - (SIDE_GUI_WIDTH) - bot_right.size.Width - 1),
+ (short)(SIDE_GUI_WIDTH + bot_left.size.Width - 2),
+ (short)(height - BOTTOM_GUI_HEIGHT - 2),
+ 0);
+ Tao.Sdl.SdlGfx.hlineColor(screen,
+ (short)(width - (SIDE_GUI_WIDTH) - bot_right.size.Width - 1),
+ (short)(SIDE_GUI_WIDTH + bot_left.size.Width - 1),
+ (short)(height - BOTTOM_GUI_HEIGHT - 1),
+ shadeColor);
+
+ Tao.Sdl.SdlGfx.vlineColor(screen,(short)(SIDE_GUI_WIDTH),(short)(TOP_GUI_HEIGHT),(short)(height - BOTTOM_GUI_HEIGHT - 18),0);
+ Tao.Sdl.SdlGfx.vlineColor(screen,(short)(SIDE_GUI_WIDTH - 1),(short)(TOP_GUI_HEIGHT + 2),(short)(height - BOTTOM_GUI_HEIGHT - 16), shadeColor);
+
+ src = bot_left.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)(SIDE_GUI_WIDTH - 1), (short)(height - BOTTOM_GUI_HEIGHT - bot_left.size.Height + 1), (short)bot_left.size.Width, (short)bot_left.size.Height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(bot_left.surfacePtr(), ref src, screen, ref dst);
+
+
+ Tao.Sdl.SdlGfx.hlineColor(screen,(short)(width - (SIDE_GUI_WIDTH + 1)),(short)(width),(short)(TOP_GUI_HEIGHT),0);
+ Tao.Sdl.SdlGfx.hlineColor(screen,0,(short)(SIDE_GUI_WIDTH),(short)(TOP_GUI_HEIGHT),0);
+
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(SIDE_GUI_WIDTH - 2), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(SIDE_GUI_WIDTH - 1), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(SIDE_GUI_WIDTH - 1), (short)(TOP_GUI_HEIGHT + 1), 0, 0, 0, 255);
+
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH + 1), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH), (short)(TOP_GUI_HEIGHT + 1), 0, 0, 0, 255);
+
+
+ if (clock_text != null && clock_text != string.Empty)
+ {
+ drawText(screen,freesans,clock_text,Color.Black,(width - (src.w) - 140),2);
+ }
+
+ if (SHOW_SPLASH)
+ {
+ int xpos = (width / 2) - (splash.size.Width / 2);
+ int ypos = (height / 2) - (splash.size.Height / 2);
+ src = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.size.Width, (short)(splash.size.Height * 2));
+ Tao.Sdl.Sdl.SDL_FillRect(screen,ref src,baseColor);
+ src = splash.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)xpos, (short)ypos, (short)splash.size.Width, (short)(splash.size.Height));
+ Tao.Sdl.Sdl.SDL_BlitSurface(splash.surfacePtr(), ref src, screen, ref dst);
+ for (int i = 0; i < MAX_SPLASH_LINES; i++)
+ if (SPLASH_TEXT[i] != string.Empty)
+ drawText(screen,freesans, SPLASH_TEXT[i], Color.Black, xpos + 10, (ypos + splash.size.Height + 10) + (i * (2 + SPLASH_TEXT_HEIGHT)));
+ drawText(screen,freesans, "[" + SPLASH_PERCENT.ToString() + "%]", Color.Black, new Point(xpos + (splash.size.Height * 2) - 16, ypos + splash.size.Width - 20));
+ }
+
+ }
+
+ private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p)
+ {
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, 255, p.X, p.Y);
+ }
+ private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p, int alpha)
+ {
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, (byte)alpha, p.X, p.Y);
+ }
+
+ private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, int x, int y)
+ {
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, 255, x, y);
+ }
+
+ private void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, int x, int y)
+ {
+ drawText(screen, in_font, in_text, r, g, b, 255, x, y);
+ }
+
+ public void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y)
+ {
+ IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
+ Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
+ Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
+ Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)x, (short)y, src.w, src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
+ Sdl.SDL_FreeSurface(text);
+ }
+
+ public void updateSatellite(ref Surface s)
+ {
+ if (sat.DRAW_OPEN_AMOUNT > 0)
+ {
+ //if (satmap == null || satmap.surface.w != w || satmap.surface.h != h) satmap = new Surface(w, h, 16);
+
+ satmap = s;
+ }
+ }
+ }
+}
Added: branches/FreeTrainSDL/SDLGUIDrawer.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIDrawer.cs (rev 0)
+++ branches/FreeTrainSDL/SDLGUIDrawer.cs 2007-08-22 11:25:17 UTC (rev 164)
@@ -0,0 +1,395 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using Tao.Sdl;
+using org.kohsuke.directdraw;
+
+namespace FreeTrainSDL
+{
+ public enum GUI_DRAWER_Movements
+ {
+ NO_MOVEMENT,
+ DRAWER_OPENING,
+ DRAWER_CLOSING
+ };
+
+ public enum GUI_DRAWER_Alignment
+ {
+ TOP_DOWN,
+ RIGHT_LEFT,
+ BOTTOM_UP,
+ LEFT_RIGHT
+ };
+
+ public class SDLGUIDrawer
+ {
+ protected Rectangle DRAWER_TAB_POS;
+ protected Surface drawer, container, containerON;
+
+ protected int X_POSITION, Y_POSITION;
+ protected int X_POSITION_OFFSET, Y_POSITION_OFFSET;
+ protected int CLICK_X_MIN, CLICK_X_MAX, CLICK_Y_MIN, CLICK_Y_MAX;
+ protected int DRAWER_HEIGHT = 104;
+
+ protected int SCR_WIDTH, SCR_HEIGHT;
+
+ protected int REAL_Y_HEIGHT, MIN_SPEED = 15, LIST_BUTTONS = 5;
+
+ public int DRAW_OPEN_AMOUNT = 0;
+
+ protected bool drawHighlight = false;
+
+ public event EventHandler MenuItemClicked;
+
+ protected IntPtr freesans;
+
+ protected int currentArea = -1;
+
+ protected string[] LIST_TEXT = { "NEW","SAVE","LOAD","FULLSCREEN","EXIT" };
+
+ public Color drawerColor = Color.FromArgb(236, 236, 184), baseGUIColor = Color.FromArgb(252, 252, 236);
+
+ protected int dColor, bColor, wColor;
+
+ protected GUI_DRAWER_Movements drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
+ protected GUI_DRAWER_Alignment drawer_alignment = GUI_DRAWER_Alignment.TOP_DOWN;
+
+ public SDLGUIDrawer(int width, int height, int x_off, int y_off, IntPtr pf)
+ {
+ X_POSITION_OFFSET = x_off; // FROM RIGHT
+ Y_POSITION_OFFSET = y_off; // FROM TOP
+ X_POSITION = width - x_off;
+ Y_POSITION = y_off;
+
+ SCR_WIDTH = width;
+ SCR_HEIGHT = height;
+
+ drawer = new Surface(Application.StartupPath + "\\gui\\drawer.bmp");
+ container = new Surface(Application.StartupPath + "\\gui\\system.bmp");
+ containerON = new Surface(Application.StartupPath + "\\gui\\systemon.bmp");
+
+ DRAWER_TAB_POS = new Rectangle(X_POSITION, Y_POSITION, drawer.size.Width, drawer.size.Height);
+
+ CLICK_X_MIN = X_POSITION;
+ CLICK_X_MAX = X_POSITION + drawer.size.Width;
+
+ CLICK_Y_MIN = 0;
+ CLICK_Y_MAX = Y_POSITION + drawer.size.Height;
+
+ REAL_Y_HEIGHT = drawer.size.Height;
+
+ freesans = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", 14);
+
+ dColor = Sdl.SDL_MapRGB(pf, drawerColor.R, drawerColor.G, drawerColor.B);
+ bColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
+ wColor = Sdl.SDL_MapRGB(pf, 255,255,255);
+ }
+
+ public void updateDrawer(int width, int height)
+ {
+ SCR_WIDTH = width;
+ SCR_HEIGHT = height;
+
+ switch (drawer_movement)
+ {
+ case GUI_DRAWER_Movements.DRAWER_CLOSING:
+ DRAW_OPEN_AMOUNT /= 2;
+ if (DRAW_OPEN_AMOUNT <= 0)
+ {
+ DRAW_OPEN_AMOUNT = 0;
+ drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
+ }
+ break;
+ case GUI_DRAWER_Movements.DRAWER_OPENING:
+ if (DRAW_OPEN_AMOUNT == 0) DRAW_OPEN_AMOUNT = 1;
+ DRAW_OPEN_AMOUNT *= 2;
+ if (DRAW_OPEN_AMOUNT > 100)
+ {
+ DRAW_OPEN_AMOUNT = 100;
+ drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
+ }
+ break;
+ case GUI_DRAWER_Movements.NO_MOVEMENT:
+ //nothing as yet.
+ break;
+ }
+
+ if (drawer_alignment == GUI_DRAWER_Alignment.LEFT_RIGHT || drawer_alignment == GUI_DRAWER_Alignment.RIGHT_LEFT)
+ {
+ if (DRAW_OPEN_AMOUNT > 0) DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET) - (DRAWER_HEIGHT / (100/DRAW_OPEN_AMOUNT));
+ else DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET);
+ DRAWER_TAB_POS.Y = (Y_POSITION_OFFSET);
+
+ if (drawer_alignment == GUI_DRAWER_Alignment.RIGHT_LEFT)
+ {
+ CLICK_X_MIN = DRAWER_TAB_POS.X;
+ CLICK_X_MAX = SCR_WIDTH;
+ CLICK_Y_MIN = DRAWER_TAB_POS.Y;
+ CLICK_Y_MAX = DRAWER_TAB_POS.Y + REAL_Y_HEIGHT;
+ }
+ }
+ else
+ {
+ DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET);
+ if (DRAW_OPEN_AMOUNT > 0) DRAWER_TAB_POS.Y = Y_POSITION_OFFSET + (DRAWER_HEIGHT / (100/DRAW_OPEN_AMOUNT));
+ else DRAWER_TAB_POS.Y = (Y_POSITION_OFFSET);
+
+ if (drawer_alignment == GUI_DRAWER_Alignment.TOP_DOWN)
+ {
+ CLICK_X_MIN = DRAWER_TAB_POS.X;
+ CLICK_X_MAX = DRAWER_TAB_POS.X + drawer.size.Width;
+ CLICK_Y_MIN = 0;
+ CLICK_Y_MAX = DRAWER_TAB_POS.Y + drawer.size.Height;
+ }
+ }
+ }
+
+ public bool checkClick(Sdl.SDL_MouseButtonEvent e)
+ {
+ bool wasGUIClick = false;
+ int x = e.x, y = e.y;
+ if (x >= CLICK_X_MIN && x <= CLICK_X_MAX)
+ if (y >= CLICK_Y_MIN && y <= CLICK_Y_MAX)
+ {
+ if (e.button == Sdl.SDL_BUTTON_MIDDLE)
+ {
+ DRAWER_TAB_POS.Y = y;
+ }
+ else
+ {
+ if (currentArea >= 0 && MenuItemClicked != null && DRAW_OPEN_AMOUNT == 100) MenuItemClicked(currentArea, null);
+
+ if (drawer_movement == GUI_DRAWER_Movements.NO_MOVEMENT && DRAW_OPEN_AMOUNT == 0)
+ drawer_movement = GUI_DRAWER_Movements.DRAWER_OPENING;
+ else
+ drawer_movement = GUI_DRAWER_Movements.DRAWER_CLOSING;
+ }
+ wasGUIClick = true;
+ }
+ Console.WriteLine("CLICK!");
+ return wasGUIClick;
+ }
+
+ public void checkMovement(Sdl.SDL_MouseMotionEvent e)
+ {
+ drawHighlight = false;
+ switch (drawer_alignment)
+ {
+ case GUI_DRAWER_Alignment.LEFT_RIGHT:
+ if (e.x >= 0 && e.x <= (DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width))
+ if (e.y >= DRAWER_TAB_POS.Y && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT)) drawHighlight = true;
+ break;
+ case GUI_DRAWER_Alignment.TOP_DOWN:
+ currentArea = -1;
+ if (e.x >= DRAWER_TAB_POS.X && e.x <= (DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width))
+ if (e.y >= 0 && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT))
+ {
+ drawHighlight = true;
+ currentArea = (e.y - Y_POSITION_OFFSET - 4) / 18;
+ }
+ break;
+ case GUI_DRAWER_Alignment.RIGHT_LEFT:
+ if (e.x >= DRAWER_TAB_POS.X && e.x <= SCR_WIDTH)
+ if (e.y >= DRAWER_TAB_POS.Y && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT)) drawHighlight = true;
+ break;
+ case GUI_DRAWER_Alignment.BOTTOM_UP:
+ break;
+ }
+ }
+
+ public void drawDrawer(IntPtr screen, int width, int height)
+ {
+ Sdl.SDL_Rect src, dst;
+ if (DRAW_OPEN_AMOUNT > 0)
+ {
+ src = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 4), (short)(Y_POSITION), (short)(DRAWER_TAB_POS.Width - 9), (short)(DRAWER_TAB_POS.Y - 5));
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref src, dColor);
+ Tao.Sdl.SdlGfx.vlineColor(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(DRAWER_TAB_POS.Y + 4), (short)(Y_POSITION), 0);
+ Tao.Sdl.SdlGfx.vlineColor(screen, (short)((DRAWER_TAB_POS.X + 3) + (DRAWER_TAB_POS.Width - 8)), (short)(DRAWER_TAB_POS.Y + 4), (short)(Y_POSITION), 0);
+ }
+
+ src = drawer.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, (short)DRAWER_TAB_POS.Y, (short)drawer.size.Width, (short)drawer.size.Height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(drawer.surfacePtr(), ref src, screen, ref dst);
+
+ int fColor = 0;
+
+ if (DRAW_OPEN_AMOUNT > 0)
+ {
+ for (int cur = 0; cur < LIST_BUTTONS; cur++)
+ {
+ fColor = 0;
+ Tao.Sdl.SdlGfx.rectangleRGBA(screen,(short)(DRAWER_TAB_POS.X + 7),
+ (short)(DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20)),
+ (short)(DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width - 9),
+ (short)((DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20)) + 16),0,0,0,255);
+
+ if (currentArea == cur)
+ {
+ src=new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 8),
+ (short)(DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20) + 1),
+ (short)(DRAWER_TAB_POS.Width - 17),
+ (short)15);
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref src,0);
+ fColor = 255;
+ }
+ drawText(screen, freesans, LIST_TEXT[cur], (byte)fColor, (byte)fColor, (byte)fColor, 255, (DRAWER_TAB_POS.X + (DRAWER_TAB_POS.Width / 2)), DRAWER_TAB_POS.Y - (((LIST_BUTTONS - cur) * 20) + 2));
+ }
+ }
+
+ if (drawHighlight)
+ {
+ src = containerON.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, 0, (short)containerON.size.Width, (short)containerON.size.Height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(containerON.surfacePtr(), ref src, screen, ref dst);
+ }
+ else
+ {
+ src = container.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, 0, (short)container.size.Width, (short)container.size.Height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(container.surfacePtr(), ref src, screen, ref dst);
+ }
+ }
+
+ public void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y)
+ {
+ IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
+ Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
+ Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
+ Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)y, src.w, src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
+ Sdl.SDL_FreeSurface(text);
+ }
+ }
+
+ public class SDLGUIDrawerSatellite : SDLGUIDrawer
+ {
+ public SDLGUIDrawerSatellite(int w, int h, int x, int y, IntPtr pf) : base(w,h,x,y, pf)
+ {
+ drawer = new Surface(Application.StartupPath + "\\gui\\satdrawertop.bmp");
+ container = new Surface(Application.StartupPath + "\\gui\\sattext.bmp");
+ containerON = new Surface(Application.StartupPath + "\\gui\\sattexton.bmp");
+
+ DRAWER_TAB_POS = new Rectangle(X_POSITION, Y_POSITION, drawer.size.Width, drawer.size.Height);
+
+ drawer_alignment = GUI_DRAWER_Alignment.RIGHT_LEFT;
+
+ DRAWER_HEIGHT = 180;
+ REAL_Y_HEIGHT = SCR_HEIGHT - 58;
+
+ CLICK_X_MIN = X_POSITION;
+ CLICK_X_MAX = SCR_WIDTH;
+
+ CLICK_Y_MIN = Y_POSITION;
+ CLICK_Y_MAX = Y_POSITION + REAL_Y_HEIGHT;
+
+ for (int i = 0; i < MAX_TRAINS; i++) TrainStatus[i] = 0;
+ }
+
+ int TrainRegistryLeft, TrainRegistryTop, TrainRegistryButtonWidth = 25, TrainRegistryButtonHeight = 16, TrainRegistryButtonSpacing = 4;
+ const int MAX_TRAINS = 30;
+ public int[] TrainStatus = new int[MAX_TRAINS];
+
+ public void drawDrawer(IntPtr screen, int width, int height, Surface satmap)
+ {
+ Sdl.SDL_Rect src, dst;
+ src = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 3), (short)(DRAWER_TAB_POS.Y), (short)(SCR_WIDTH - 28 - DRAWER_TAB_POS.X), (short)(SCR_HEIGHT - 37 - 24));
+ if (DRAW_OPEN_AMOUNT > 0)
+ {
+ Sdl.SDL_FillRect(screen,ref src,dColor);
+
+ Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(SCR_WIDTH - 24), (short)(Y_POSITION),0,0,0,255);
+ Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(SCR_WIDTH - 26), (short)(SCR_HEIGHT - 37), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)((DRAWER_TAB_POS.X + 3) + (DRAWER_TAB_POS.Width - 8)), (short)(SCR_WIDTH - 26), (short)(SCR_HEIGHT - 37), 0, 0, 0, 255);
+
+ if (satmap != null)
+ {
+ src = new Sdl.SDL_Rect(0, 0, (short)satmap.surface.w, (short)satmap.surface.h);
+ dst = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 25), (short)(DRAWER_TAB_POS.Y + 10), (short)((SCR_WIDTH-35) - DRAWER_TAB_POS.X), (short)satmap.surface.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(satmap.surfacePtr(), ref src, screen, ref dst);
+ }
+
+ TrainRegistryLeft = DRAWER_TAB_POS.X + 25;
+ TrainRegistryTop = DRAWER_TAB_POS.Y + 200;
+
+ SdlGfx.rectangleRGBA(screen, (short)TrainRegistryLeft, (short)TrainRegistryTop, (short)(TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 3), (short)(TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2), 204, 204, 168, 255);
+ for (int curLine = 1; curLine < 6; curLine++)
+ {
+ if (curLine < 5) SdlGfx.vlineRGBA(screen, (short)(TrainRegistryLeft + 1 + (curLine * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing))), (short)(TrainRegistryTop), (short)(short)(TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 3), 204, 204, 168, 255);
+ SdlGfx.hlineRGBA(screen, (short)TrainRegistryLeft, (short)(TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 1), (short)(short)(TrainRegistryTop + (curLine * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 1), 204, 204, 168, 255);
+ }
+
+ for (int curTrain = 0; curTrain < MAX_TRAINS; curTrain++)
+ {
+ short x1 = (short)((TrainRegistryLeft + 3) + ((curTrain % 5) * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)));
+ short y1 = (short)(TrainRegistryTop + 3 + ((curTrain / 5) * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)));
+ if (TrainStatus[curTrain] >= 1)
+ {
+ SdlGfx.rectangleRGBA(screen, x1, y1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight), 84, 84, 152, 255);
+ SdlGfx.hlineRGBA(screen, x1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight - 1), 84, 84, 152, 255);
+ SdlGfx.hlineRGBA(screen, x1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight - 2), 84, 84, 152, 255);
+ dst = new Sdl.SDL_Rect((short)(x1 + 1), (short)(y1 + 1), (short)(TrainRegistryButtonWidth - 1), (short)(TrainRegistryButtonHeight - 3));
+ if (TrainStatus[curTrain] == 2)
+ Sdl.SDL_FillRect(screen, ref dst,0);
+ else if (TrainStatus[curTrain] == 3)
+ Sdl.SDL_FillRect(screen, ref dst, 2000);
+ drawText(screen, freesans, curTrain.ToString(), 0, 0, 0, 255, x1 + 13, y1 - 3);
+ }
+ else drawText(screen, freesans, curTrain.ToString(), 204, 204, 168, 255, x1 + 13, y1 - 3);
+
+ }
+ }
+
+ src = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X,(short)DRAWER_TAB_POS.Y,(short)(DRAWER_TAB_POS.Width-1),(short)(height - 62));
+ Tao.Sdl.Sdl.SDL_FillRect(screen,ref src,dColor);
+
+ Tao.Sdl.SdlGfx.rectangleRGBA(screen, (short)DRAWER_TAB_POS.X,
+ (short)DRAWER_TAB_POS.Y,
+ (short)(DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width - 1),
+ (short)(((SCR_HEIGHT - 38))), 0, 0, 0, 255);
+
+
+
+ DRAWER_TAB_POS.Y = Y_POSITION;
+
+ src = drawer.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X,(short)(DRAWER_TAB_POS.Y-1),src.w,src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(drawer.surfacePtr(), ref src, screen, ref dst);
+
+
+
+
+ if (drawHighlight)
+ {
+ src = containerON.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)(SCR_WIDTH - 25), (short)(DRAWER_TAB_POS.Y), src.w, src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(containerON.surfacePtr(), ref src, screen, ref dst);
+ }
+ else
+ {
+ src = container.clipSDLRect;
+ dst = new Sdl.SDL_Rect((short)(SCR_WIDTH - 25), (short)(DRAWER_TAB_POS.Y), src.w, src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(container.surfacePtr(), ref src, screen, ref dst);
+ }
+
+ Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(SCR_WIDTH - 25), (short)(SCR_WIDTH), (short)(Y_POSITION),0,0,0,255);
+ Tao.Sdl.SdlGfx.vlineRGBA(screen, (short)(SCR_WIDTH - 25), (short)(Y_POSITION + 100), (short)(SCR_HEIGHT - 42), 152, 152, 116, 255);
+
+
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 1), (short)(SCR_HEIGHT - 40),0,0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 1), (short)(SCR_HEIGHT - 39), 0, 0, 0, 255);
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 2), (short)(SCR_HEIGHT - 39), 0,0, 0, 255);
+ /*
+
+ Color[,] cols = new Color[2, 2];
+ cols[0, 0] = Color.Black;
+ cols[0, 1] = Color.Black;
+ cols[1, 0] = drawerColor;
+ cols[1, 1] = Color.Black;
+ screen.SetPixels(new Point(DRAWER_TAB_POS.X + 1, SCR_HEIGHT - 39), cols);*/
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-08-22 12:44:44
|
Revision: 185
http://freetrain.svn.sourceforge.net/freetrain/?rev=185&view=rev
Author: stevenhoefel
Date: 2007-08-22 05:44:36 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
Updated the main project to include all solutions that currently compile fine under the new SDL framework. removed the MagicLibrary stuffs... all looking good.
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/Program.cs
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-08-22 12:42:57 UTC (rev 184)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-08-22 12:44:36 UTC (rev 185)
@@ -35,10 +35,6 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Tao.Platform.Windows, Version=1.0.0.4, Culture=neutral, PublicKeyToken=701104b2da67a104, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>bin\Debug\Tao.Platform.Windows.dll</HintPath>
- </Reference>
<Reference Include="Tao.Sdl, Version=1.2.11.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\Debug\Tao.Sdl.dll</HintPath>
@@ -72,4 +68,8 @@
<Target Name="AfterBuild">
</Target>
-->
+ <PropertyGroup>
+ <PostBuildEvent>copy /Y "$(SolutionDir)gui\*.*" "$(TargetDir)gui"
+xcopy /Y /E "$(SolutionDir)plugins\*.*" "$(TargetDir)plugins"</PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2007-08-22 12:42:57 UTC (rev 184)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2007-08-22 12:44:36 UTC (rev 185)
@@ -11,6 +11,18 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.net", "lib\SDLGFX.net\SDL.net.csproj", "{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.HalfVoxelStructure", "plugins\jp.co.tripod.chiname.lib.halfvoxel\FreeTrain.HalfVoxelStructure.csproj", "{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ColorTestTrain", "plugins\org.kohsuke.freetrain.trains.colorTest\FreeTrain.ColorTestTrain.csproj", "{4380999E-CA4C-4AA2-8848-12FFABF72535}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ContribEx", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.ContribEx.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.DummyCars", "plugins\jp.co.tripod.chiname.lib\src\DummyCars\FreeTrain.DummyCars.csproj", "{733996EC-7260-4A94-B118-D1E957F0474D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.RoadAccessory", "plugins\jp.co.tripod.chiname.lib\src\RoadAccessory\FreeTrain.RoadAccessory.csproj", "{7264D32E-75DB-4C13-9EE4-E6263FD5B652}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\org.kohsuke.freetrain.land.477\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -37,6 +49,30 @@
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.Build.0 = Release|Any CPU
+ {733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {733996EC-7260-4A94-B118-D1E957F0474D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {733996EC-7260-4A94-B118-D1E957F0474D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7264D32E-75DB-4C13-9EE4-E6263FD5B652}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2007-08-22 12:42:57 UTC (rev 184)
+++ branches/FreeTrainSDL/Program.cs 2007-08-22 12:44:36 UTC (rev 185)
@@ -6,7 +6,7 @@
using System.Runtime.InteropServices;
using Tao.Sdl;
-using Tao.Platform.Windows;
+//using Tao.Platform.Windows;
using org.kohsuke.directdraw;
using freetrain.world;
@@ -41,7 +41,7 @@
static int CURRENT_BPP = 16;
- Surface tmp, satmap;
+ Surface tmp;
ModalController controller = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-08-22 13:19:59
|
Revision: 187
http://freetrain.svn.sourceforge.net/freetrain/?rev=187&view=rev
Author: stevenhoefel
Date: 2007-08-22 06:20:00 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
GUI images/fonts.
Added Paths:
-----------
branches/FreeTrainSDL/gui/
branches/FreeTrainSDL/gui/FreeSans.ttf
branches/FreeTrainSDL/gui/botleft.bmp
branches/FreeTrainSDL/gui/botright.bmp
branches/FreeTrainSDL/gui/drawer.bmp
branches/FreeTrainSDL/gui/satdrawertop.bmp
branches/FreeTrainSDL/gui/sattext.bmp
branches/FreeTrainSDL/gui/sattexton.bmp
branches/FreeTrainSDL/gui/splash.bmp
branches/FreeTrainSDL/gui/system.bmp
branches/FreeTrainSDL/gui/systemon.bmp
branches/FreeTrainSDL/gui/top.bmp
Added: branches/FreeTrainSDL/gui/FreeSans.ttf
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/FreeSans.ttf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/botleft.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/botleft.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/botright.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/botright.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/drawer.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/drawer.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/satdrawertop.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/satdrawertop.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/sattext.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/sattext.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/sattexton.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/sattexton.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/splash.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/splash.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/system.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/system.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/systemon.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/systemon.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/gui/top.bmp
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/gui/top.bmp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-08-22 13:30:08
|
Revision: 188
http://freetrain.svn.sourceforge.net/freetrain/?rev=188&view=rev
Author: stevenhoefel
Date: 2007-08-22 06:30:10 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
Sound manager doesn't exist and the Controls Build Events were hardcoded to DIRs (not good).
Fixed.
A fresh checkout of this project compiles and runs great :)
Modified Paths:
--------------
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2007-08-22 13:20:00 UTC (rev 187)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2007-08-22 13:30:10 UTC (rev 188)
@@ -58,12 +58,12 @@
/// that can take time.
/// </summary>
public static void PlaySynchronousSound( string fileName ) {
- if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
- sndPlaySound(fileName,0);
+ //if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
+ // sndPlaySound(fileName,0);
}
public static void PlayAsynchronousSound( string fileName ) {
- if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
- sndPlaySound(fileName,1);
+ //if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
+ // sndPlaySound(fileName,1);
}
}
}
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2007-08-22 13:20:00 UTC (rev 187)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2007-08-22 13:30:10 UTC (rev 188)
@@ -155,6 +155,6 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>copy "$(ProjectDir)bin\Release\*.dll" "$(SolutionDir)core\Debug\"</PostBuildEvent>
+ <PostBuildEvent>copy "$(TargetDir)*.dll" "$(SolutionDir)core\Debug\"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-08-23 12:26:40
|
Revision: 189
http://freetrain.svn.sourceforge.net/freetrain/?rev=189&view=rev
Author: stevenhoefel
Date: 2007-08-23 05:26:42 -0700 (Thu, 23 Aug 2007)
Log Message:
-----------
Added a real timer... didn't decrease CPU load by much at all.
Updated the satellite map to actually draw correctly (attempted implementation of 45degree rotation since make is rotated normally. failed.)
And also made the train numbers click-able on the sat map 'drawer'/'tab'/'thingy'.
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIDrawer.cs
branches/FreeTrainSDL/core/world/World.cs
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2007-08-22 13:30:10 UTC (rev 188)
+++ branches/FreeTrainSDL/Program.cs 2007-08-23 12:26:42 UTC (rev 189)
@@ -38,6 +38,7 @@
bool quitFlag = false;
Sdl.SDL_VideoInfo videoInfo;
Sdl.SDL_PixelFormat pixelFormat;
+ Sdl.SDL_Event evt;
static int CURRENT_BPP = 16;
@@ -141,12 +142,16 @@
gui.SHOW_SPLASH = false;
- Sdl.SDL_Event evt;
-
- int result;
+ Timer timer = new Timer();
+ timer.Tick += new EventHandler(timer_Tick);
+ timer.Interval = 33;
+ timer.Enabled = true;
+ timer.Start();
+
while (quitFlag == false)
{
- result = Sdl.SDL_PollEvent(out evt);
+ //do shit all.
+ int result = Sdl.SDL_PollEvent(out evt);
switch (evt.type)
{
case Sdl.SDL_QUIT:
@@ -159,7 +164,7 @@
width = evt.resize.w;
height = evt.resize.h;
screen = Sdl.SDL_SetVideoMode(width, height, CURRENT_BPP, flags);
- weatherOverlay.setSize(new Size(width,height));
+ weatherOverlay.setSize(new Size(width, height));
qview.size = new Size(evt.resize.w, evt.resize.h);
break;
case Sdl.SDL_MOUSEBUTTONDOWN:
@@ -171,7 +176,7 @@
case Sdl.SDL_MOUSEMOTION:
Events_MouseMotion(evt.motion);
break;
- }
+ }
//Sdl.SDL_Rect current_view = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
//Tao.Sdl.Sdl.SDL_FillRect(screen, ref current_view, Sdl.SDL_MapRGB(videoInfo.vfmt, 0, 100, 0));
@@ -179,41 +184,52 @@
if (qview != null)
{
controller = MainWindow.mainWindow.currentController;
- clock = World.world.clock;
- clock.tick();
+ //clock =
//clock.tick();
+ //clock.tick();
qview.updateScreen();
if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
{
World.world.satellite = new Surface(150, 150, 32);
- World.world.satellite.fill(Color.FromArgb(222,195,132));
+ World.world.satellite.fill(Color.FromArgb(222, 195, 132));
}
for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
{
Train t = (Train)World.world.rootTrainGroup.items.get(i);
- if (t.state == Train.State.Moving)
+ if (t.state == Train.State.Moving)
gui.updateTrainStatus(i, 3);
- else if (t.isPlaced)
+ else if (t.isPlaced)
gui.updateTrainStatus(i, 2);
- else
+ else
gui.updateTrainStatus(i, 1);
+
+ if (i == gui.sat.selectedTrain) gui.sat.currentTrainText = t.name;
}
gui.updateSatellite(ref World.world.satellite);
+ }
+ Application.DoEvents();
+ }
+ timer.Stop();
+ }
- source_rect = new Sdl.SDL_Rect((short)scrollPos.X, (short)scrollPos.Y, (short)width, (short)height);
- dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
- Tao.Sdl.Sdl.SDL_BlitSurface(qview.offscreenBuffer.surfacePtr(), ref source_rect, screen, ref dst);
- //Tao.Sdl.Sdl.SDL_BlitSurface(tmp.surfacePtr(), ref dst, screen, ref dst);
- }
+ void timer_Tick(object sender, EventArgs e)
+ {
+ if (qview != null)
+ {
+ World.world.clock.tick();
+ source_rect = new Sdl.SDL_Rect((short)scrollPos.X, (short)scrollPos.Y, (short)width, (short)height);
+ dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
+ Tao.Sdl.Sdl.SDL_BlitSurface(qview.offscreenBuffer.surfacePtr(), ref source_rect, screen, ref dst);
+ //Tao.Sdl.Sdl.SDL_BlitSurface(tmp.surfacePtr(), ref dst, screen, ref dst);
+ }
- finalDraw();
- }
+ finalDraw();
}
void finalDraw()
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2007-08-22 13:30:10 UTC (rev 188)
+++ branches/FreeTrainSDL/SDLGUI.cs 2007-08-23 12:26:42 UTC (rev 189)
@@ -31,7 +31,7 @@
SDLGUIDrawer system;
- SDLGUIDrawerSatellite sat;
+ public SDLGUIDrawerSatellite sat;
public EventHandler SystemMenuClick;
Modified: branches/FreeTrainSDL/SDLGUIDrawer.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIDrawer.cs 2007-08-22 13:30:10 UTC (rev 188)
+++ branches/FreeTrainSDL/SDLGUIDrawer.cs 2007-08-23 12:26:42 UTC (rev 189)
@@ -52,7 +52,7 @@
public Color drawerColor = Color.FromArgb(236, 236, 184), baseGUIColor = Color.FromArgb(252, 252, 236);
- protected int dColor, bColor, wColor;
+ protected int dColor, bColor, wColor, tPlacedColor, tMovingColor;
protected GUI_DRAWER_Movements drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
protected GUI_DRAWER_Alignment drawer_alignment = GUI_DRAWER_Alignment.TOP_DOWN;
@@ -86,6 +86,7 @@
dColor = Sdl.SDL_MapRGB(pf, drawerColor.R, drawerColor.G, drawerColor.B);
bColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
wColor = Sdl.SDL_MapRGB(pf, 255,255,255);
+ tPlacedColor = Sdl.SDL_MapRGB(pf, 150,150,150);
}
public void updateDrawer(int width, int height)
@@ -256,12 +257,15 @@
public void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y)
{
- IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
- Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
- Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
- Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)y, src.w, src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
- Sdl.SDL_FreeSurface(text);
+ if (in_text != string.Empty)
+ {
+ IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
+ Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
+ Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
+ Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)y, src.w, src.h);
+ Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
+ Sdl.SDL_FreeSurface(text);
+ }
}
}
@@ -289,10 +293,45 @@
for (int i = 0; i < MAX_TRAINS; i++) TrainStatus[i] = 0;
}
+ public int selectedTrain = -1;
int TrainRegistryLeft, TrainRegistryTop, TrainRegistryButtonWidth = 25, TrainRegistryButtonHeight = 16, TrainRegistryButtonSpacing = 4;
const int MAX_TRAINS = 30;
public int[] TrainStatus = new int[MAX_TRAINS];
+ new public EventHandler MenuItemClicked;
+
+ public string currentTrainText;
+
+ new public bool checkClick(Sdl.SDL_MouseButtonEvent e)
+ {
+ bool wasGUIClick = false;
+ int x = e.x, y = e.y;
+ if (x >= CLICK_X_MIN && x <= CLICK_X_MAX)
+ if (y >= CLICK_Y_MIN && y <= CLICK_Y_MAX)
+ {
+ if ((x >= TrainRegistryLeft && x <= (TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 3)) &&
+ y <= (TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2) && y >= TrainRegistryTop)
+ {
+ selectedTrain = (x-TrainRegistryLeft)/(TrainRegistryButtonWidth + TrainRegistryButtonSpacing) + (((y-TrainRegistryTop)/(TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) * 5);
+ //Console.WriteLine(curTrain);
+ currentTrainText = "";
+ }
+ else
+ {
+
+ if (currentArea >= 0 && MenuItemClicked != null && DRAW_OPEN_AMOUNT == 100) MenuItemClicked(currentArea, null);
+
+ if (drawer_movement == GUI_DRAWER_Movements.NO_MOVEMENT && DRAW_OPEN_AMOUNT == 0)
+ drawer_movement = GUI_DRAWER_Movements.DRAWER_OPENING;
+ else
+ drawer_movement = GUI_DRAWER_Movements.DRAWER_CLOSING;
+ }
+ wasGUIClick = true;
+ }
+ Console.WriteLine("CLICK!");
+ return wasGUIClick;
+ }
+
public void drawDrawer(IntPtr screen, int width, int height, Surface satmap)
{
Sdl.SDL_Rect src, dst;
@@ -334,13 +373,19 @@
dst = new Sdl.SDL_Rect((short)(x1 + 1), (short)(y1 + 1), (short)(TrainRegistryButtonWidth - 1), (short)(TrainRegistryButtonHeight - 3));
if (TrainStatus[curTrain] == 2)
Sdl.SDL_FillRect(screen, ref dst,0);
- else if (TrainStatus[curTrain] == 3)
- Sdl.SDL_FillRect(screen, ref dst, 2000);
- drawText(screen, freesans, curTrain.ToString(), 0, 0, 0, 255, x1 + 13, y1 - 3);
+ else if (TrainStatus[curTrain] == 3)
+ Sdl.SDL_FillRect(screen, ref dst, wColor);
+ if (curTrain == selectedTrain) drawText(screen, freesans, curTrain.ToString(), 200, 0, 0, 255, x1 + 13, y1 - 3);
+ else drawText(screen, freesans, curTrain.ToString(), 0, 0, 0, 255, x1 + 13, y1 - 3);
}
else drawText(screen, freesans, curTrain.ToString(), 204, 204, 168, 255, x1 + 13, y1 - 3);
}
+
+ if (selectedTrain >= 0)
+ {
+ drawText(screen, freesans, currentTrainText, 0, 0, 0, 255, TrainRegistryLeft + ((5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing))/2), (TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2) + 20);
+ }
}
src = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X,(short)DRAWER_TAB_POS.Y,(short)(DRAWER_TAB_POS.Width-1),(short)(height - 62));
Modified: branches/FreeTrainSDL/core/world/World.cs
===================================================================
--- branches/FreeTrainSDL/core/world/World.cs 2007-08-22 13:30:10 UTC (rev 188)
+++ branches/FreeTrainSDL/core/world/World.cs 2007-08-23 12:26:42 UTC (rev 189)
@@ -472,8 +472,9 @@
public void onVoxelUpdated(Voxel v) {
onVoxelUpdated(v.location);
- Point p = new Point((int)(Math.Round(v.location.x * Math.Cos(45) + v.location.y * Math.Sin(45)) - world.size.x / 2),
- (int)(Math.Round(-v.location.x * Math.Sin(45) + v.location.y * Math.Cos(45)) + world.size.y / 2));
+ //Point p = new Point((int)(Math.Round(v.location.x * Math.Cos(45) + v.location.y * Math.Sin(45)) - world.size.x / 2),
+ // (int)(Math.Round(-v.location.x * Math.Sin(45) + v.location.y * Math.Cos(45)) + world.size.y / 2));
+ Point p = new Point(v.location.x, v.location.y);
if (satellite != null) satellite.SetPixel(p, v.getColorOfTile());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-09-05 10:50:05
|
Revision: 190
http://freetrain.svn.sourceforge.net/freetrain/?rev=190&view=rev
Author: stevenhoefel
Date: 2007-09-05 03:50:07 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
Force x86... Works on x64 now... anyone wanna update the Trunk too? :)
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
branches/FreeTrainSDL/lib/DirectAudio.net/DirectAudio.net.csproj
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -16,6 +16,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -24,6 +25,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -42,6 +44,16 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\Settings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ <DependentUpon>Settings.settings</DependentUpon>
+ </Compile>
<Compile Include="SDLGUI.cs" />
<Compile Include="SDLGUIDrawer.cs">
<SubType>Code</SubType>
@@ -58,8 +70,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Folder Include="Properties\" />
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -25,6 +25,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -48,6 +49,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/lib/DirectAudio.net/DirectAudio.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/DirectAudio.net/DirectAudio.net.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/lib/DirectAudio.net/DirectAudio.net.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -9,6 +9,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
@@ -16,6 +17,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>..\..\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -29,6 +29,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -52,6 +53,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2007-08-23 12:26:42 UTC (rev 189)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2007-09-05 10:50:07 UTC (rev 190)
@@ -23,6 +23,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -35,6 +36,7 @@
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-09-11 20:54:19
|
Revision: 191
http://freetrain.svn.sourceforge.net/freetrain/?rev=191&view=rev
Author: stevenhoefel
Date: 2007-09-11 13:54:23 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Forgot to add the resource/settings files to the repository.
Added Paths:
-----------
branches/FreeTrainSDL/FreeTrainSDL.csproj.user
branches/FreeTrainSDL/Properties/
branches/FreeTrainSDL/Properties/Resources.Designer.cs
branches/FreeTrainSDL/Properties/Resources.resx
branches/FreeTrainSDL/Properties/Settings.Designer.cs
branches/FreeTrainSDL/Properties/Settings.settings
Added: branches/FreeTrainSDL/FreeTrainSDL.csproj.user
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj.user (rev 0)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj.user 2007-09-11 20:54:23 UTC (rev 191)
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <PublishUrlHistory>publish\</PublishUrlHistory>
+ <InstallUrlHistory>
+ </InstallUrlHistory>
+ <SupportUrlHistory>
+ </SupportUrlHistory>
+ <UpdateUrlHistory>
+ </UpdateUrlHistory>
+ <BootstrapperUrlHistory>
+ </BootstrapperUrlHistory>
+ <ApplicationRevision>0</ApplicationRevision>
+ <FallbackCulture>en-US</FallbackCulture>
+ <VerifyUploadedFiles>false</VerifyUploadedFiles>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: branches/FreeTrainSDL/Properties/Resources.Designer.cs
===================================================================
--- branches/FreeTrainSDL/Properties/Resources.Designer.cs (rev 0)
+++ branches/FreeTrainSDL/Properties/Resources.Designer.cs 2007-09-11 20:54:23 UTC (rev 191)
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.42
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FreeTrainSDL.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FreeTrainSDL.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
Added: branches/FreeTrainSDL/Properties/Resources.resx
===================================================================
--- branches/FreeTrainSDL/Properties/Resources.resx (rev 0)
+++ branches/FreeTrainSDL/Properties/Resources.resx 2007-09-11 20:54:23 UTC (rev 191)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 1.3
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">1.3</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1">this is my long string</data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ [base64 mime encoded serialized .NET Framework object]
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ [base64 mime encoded string representing a byte array form of the .NET Framework object]
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>1.3</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: branches/FreeTrainSDL/Properties/Settings.Designer.cs
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.Designer.cs (rev 0)
+++ branches/FreeTrainSDL/Properties/Settings.Designer.cs 2007-09-11 20:54:23 UTC (rev 191)
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.42
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FreeTrainSDL.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
Added: branches/FreeTrainSDL/Properties/Settings.settings
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.settings (rev 0)
+++ branches/FreeTrainSDL/Properties/Settings.settings 2007-09-11 20:54:23 UTC (rev 191)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+ <Profiles>
+ <Profile Name="(Default)" />
+ </Profiles>
+</SettingsFile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2007-09-25 05:12:41
|
Revision: 192
http://freetrain.svn.sourceforge.net/freetrain/?rev=192&view=rev
Author: stevenhoefel
Date: 2007-09-24 22:12:44 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
Build warning fixes. (XML, etc...)
BGMManager updates (now includes 'jukebox' functionality)
Huge namespace chande :(
More ToolBar icons
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/FreeTrainSDL.csproj.user
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.resx
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.resx
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/ConfigDialog.cs
branches/FreeTrainSDL/core/framework/Core.cs
branches/FreeTrainSDL/core/framework/GlobalOptions.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/NullWeatherOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/WeatherOverlay.cs
branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/world/Direction.cs
branches/FreeTrainSDL/core/world/DrawContext.cs
branches/FreeTrainSDL/core/world/EmptyVoxel.cs
branches/FreeTrainSDL/core/world/Location.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/World.cs
branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/rail/YardRailRoad.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/Structure.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/lib/SDLGFX.net/AssemblyInfo.cs
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Util.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/src/VinylHouseBuilder.cs
Added Paths:
-----------
branches/FreeTrainSDL/gui/land.png
branches/FreeTrainSDL/gui/land_down.png
branches/FreeTrainSDL/gui/rail.png
branches/FreeTrainSDL/gui/rail_down.png
branches/FreeTrainSDL/gui/station.png
branches/FreeTrainSDL/gui/station_down.png
branches/FreeTrainSDL/gui/struct.png
branches/FreeTrainSDL/gui/struct_down.png
branches/FreeTrainSDL/gui/train.png
branches/FreeTrainSDL/gui/train_down.png
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-09-25 05:12:44 UTC (rev 192)
@@ -10,6 +10,19 @@
<RootNamespace>FreeTrainSDL</RootNamespace>
<AssemblyName>FreeTrainSDL</AssemblyName>
<StartupObject>FreeTrainSDL.FreeTrainSDL</StartupObject>
+ <PublishUrl>http://localhost/FreeTrainSDL/</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Web</InstallFrom>
+ <UpdateEnabled>true</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>true</IsWebBootstrapper>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -55,6 +68,7 @@
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="SDLGUI.cs" />
+ <Compile Include="SDLGUIButton.cs" />
<Compile Include="SDLGUIDrawer.cs">
<SubType>Code</SubType>
</Compile>
@@ -82,6 +96,13 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj.user
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj.user 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj.user 2007-09-25 05:12:44 UTC (rev 192)
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <PublishUrlHistory>publish\</PublishUrlHistory>
+ <PublishUrlHistory>http://localhost/FreeTrainSDL/|publish\</PublishUrlHistory>
<InstallUrlHistory>
</InstallUrlHistory>
<SupportUrlHistory>
@@ -13,4 +13,7 @@
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2007-09-25 05:12:44 UTC (rev 192)
@@ -1,14 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
+# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrainSDL", "FreeTrainSDL.csproj", "{B43DC0F1-5C4B-490F-8171-C3754A02D605}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Core", "core\FreeTrain.Core.csproj", "{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.Controls", "lib\Controls\FreeTrain.Controls.csproj", "{D3B86CCE-530E-4472-AE8E-3FA5F903C206}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DirectAudio.net", "lib\DirectAudio.net\DirectAudio.net.csproj", "{0616A314-BDF0-466D-AB4B-9FA1B071A8A2}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL.net", "lib\SDLGFX.net\SDL.net.csproj", "{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.HalfVoxelStructure", "plugins\jp.co.tripod.chiname.lib.halfvoxel\FreeTrain.HalfVoxelStructure.csproj", "{FBA1BF4E-5481-41AC-BED0-6D6326CC4C2F}"
@@ -41,10 +39,6 @@
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3B86CCE-530E-4472-AE8E-3FA5F903C206}.Release|Any CPU.Build.0 = Release|Any CPU
- {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0616A314-BDF0-466D-AB4B-9FA1B071A8A2}.Release|Any CPU.Build.0 = Release|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/Program.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -6,8 +6,7 @@
using System.Runtime.InteropServices;
using Tao.Sdl;
-//using Tao.Platform.Windows;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.world;
using freetrain.world.rail;
@@ -68,8 +67,6 @@
World w = null;
WeatherOverlay weatherOverlay;
- Clock clock = null;
-
Sdl.SDL_Rect source_rect,dst;
/// <summary>
@@ -88,13 +85,22 @@
gui.addSplashText(msg.Replace('\n',' '), progress);
}
+ public void musicHasStopped()
+ {
+ Core.bgmManager.nextSong();
+ }
+
public void Go()
{
dragStartMousePos = new Point(0, 0);
dragStartScrollPos = new Point(0, 0);
scrollPos = new Point(0, 0);
- Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING);
+ Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING | Sdl.SDL_INIT_AUDIO);
+ SdlMixer.Mix_OpenAudio(SdlMixer.MIX_DEFAULT_FREQUENCY, unchecked(Sdl.AUDIO_S16LSB), 2, 1024);
+ SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(musicHasStopped);
+ SdlMixer.Mix_HookMusicFinished(musicStopped);
+
Sdl.SDL_WM_SetCaption("FreeTrain SDL", "");
screen = Sdl.SDL_SetVideoMode(
width,
@@ -110,8 +116,15 @@
}
gui = new SDLGUI();
- gui.SystemMenuClick += new EventHandler(sysMenuClick);
+ gui.ButtonClick += new EventHandler(GUIButtonClick);
gui.initGUI(width, height, videoInfo.vfmt);
+ gui.addButton("rail","Railroad Construction");
+ gui.addButton("station","Station Construction");
+ gui.addButton("train","Train Stuff");
+ gui.addButton("land","Modify Terrain");
+ gui.addButton("struct", "Structure Construction");
+ gui.addButton("playlist", "Music Playlist");
+
gui.clock_text = "Initialising...";
updateMessage("FreeTrain SDL Starting...", -1);
@@ -158,7 +171,7 @@
quitFlag = true;
break;
case Sdl.SDL_KEYDOWN:
- if ((evt.key.keysym.sym == (int)Sdl.SDLK_ESCAPE) || (evt.key.keysym.sym == (int)Sdl.SDLK_q)) quitFlag = true;
+ Events_KeyDown(evt.key);
break;
case Sdl.SDL_VIDEORESIZE:
width = evt.resize.w;
@@ -184,9 +197,6 @@
if (qview != null)
{
controller = MainWindow.mainWindow.currentController;
- //clock =
- //clock.tick();
- //clock.tick();
qview.updateScreen();
if (World.world.satellite == null || World.world.satellite.surface.w != 150 || World.world.satellite.surface.h != 150)
@@ -195,7 +205,7 @@
World.world.satellite.fill(Color.FromArgb(222, 195, 132));
}
- for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
+ /*for (int i = 0; i < World.world.rootTrainGroup.items.Count; i++)
{
Train t = (Train)World.world.rootTrainGroup.items.get(i);
if (t.state == Train.State.Moving)
@@ -208,12 +218,15 @@
if (i == gui.sat.selectedTrain) gui.sat.currentTrainText = t.name;
}
- gui.updateSatellite(ref World.world.satellite);
+ gui.updateSatellite(ref World.world.satellite);*/
}
Application.DoEvents();
}
+
+ SdlMixer.Mix_CloseAudio();
+
timer.Stop();
}
@@ -222,6 +235,11 @@
if (qview != null)
{
World.world.clock.tick();
+ World.world.clock.tick();
+ //World.world.clock.tick();
+ //World.world.clock.tick();
+ //World.world.clock.tick();
+ //World.world.clock.tick();
source_rect = new Sdl.SDL_Rect((short)scrollPos.X, (short)scrollPos.Y, (short)width, (short)height);
dst = new Sdl.SDL_Rect(0, 0, (short)width, (short)height);
Tao.Sdl.Sdl.SDL_BlitSurface(qview.offscreenBuffer.surfacePtr(), ref source_rect, screen, ref dst);
@@ -237,7 +255,7 @@
if (gui != null)
{
gui.updateGUIElements(width, height);
- if (clock != null) gui.clock_text = clock.displayString;
+ if (World.world != null) gui.clock_text = World.world.clock.displayString;
gui.drawGUI(width, height, screen);
}
int result = Sdl.SDL_Flip(screen);
@@ -247,14 +265,30 @@
{
}
- void sysMenuClick(object sender, EventArgs e)
+ void GUIButtonClick(object sender, EventArgs e)
{
- switch ((int)sender)
+ switch ((string)sender)
{
- case 0:
+ case "rail":
RailRoadController.create();
break;
- case 1:
+ case "station":
+ PlatformController.create();
+ break;
+ case "train":
+ TrainPlacementController.create();
+ break;
+ case "land":
+ MountainController.create();
+ break;
+ case "struct":
+ VarHeightBuildingController.create();
+ break;
+ case "playlist":
+ BGMPlaylist bgmplaylist = new BGMPlaylist();
+ bgmplaylist.Show();
+ break;
+ /*case 1:
TrainTradingDialog t = new TrainTradingDialog();
t.ShowDialog();
t.Dispose();
@@ -262,10 +296,10 @@
break;
case 2:
- MountainController.create();
+
break;
case 3:
- /*if (screen.FullScreen)
+ if (screen.FullScreen)
{
width = old_width;
height = old_height;
@@ -279,8 +313,8 @@
}
bool new_FS = !screen.FullScreen;
screen = Video.SetVideoMode(width, height, CURRENT_BPP, true, false, new_FS);
- //qview.size = new Size(width, height);
- break;*/
+ qview.size = new Size(width, height);
+ break;
StationaryStructPlacementController.create();
VarHeightBuildingController.create();
@@ -289,7 +323,7 @@
case 4:
quitFlag = true;
- break;
+ break;*/
}
}
@@ -302,6 +336,19 @@
//
}
+ void Events_KeyDown(Sdl.SDL_KeyboardEvent e)
+ {
+ switch (e.keysym.sym) {
+ case (int)Sdl.SDLK_ESCAPE:
+ case (int)Sdl.SDLK_q:
+ quitFlag = true;
+ break;
+ case (int)Sdl.SDLK_b:
+ RailRoadController.create();
+ break;
+ }
+ }
+
short old_x, old_y;
void Events_MouseMotion(Sdl.SDL_MouseMotionEvent e)
{
@@ -441,4 +488,4 @@
Dispose();
}
}
-}
\ No newline at end of file
+}
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/SDLGUI.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -5,7 +5,7 @@
using System.Windows.Forms;
using System.Drawing;
using Tao.Sdl;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace FreeTrainSDL
{
@@ -13,12 +13,11 @@
{
private Color baseGUIColor, shadeGUIColor, drawerGUIColor;
private int baseColor, shadeColor;
- private Surface bot_right, bot_left, top_bar, splash, satmap;
- //private SdlDotNet.Graphics.Font font;
+ private Surface top_bar, splash; //, satmap, bot_right, bot_left;
private IntPtr freesans;
- int BOTTOM_GUI_HEIGHT = 25;
- public int SIDE_GUI_WIDTH = 25;
+ //int BOTTOM_GUI_HEIGHT = 25;
+ //public int SIDE_GUI_WIDTH = 25;
public int TOP_GUI_HEIGHT = 24;
int MAX_SPLASH_LINES = 10;
@@ -29,12 +28,12 @@
protected int SPLASH_TEXT_HEIGHT = 10;
protected int SPLASH_PERCENT = 0;
- SDLGUIDrawer system;
+ public EventHandler ButtonClick;
- public SDLGUIDrawerSatellite sat;
+ const int MAX_BUTTONS = 16;
+
+ private SDLGUIButton[] top_toolbar;
- public EventHandler SystemMenuClick;
-
public SDLGUI()
{
SdlTtf.TTF_Init();
@@ -43,23 +42,24 @@
drawerGUIColor = Color.FromArgb(236, 236, 184);
}
- public void updateTrainStatus(int index, int status)
- {
- sat.TrainStatus[index] = status;
- }
-
public void initGUI(int width, int height, IntPtr pf)
{
baseColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
shadeColor = Sdl.SDL_MapRGB(pf, shadeGUIColor.R, shadeGUIColor.G, shadeGUIColor.B);
+
+ top_toolbar = new SDLGUIButton[MAX_BUTTONS];
+
+ /*rail = new SDLGUIButton("rail","Railroad Construction", 10, 10);
+ if (ButtonClick != null) rail.ButtonClick += ButtonClick;
+
+ station = new SDLGUIButton("station","Station Construction", 10, 10);
+ if (ButtonClick != null) station.ButtonClick += ButtonClick;
+
+ station = new SDLGUIButton("station","Station Construction", 10, 10);
+ if (ButtonClick != null) station.ButtonClick += ButtonClick;*/
- bot_right = new Surface(Application.StartupPath + "\\gui\\botright.bmp");
- bot_left = new Surface(Application.StartupPath + "\\gui\\botleft.bmp");
top_bar = new Surface(Application.StartupPath + "\\gui\\top.bmp");
splash = new Surface(Application.StartupPath + "\\gui\\splash.bmp");
- system = new SDLGUIDrawer(width, height, 400, 15, pf);
- if (SystemMenuClick != null) system.MenuItemClicked += new EventHandler(SystemMenuClick);
- sat = new SDLGUIDrawerSatellite(width, height, 34, 24, pf);
freesans = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", SPLASH_TEXT_HEIGHT);
SPLASH_TEXT = new string[MAX_SPLASH_LINES];
for (int cur = 0; cur < MAX_SPLASH_LINES; cur++) SPLASH_TEXT[cur] = string.Empty;
@@ -67,22 +67,15 @@
public void checkMouseMovement(Sdl.SDL_MouseMotionEvent e)
{
- system.checkMovement(e);
- sat.checkMovement(e);
+ for (int i = 0; i < MAX_BUTTONS; i++) if (top_toolbar[i] != null) top_toolbar[i].checkMovement(e);
}
public bool checkIfGUIClick(Sdl.SDL_MouseButtonEvent e)
{
bool wasGUIClick = false;
- if (!system.checkClick(e))
- {
- if (!sat.checkClick(e))
- {
- //yada
- }
- else wasGUIClick = true;
-
- } else wasGUIClick = true;
+ for (int i = 0; i < MAX_BUTTONS; i++) {
+ if (!wasGUIClick && top_toolbar[i] != null) wasGUIClick = top_toolbar[i].checkClick(e);
+ }
return wasGUIClick;
}
@@ -99,8 +92,7 @@
public void updateGUIElements(int width, int height)
{
- system.updateDrawer(width, height);
- sat.updateDrawer(width, height);
+
}
public void drawGUI(int width, int height, IntPtr screen)
@@ -117,9 +109,9 @@
Tao.Sdl.Sdl.SDL_BlitSurface(top_bar.surfacePtr(), ref dst, screen, ref src);
}
- system.drawDrawer(screen,width,height);
+ for (int i = 0; i < MAX_BUTTONS; i++) if (top_toolbar[i] != null) top_toolbar[i].draw(screen);
- Sdl.SDL_Rect current = new Sdl.SDL_Rect((short)(width - SIDE_GUI_WIDTH), (short)TOP_GUI_HEIGHT, (short)width, (short)height);
+ /*Sdl.SDL_Rect current = new Sdl.SDL_Rect((short)(width - SIDE_GUI_WIDTH), (short)TOP_GUI_HEIGHT, (short)width, (short)height);
Tao.Sdl.Sdl.SDL_FillRect(screen, ref current, baseColor);
current = new Sdl.SDL_Rect(0, (short)TOP_GUI_HEIGHT, (short)SIDE_GUI_WIDTH, (short)height);
Tao.Sdl.Sdl.SDL_FillRect(screen, ref current, baseColor);
@@ -130,8 +122,6 @@
Tao.Sdl.SdlGfx.vlineColor(screen,(short)(width - (SIDE_GUI_WIDTH + 1)),(short)TOP_GUI_HEIGHT,(short)(height - BOTTOM_GUI_HEIGHT - 17),0);
Tao.Sdl.SdlGfx.vlineColor(screen, (short)(width - (SIDE_GUI_WIDTH)), (short)(TOP_GUI_HEIGHT + 2), (short)(height - BOTTOM_GUI_HEIGHT - 17), shadeColor);
- sat.drawDrawer(screen, width, height, satmap);
-
src = bot_right.clipSDLRect;
dst = new Sdl.SDL_Rect((short)(width - (SIDE_GUI_WIDTH) - bot_right.size.Width), (short)(height - BOTTOM_GUI_HEIGHT - bot_right.size.Height + 1), (short)bot_right.size.Width, (short)bot_right.size.Height);
Tao.Sdl.Sdl.SDL_BlitSurface(bot_right.surfacePtr(), ref src, screen, ref dst);
@@ -165,12 +155,11 @@
Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH + 1), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH), (short)(TOP_GUI_HEIGHT), 0, 0, 0, 255);
- Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH), (short)(TOP_GUI_HEIGHT + 1), 0, 0, 0, 255);
-
+ Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(width - SIDE_GUI_WIDTH), (short)(TOP_GUI_HEIGHT + 1), 0, 0, 0, 255);*/
if (clock_text != null && clock_text != string.Empty)
{
- drawText(screen,freesans,clock_text,Color.Black,(width - (src.w) - 140),2);
+ drawText(screen, freesans, clock_text, Color.Black, (width - 160), 2, 0, false, false);
}
if (SHOW_SPLASH)
@@ -184,49 +173,88 @@
Tao.Sdl.Sdl.SDL_BlitSurface(splash.surfacePtr(), ref src, screen, ref dst);
for (int i = 0; i < MAX_SPLASH_LINES; i++)
if (SPLASH_TEXT[i] != string.Empty)
- drawText(screen,freesans, SPLASH_TEXT[i], Color.Black, xpos + 10, (ypos + splash.size.Height + 10) + (i * (2 + SPLASH_TEXT_HEIGHT)));
- drawText(screen,freesans, "[" + SPLASH_PERCENT.ToString() + "%]", Color.Black, new Point(xpos + (splash.size.Height * 2) - 16, ypos + splash.size.Width - 20));
+ drawText(screen,freesans, SPLASH_TEXT[i], Color.Black, xpos + 10, (ypos + splash.size.Height + 10) + (i * (2 + SPLASH_TEXT_HEIGHT)),0,false, false);
+ drawText(screen, freesans, "[" + SPLASH_PERCENT.ToString() + "%]", Color.Black, new Point(xpos + (splash.size.Height * 2) - 16, ypos + splash.size.Width - 20), 0, false, false);
}
}
+
+ public bool addButton(string name, string tooltip) {
+ bool added = false;
+ for (int i = 0; i < MAX_BUTTONS; i++)
+ {
+ if (!added && top_toolbar[i] == null) {
+ top_toolbar[i] = new SDLGUIButton(name,tooltip, (10 + (i * 26)), 1,ref ButtonClick);
+ added = true;
+ }
+ }
+ return added;
+ }
- private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p)
+ public static void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p, int rotate, bool fill, bool centered)
{
- drawText(screen, in_font, in_text, c.R, c.G, c.B, 255, p.X, p.Y);
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, 233, p.X, p.Y, rotate, fill, centered);
}
- private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p, int alpha)
+ public static void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, Point p, int alpha, int rotate, bool fill, bool centered)
{
- drawText(screen, in_font, in_text, c.R, c.G, c.B, (byte)alpha, p.X, p.Y);
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, (byte)alpha, p.X, p.Y, rotate, fill, centered);
}
- private void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, int x, int y)
+ public static void drawText(IntPtr screen, IntPtr in_font, string in_text, Color c, int x, int y, int rotate, bool fill, bool centered)
{
- drawText(screen, in_font, in_text, c.R, c.G, c.B, 255, x, y);
+ drawText(screen, in_font, in_text, c.R, c.G, c.B, 255, x, y, rotate, fill, centered);
}
- private void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, int x, int y)
+ public static void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, int x, int y, int rotate, bool fill, bool centered)
{
- drawText(screen, in_font, in_text, r, g, b, 255, x, y);
+ drawText(screen, in_font, in_text, r, g, b, 255, x, y, rotate, fill, centered);
}
- public void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y)
+ public static void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y, int rotate, bool fill, bool centered)
{
- IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
- Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
- Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
- Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)x, (short)y, src.w, src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
- Sdl.SDL_FreeSurface(text);
+ IntPtr text;
+ if (in_text != string.Empty)
+ {
+ if (fill) text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(255, 255, 255, a));
+ else text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
+ Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
+ Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
+
+ Sdl.SDL_Rect dst, back;// = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)(y - (txt.h / 2)), src.w, src.h);
+ if (centered) dst = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)(y - (txt.h / 2)), (short)(src.w), (short)(src.h));
+ else dst = new Sdl.SDL_Rect((short)(x), (short)(y), (short)(src.w), (short)(src.h));
+ back = new Sdl.SDL_Rect((short)(dst.x - 2), (short)(dst.y - 1), (short)(dst.w + 4), (short)(dst.h + 2));
+ if (rotate != 0)
+ {
+ IntPtr newSrc = SdlGfx.rotozoomSurface(text, rotate, 1, 0);
+ src = new Sdl.SDL_Rect(0, 0, (short)(txt.h + 2), (short)(txt.w + 2));
+ if (centered) dst = new Sdl.SDL_Rect((short)(x - (txt.h / 2)), (short)(y - (txt.w / 2)), (short)(src.w), (short)(src.h));
+ else dst = new Sdl.SDL_Rect((short)(x), (short)(y), (short)(src.w), (short)(src.h));
+ if (fill)
+ {
+ back = new Sdl.SDL_Rect((short)(dst.x - 2), (short)(dst.y - 1), (short)(dst.w + 4), (short)(dst.h + 2));
+ Tao.Sdl.Sdl.SDL_FillRect(screen, ref back, 1);
+ }
+ Tao.Sdl.Sdl.SDL_BlitSurface(newSrc, ref src, screen, ref dst);
+ Sdl.SDL_FreeSurface(newSrc);
+ }
+ else
+ {
+ if (fill) Tao.Sdl.Sdl.SDL_FillRect(screen, ref back, 1);
+ Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
+ }
+ Sdl.SDL_FreeSurface(text);
+ }
}
public void updateSatellite(ref Surface s)
{
- if (sat.DRAW_OPEN_AMOUNT > 0)
+ /* if (sat.DRAW_OPEN_AMOUNT > 0)
{
//if (satmap == null || satmap.surface.w != w || satmap.surface.h != h) satmap = new Surface(w, h, 16);
satmap = s;
- }
+ }*/
}
}
}
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2007-09-25 05:12:44 UTC (rev 192)
@@ -388,6 +388,12 @@
<Compile Include="framework\BGMManager.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="framework\BGMPlaylist.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="framework\BGMPlaylist.Designer.cs">
+ <DependentUpon>BGMPlaylist.cs</DependentUpon>
+ </Compile>
<Compile Include="framework\ConfigDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -939,6 +945,10 @@
<EmbeddedResource Include="framework\AboutDialog.resx">
<DependentUpon>AboutDialog.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="framework\BGMPlaylist.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>BGMPlaylist.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="framework\ConfigDialog.resx">
<DependentUpon>ConfigDialog.cs</DependentUpon>
</EmbeddedResource>
@@ -996,10 +1006,6 @@
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Name>FreeTrain.Controls</Name>
</ProjectReference>
- <ProjectReference Include="..\lib\DirectAudio.net\DirectAudio.net.csproj">
- <Project>{0616A314-BDF0-466D-AB4B-9FA1B071A8A2}</Project>
- <Name>DirectAudio.net</Name>
- </ProjectReference>
<ProjectReference Include="..\lib\SDLGFX.net\SDL.net.csproj">
<Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
<Name>SDL.net</Name>
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -9,7 +9,7 @@
using freetrain.world;
using freetrain.world.structs;
using freetrain.contributions.common;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.common
{
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -9,7 +9,7 @@
using freetrain.framework.graphics;
using freetrain.world;
using freetrain.world.structs;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.common {
public interface AbstractExStructure {
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -2,7 +2,7 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.controllers;
using freetrain.framework.graphics;
using freetrain.framework.plugin;
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -2,7 +2,7 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.world;
using freetrain.world.terrain;
using freetrain.contributions.common;
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -2,7 +2,7 @@
using System.Collections;
using System.Drawing;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.controllers;
using freetrain.framework.plugin;
using freetrain.framework.graphics;
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -2,7 +2,7 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.controllers;
using freetrain.contributions.population;
using freetrain.framework.graphics;
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -23,7 +23,12 @@
}
/// <summary> Title of the music. </summary>
- public readonly string name;
+ public readonly string name;
+
+ public override string ToString()
+ {
+ return this.name;
+ }
/// <summary> File name of the music. </summary>
public readonly string fileName;
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -10,7 +10,7 @@
using freetrain.framework.plugin;
using freetrain.world;
using freetrain.world.structs;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.structs
{
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -5,7 +5,7 @@
using freetrain.framework.plugin;
using freetrain.framework.graphics;
using freetrain.world;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.train
{
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -6,7 +6,7 @@
using freetrain.framework.graphics;
using freetrain.framework.plugin;
using freetrain.world;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.train
{
Modified: branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -1,7 +1,7 @@
using System;
using System.Drawing;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.world;
using freetrain.framework;
using freetrain.framework.plugin;
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -5,7 +5,7 @@
using freetrain.framework.graphics;
using freetrain.framework.plugin;
using freetrain.world;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.contributions.train
{
Modified: branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -1,7 +1,7 @@
using System;
using System.Drawing;
using System.Xml;
-using org.kohsuke.directdraw;
+using SDL.net;
using freetrain.framework.plugin;
using freetrain.world;
Modified: branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -15,7 +15,7 @@
using freetrain.framework.graphics;
using freetrain.framework.plugin;
using freetrain.util;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.controllers.land
{
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -15,7 +15,7 @@
using freetrain.framework.graphics;
using freetrain.framework.plugin;
using freetrain.util;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.controllers.land
{
Modified: branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -12,7 +12,7 @@
using freetrain.framework;
using freetrain.framework.graphics;
using freetrain.util;
-using org.kohsuke.directdraw;
+using SDL.net;
namespace freetrain.controllers.land
{
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2007-09-11 20:54:23 UTC (rev 191)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2007-09-25 05:12:44 UTC (rev 192)
@@ -1,887 +1,907 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using freetrain.contributions.common;
-using freetrain.contributions.rail;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.util;
-using freetrain.world;
-using freetrain.world.rail;
-using freetrain.views;
-using freetrain.views.map;
-using org.kohsuke.directdraw;
-using freetrain.controls;
-
-
-namespace freetrain.controllers.rail
-{
- public class PlatformController : AbstractControllerImpl, MapOverlay, LocationDisambiguator
- {
- #region Singleton instance management
- /// <summary>
- /// Creates a new controller window, or active the existing one.
- /// </summary>
- public static void create() {
- if(theInstance==null)
- theInstance = new PlatformController();
- theInstance.Show();
- theInstance.Activate();
- }
-
- private freetrain.controls.IndexSelector indexSelector;
- private System.Windows.Forms.ListView listView1;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
- private freetrain.controls.IndexSelector indexSelector1;
- private System.Windows.Forms.Label label4;
- private freetrain.controls.IndexSelector indexSelector2;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.ColumnHeader columnHeader1;
- private System.Windows.Forms.ColumnHeader columnHeader2;
- private System.Windows.Forms.ColumnHeader columnHeader3;
- private System.Windows.Forms.ColumnHeader columnHeader4;
- private System.Windows.Forms.ColumnHeader columnHeader5;
- private System.Windows.Forms.ColumnHeader columnHeader6;
-
- private static PlatformController theInstance;
-
- protected override void OnClosing(System.ComponentModel.CancelEventArgs e) {
- base.OnClosing(e);
- theInstance = null;
- }
- #endregion
-
-
- private Bitmap bitmapN,bitmapS,bitmapE,bitmapW;
- private Bitmap stationPreviewBitmap;
-
- public PlatformController() {
- // この呼び出しは Windows フォーム デザイナで必要です。
- InitializeComponent();
-// colorPickButton1.colorLibraries = new IColorLibrary[]{
-// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-RAINBOW}"),
-// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-STONES}")//,
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-WOODS}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-METALS}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-BRICKS}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-DIRTS}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-PASTEL}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-COLPLATE}"),
-//// (IColorLibrary)PluginManager.theInstance.getContribution("{COLORLIB-ROOF}")
-// };
-
- dirN.Tag = Direction.NORTH;
- dirE.Tag = Direction.EAST;
- dirS.Tag = Direction.SOUTH;
- dirW.Tag = Direction.WEST;
-
- // load pictures
- bitmapN=ResourceUtil.loadSystemBitmap("PlatformN.bmp");
- dirN.Image = bitmapN;
-
- bitmapE=ResourceUtil.loadSystemBitmap("PlatformN.bmp");
- bitmapE.RotateFlip( RotateFlipType.Rotate90FlipNone );
- dirE.Image = bitmapE;
-
- bitmapS=ResourceUtil.loadSystemBitmap("PlatformN.bmp");
- bitmapS.RotateFlip( RotateFlipType.Rotate180FlipNone );
- dirS.Image = bitmapS;
-
- bitmapW=ResourceUtil.loadSystemBitmap("PlatformN.bmp");
- bitmapW.RotateFlip( RotateFlipType.Rotate270FlipNone );
- dirW.Image = bitmapW;
-
- // load station type list
- stationType.DataSource = Core.plugins.stationGroup;
- stationType.DisplayMember="name";
-
- updateAfterResize(null,null);
- onDirChange(dirN,null);
- }
-
- protected override void Dispose( bool disposing ) {
- if( disposing && components != null)
- components.Dispose();
- base.Dispose( disposing );
-
- bitmapN.Dispose();
- bitmapS.Dispose();
- bitmapE.Dispose();
- bitmapW.Dispose();
- stationPreviewBitmap.Dispose();
- if(alphaSprites!=null)
- alphaSprites.Dispose();
- }
-
- public override LocationDisambiguator disambiguator { get { return this; } }
-
- /// <summary> LocationDisambiguator implementation </summary>
- public bool isSelectable( Location loc ) {
- if( currentMode==Mode.Station ) {
- return GroundDisambiguator.theInstance.isSelectable(loc);
- }
-
- if(isPlacing) {
- // align to RRs or the ground
-
- if( currentMode==Mode.FatPlatform )
- loc += direction.right90;
-
- if( GroundDisambiguator.theInstance.isSelectable(loc) )
- return true;
-
- RailRoad rr = RailRoad.get(loc);
- if(rr==null) return false;
- return rr.hasRail(direction) && rr.hasRail(direction.opposite);
- } else {
- return Platform.get(loc)!=null;
- }
- }
-
- #region Designer generated code
- private System.Windows.Forms.TabPage stationPage;
- private System.Windows.Forms.ComboBox stationType;
- private System.Windows.Forms.PictureBox stationPicture;
- private System.Windows.Forms.TabPage platformPage;
- private System.Windows.Forms.PictureBox dirS;
- private System.Windows.Forms.PictureBox dirW;
- private System.Windows.Forms.PictureBox dirE;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.NumericUpDown lengthBox;
- private System.Windows.Forms.PictureBox dirN;
- private System.Windows.Forms.TabControl tabControl;
- private System.Windows.Forms.CheckBox checkSlim;
- private System.Windows.Forms.RadioButton buttonRemove;
- private System.Windows.Forms.RadioButton buttonPlace;
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Designer サポートに必要なメソッドです。コード エディタで
- /// このメソッドのコンテンツを変更しないでください。
- /// </summary>
- private void InitializeComponent()
- {
- this.buttonRemove = new System.Windows.Forms.RadioButton();
- this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.stationPage = new System.Windows.Forms.TabPage();
- this.label3 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.listView1 = new System.Windows.Forms.ListView();
- this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader5 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader6 = new System.Windows.Forms.ColumnHeader();
- this.indexSelector = new freetrain.controls.IndexSelector();
- this.stationType = new System.Windows.Forms.ComboBox();
- this.stationPicture = new System.Windows.Forms.PictureBox();
- this.indexSelector1 = new freetrain.controls.IndexSelector();
- this.label4 = new System.Windows.Forms.Label();
- this.indexSelector2 = new freetrain.controls.IndexSelector();
- this.label5 = new System.Windows.Forms.Label();
- this.platformPage = new System.Windows.Forms.TabPage();
- this.checkSlim = new System.Windows.Forms.CheckBox();
- this.dirS = new System.Windows.Forms.PictureBox();
- this.dirW = new System.Windows.Forms.PictureBox();
- this.dirE = new System.Windows.Forms.PictureBox();
- this.label1 = new System.Windows.Forms.Label();
- this.lengthBox = new System.Windows.Forms.NumericUpDown();
- this.dirN = new System.Windows.Forms.PictureBox();
- this.tabControl = new System.Windows.Forms.TabControl();
- this.stationPage.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.stationPicture)).BeginInit();
- this.platformPage.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dirS)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dirW)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dirE)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lengthBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dirN)).BeginInit();
- this.tabControl.SuspendLayout();
- this.SuspendLayout();
- //
- // buttonRemove
- //
- this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonRemove.Appearance = System.Windows.Forms.Appearance.Button;
- this.buttonRemove.Location = new System.Drawing.Point(87, 210);
- this.buttonRemove.Name = "buttonRemove";
- this.buttonRemove.Size = new System.Drawing.Size(76, 26);
- this.buttonRemove.TabIndex = 1;
- this.buttonRemove.Text = "Remove";
- //! this.buttonRemove.Text = "撤去";
- this.buttonRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // buttonPlace
- //
- this.buttonPlace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonPlace.Appearance = System.Windows.Forms.Appearance.Button;
- this.buttonPlace.Checked = true;
- this.buttonPlace.Location = new System.Drawing.Point(7, 210);
- this.buttonPlace.Name = "buttonPlace";
- this.buttonPlace.Size = new System.Drawing.Size(74, 26);
- this.buttonPlace.TabIndex = 0;
- this.buttonPlace.TabStop = true;
- this.buttonPlace.Text = "Build";
- //! this.buttonPlace.Text = "設置";
- this.buttonPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // stationPage
- //
- this.stationPage.BackColor = System.Drawing.SystemColors.Control;
- this.stationPage.Controls.Add(this.label3);
- this.stationPage.Controls.Add(this.label2);
- this.stationPage.Controls.Add(this.listView1);
- this.stationPage.Controls.Add(this.indexSelector);
- this.stationPage.Controls.Add(this.stationType);
- this.stationPage.Controls.Add(this.stationPicture);
- this.stationPage.Controls.Add(this.indexSelector1);
- this.stationPage.Controls.Add(this.label4);
- this.stationPage.Controls.Add(this.indexSelector2);
- this.stationPage.Controls.Add(this.label5);
- this.stationPage.Location = new System.Drawing.Point(4, 21);
- this.stationPage.Margin = new System.Windows.Forms.Padding(0);
- this.stationPage.Name = "stationPage";
- this.stationPage.Size = new System.Drawing.Size(193, 176);
- this.stationPage.TabIndex = 1;
- this.stationPage.Text = "Station";
- //! this.stationPage.Text = "駅舎";
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(3, 35);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(47, 17);
- this.label3.TabIndex = 6;
- this.label3.Text = "Design:";
- //! this.label3.Text = "デザイン：";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label2
- //
- this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.label2.Location = new System.Drawing.Point(294, 54);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(100, 17);
- this.label2.TabIndex = 5;
- this.label2.Text = "label2";
- //
- // listView1
- //
- this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1,
- this.columnHeader2,
- this.columnHeader3,
- this.columnHeader4,
- this.columnHeader5,
- this.columnHeader6});
- this.listView1.Location = new System.Drawing.Point(206, 9);
- this.listView1.Name = "listView1";
- this.listView1.Size = new System.Drawing.Size(103, 156);
- this.listView1.TabIndex = 4;
- this.listView1.UseCompatibleStateImageBehavior = false;
- this.listView1.View = System.Windows.Forms.View.Details;
- //
- // columnHeader1
- //
- this.columnHeader1.Text = "Name";
- //! this.columnHeader1.Text = "名前";
- this.columnHeader1.Width = 120;
- //
- // columnHeader2
- //
- this.columnHeader2.Text = "Scale";
- //! this.columnHeader2.Text = "規模";
- this.columnHeader2.Width = 54;
- //
- // columnHeader3
- //
- this.columnHeader3.Text = "Material";
- //! this.columnHeader3.Text = "材質";
- this.columnHeader3.Width = 54;
- //
- // columnHeader4
- //
- this.columnHeader4.Text = "Size";
- //! this.columnHeader4.Text = "サイズ";
- this.columnHeader4.Width = 64;
- //
- // columnHeader5
- //
- this.columnHeader5.Text = "Construction cost";
- //! this.columnHeader5.Text = "建造費";
- //
- // columnHeader6
- //
- this.columnHeader6.Text = "Maintenance";
- //! this.columnHeader6.Text = "維持費";
- //
- // indexSelector
- //
- this.indexSelector.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.indexSelector.count = 10;
- this.indexSelector.current = 0;
- this.indexSelector.dataSource = null;
- this.indexSelector.Location = new System.Drawing.Point(56, 35);
- this.indexSelector.Name = "indexSelector";
- this.indexSelector.Size = new System.Drawing.Size(132, 17);
- this.indexSelector.TabIndex = 3;
- this.indexSelector.indexChanged += new System.EventHandler(this.onStationChanged);
- //
- // stationType
- //
- this.stationType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.stationType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.stationType.ItemHeight = 13;
- this.stationType.Location = new System.Drawing.Point(3, 9);
- this.stationType.Name = "stationType";
- this.stationType.Size = new System.Drawing.Size(185, 21);
- this.stationType.Sorted = true;
- this.stationType.TabIndex = 2;
- this.stationType.SelectedIndexChanged += new System.EventHandler(this.onGroupChanged);
- //
- // stationPicture
- //
- this.stationPicture.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.stationPicture.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.stationPicture.Location = new System.Drawing.Point(3, 54);
- this.stationPicture.Name = "stationPicture";
- this.stationPicture.Size = new System.Drawing.Size(185, 112);
- this.stationPicture.TabIndex = 1;
- this.stationPicture.TabStop = false;
- //
- // indexSelector1
- //
- this.indexSelector1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.indexSelector1.count = 10;
- this.indexSelector1.current = 0;
- this.indexSelector1.dataSource = null;
- this.indexSelector1.Location = new System.Drawing.Point(250, 106);
- this.indexSelector1.Name = "indexSelector1";
- this.indexSelector1.Size = new System.Drawing.Size(96, 17);
- this.indexSelector1.TabIndex = 3;
- //
- // label4
- //
- this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label4.Location = new System.Drawing.Point(260, 106);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(56, 17);
- this.label4.TabIndex = 6;
- this.label4.Text = "Direction:";
- //! this.label4.T...
[truncated message content] |
|
From: <ste...@us...> - 2007-09-25 05:30:34
|
Revision: 196
http://freetrain.svn.sourceforge.net/freetrain/?rev=196&view=rev
Author: stevenhoefel
Date: 2007-09-24 22:30:37 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
Nearly forgot my button class.
Modified Paths:
--------------
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.resx
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.resx
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
Added Paths:
-----------
branches/FreeTrainSDL/SDLGUIButton.cs
Added: branches/FreeTrainSDL/SDLGUIButton.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIButton.cs (rev 0)
+++ branches/FreeTrainSDL/SDLGUIButton.cs 2007-09-25 05:30:37 UTC (rev 196)
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using Tao.Sdl;
+using SDL.net;
+
+namespace FreeTrainSDL
+{
+ class SDLGUIButton
+ {
+ private int x_pos, y_pos;
+ Surface btnon, btnoff;
+ private string button_name, tooltip_text;
+ bool button_down = false, draw_tooltip = false;
+
+ public EventHandler ButtonClick;
+
+ IntPtr fnt;
+
+ public SDLGUIButton(string name, string tooltip, int x, int y, ref EventHandler click)
+ {
+ tooltip_text = tooltip;
+ x_pos = x;
+ y_pos = y;
+
+ ButtonClick += click;
+
+ btnoff = new Surface(Application.StartupPath + "\\gui\\" + name + ".png");
+ btnon = new Surface(Application.StartupPath + "\\gui\\" + name + "_down.png");
+
+ fnt = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", 12);
+
+ button_name = name;
+ }
+
+ public void draw(IntPtr screen)
+ {
+ Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)x_pos,(short)y_pos,btnon.clipSDLRect.w,btnon.clipSDLRect.h);
+ Sdl.SDL_Rect src = btnon.clipSDLRect;
+
+ if (button_down) Tao.Sdl.Sdl.SDL_BlitSurface(btnon.surfacePtr(),ref src,screen,ref dst);
+ else Tao.Sdl.Sdl.SDL_BlitSurface(btnoff.surfacePtr(), ref src, screen, ref dst);
+
+ //TOOL TIPS!?!?!
+ if (draw_tooltip)
+ {
+ SDLGUI.drawText(screen, fnt, tooltip_text, Color.White, new Point(x_pos,y_pos + btnon.clipRect.Height + 6), 0, true, false);
+ }
+ }
+
+ public void checkMovement(Sdl.SDL_MouseMotionEvent e)
+ {
+ draw_tooltip = false;
+ button_down = false;
+ if (e.x >= x_pos && e.x <= (x_pos + btnon.clipSDLRect.w))
+ if (e.y >= y_pos && e.y <= (y_pos + btnon.clipSDLRect.h))
+ {
+ draw_tooltip = true;
+ }
+
+ }
+
+ public bool checkClick(Sdl.SDL_MouseButtonEvent e)
+ {
+ bool wasGUIClick = false;
+ button_down = false;
+ int x = e.x, y = e.y;
+ if (e.x >= x_pos && e.x <= (x_pos + btnon.clipSDLRect.w))
+ {
+ if (e.y >= y_pos && e.y <= (y_pos + btnon.clipSDLRect.h))
+ {
+ if (e.button == Sdl.SDL_BUTTON_LEFT)
+ {
+ button_down = true;
+ if (ButtonClick != null) ButtonClick(button_name,null);
+ }
+ wasGUIClick = true;
+ }
+ }
+ return wasGUIClick;
+ }
+ }
+}
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2007-09-25 05:29:05 UTC (rev 195)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2007-09-25 05:30:37 UTC (rev 196)
@@ -14,7 +14,9 @@
/// Pop-up tool window to host modal controllers.
/// </summary>
public class AbstractControllerForm : Form
- {
+ {
+ private Point mouse_offset;
+
public AbstractControllerForm() {
InitializeComponent();
try
@@ -51,25 +53,165 @@
}
}
- public virtual void updatePreview(){}
+ public virtual void updatePreview(){}
+
+ protected Label lblTitle;
+ protected Label lblExit;
#region Windows Form Designer generated code
private System.ComponentModel.Container components = null;
private void InitializeComponent()
- {
- //
- // AbstractControllerImpl
- //
- this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
- this.ClientSize = new System.Drawing.Size(292, 271);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "AbstractControllerImpl";
- this.ShowInTaskbar = false;
-
- }
- #endregion
+ {
+ this.lblTitle = new System.Windows.Forms.Label();
+ this.lblExit = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // lblTitle
+ //
+ this.lblTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(220)))), ((int)(((byte)(84)))));
+ this.lblTitle.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblTitle.Location = new System.Drawing.Point(5, 5);
+ this.lblTitle.Margin = new System.Windows.Forms.Padding(0);
+ this.lblTitle.Name = "lblTitle";
+ this.lblTitle.Size = new System.Drawing.Size(275, 15);
+ this.lblTitle.TabIndex = 0;
+ this.lblTitle.Text = "AbstractController";
+ this.lblTitle.TextAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblTitle.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ this.lblTitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AbstractControllerForm_MouseMove);
+ this.lblTitle.Paint += new System.Windows.Forms.PaintEventHandler(this.lblTitle_Paint);
+ //
+ // lblExit
+ //
+ this.lblExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblExit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(220)))), ((int)(((byte)(84)))));
+ this.lblExit.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblExit.Location = new System.Drawing.Point(241, 5);
+ this.lblExit.Margin = new System.Windows.Forms.Padding(0);
+ this.lblExit.Name = "lblExit";
+ this.lblExit.Size = new System.Drawing.Size(39, 15);
+ this.lblExit.TabIndex = 1;
+ this.lblExit.Text = "EXIT";
+ this.lblExit.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+ this.lblExit.MouseLeave += new System.EventHandler(this.lblExit_MouseLeave);
+ this.lblExit.Click += new System.EventHandler(this.lblExit_Click);
+ this.lblExit.MouseEnter += new System.EventHandler(this.lblExit_MouseEnter);
+ //
+ // AbstractControllerForm
+ //
+ this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(236)))), ((int)(((byte)(184)))));
+ this.ClientSize = new System.Drawing.Size(292, 271);
+ this.Controls.Add(this.lblExit);
+ this.Controls.Add(this.lblTitle);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "AbstractControllerForm";
+ this.ShowInTaskbar = false;
+ this.TopMost = true;
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.AbstractControllerForm_Paint);
+ this.Resize += new System.EventHandler(this.AbstractControllerForm_Resize);
+ this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AbstractControllerForm_MouseMove);
+ this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ this.Load += new System.EventHandler(this.AbstractControllerForm_Load);
+ this.ResumeLayout(false);
+
+ }
+
+ void lblTitle_Paint(object sender, PaintEventArgs e)
+ {
+ System.Drawing.Graphics gr = e.Graphics;
+ gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblExit.Left - this.lblTitle.Left - 1, -1), new Point(this.lblExit.Left - this.lblTitle.Left - 1, this.lblTitle.Height));
+ }
+
+ void lblExit_MouseLeave(object sender, EventArgs e)
+ {
+ this.lblExit.BackColor = Color.FromArgb(236, 220, 84);
+ this.lblExit.ForeColor = Color.Black;
+ }
+
+ void lblExit_MouseEnter(object sender, EventArgs e)
+ {
+ this.lblExit.BackColor = Color.Black;
+ this.lblExit.ForeColor = Color.White;
+ }
+ #endregion
+
+ void AbstractControllerForm_Resize(object sender, EventArgs e)
+ {
+ this.lblTitle.Width = this.Width - (this.lblTitle.Left * 2);
+ this.lblExit.Left = this.lblTitle.Left + this.lblTitle.Width - this.lblExit.Width;
+ }
+
+ protected void AbstractControllerForm_MouseDown(object sender, MouseEventArgs e)
+ {
+ mouse_offset = new Point(-e.X, -e.Y);
+ }
+
+ protected void AbstractControllerForm_MouseMove(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Left)
+ {
+ Point mousePos = Control.MousePosition;
+ mousePos.Offset(mouse_offset.X, mouse_offset.Y);
+ this.Location = mousePos;
+ }
+ }
+
+ void AbstractControllerForm_Paint(object sender, PaintEventArgs e)
+ {
+ System.Drawing.Graphics gr = e.Graphics;
+ Point[] pts = new Point[4];
+ pts[0] = new Point(0,0);
+ pts[1] = new Point(this.Width - 1, 0);
+ pts[2] = new Point(this.Width-1,this.Height-1);
+ pts[3] = new Point(0, this.Height - 1);
+ gr.DrawPolygon(new Pen(Brushes.Black, 1), pts);
+
+ pts[0].X += 2; pts[0].Y += 2;
+ pts[1].X -= 2; pts[1].Y += 2;
+ pts[2].X -= 2; pts[2].Y -= 2;
+ pts[3].X += 2; pts[3].Y -= 2;
+ gr.DrawPolygon(new Pen(Color.FromArgb(206,204,170), 3), pts);
+
+ pts[0].X += 1; pts[0].Y += 1;
+ pts[1].X -= 1; pts[1].Y += 1;
+ pts[2].X -= 1; pts[2].Y -= 1;
+ pts[3].X += 1; pts[3].Y -= 1;
+ gr.DrawPolygon(new Pen(Brushes.Black, 1), pts);
+
+ pts[0].X -= 1; pts[0].Y -= 1;
+ pts[1].Y -= 1;
+ gr.DrawLine(new Pen(Color.FromArgb(120,119,102),1), pts[0], pts[1]);
+
+ pts[3].X -= 1;// pts[3].Y += 1;
+ gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[0], pts[3]);
+
+ pts[1].X += 2; pts[1].Y -= 1;
+ pts[2].X += 2; pts[2].Y += 2;
+ gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[1], pts[2]);
+
+ pts[3].X -= 1; pts[3].Y += 2;
+ gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[3], pts[2]);
+
+ gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left-1, this.lblTitle.Top-1), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top-1));
+ gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left-1, this.lblTitle.Top-1), new Point(this.lblTitle.Left-1, this.lblTitle.Top + this.lblTitle.Height + 1));
+ gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top + this.lblTitle.Height), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top + this.lblTitle.Height ));
+ gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left + this.lblTitle.Width , this.lblTitle.Top - 1), new Point(this.lblTitle.Left + this.lblTitle.Width , this.lblTitle.Top + this.lblTitle.Height ));
+ }
+
+ private void AbstractControllerForm_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ private void lblExit_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
}
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerForm.resx
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerForm.resx 2007-09-25 05:29:05 UTC (rev 195)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerForm.resx 2007-09-25 05:30:37 UTC (rev 196)
@@ -1,42 +1,120 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="ResMimeType">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="Version">
- <value>1.0.0.0</value>
- </resheader>
- <resheader name="Reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="Writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2007-09-25 05:29:05 UTC (rev 195)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs 2007-09-25 05:30:37 UTC (rev 196)
@@ -31,8 +31,8 @@
if(theInstance==null)
theInstance = new RailRoadController();
theInstance.Show();
- theInstance.Activate();
- }
+ theInstance.Activate();
+ }
private static RailRoadController theInstance;
@@ -51,13 +51,13 @@
public override void updatePreview()
{
- using( PreviewDrawer drawer = new PreviewDrawer( picture.Size, new Size(1,10), 0 ) )
+ /*using( PreviewDrawer drawer = new PreviewDrawer( picture.Size, new Size(1,10), 0 ) )
{
for( int i=0; i<10; i++ )
drawer.draw( RailPattern.get( Direction.NORTH, Direction.SOUTH ), 0, i );
if(picture.Image!=null) picture.Image.Dispose();
picture.Image = drawer.createBitmap();
- }
+ }*/
}
protected override void Dispose( bool disposing ) {
@@ -92,103 +92,95 @@
#region Windows Form Designer generated code
private System.Windows.Forms.RadioButton buttonPlace;
private System.Windows.Forms.RadioButton buttonRemove;
- private freetrain.controls.CostBox costBox;
- private System.Windows.Forms.Label message;
- private System.Windows.Forms.PictureBox picture;
+ private freetrain.controls.CostBox costBox;
+ private System.Windows.Forms.Label message;
private System.ComponentModel.Container components = null;
private void InitializeComponent()
- {
- this.picture = new System.Windows.Forms.PictureBox();
- this.message = new System.Windows.Forms.Label();
- this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.buttonRemove = new System.Windows.Forms.RadioButton();
- this.costBox = new freetrain.controls.CostBox();
- ((System.ComponentModel.ISupportInitialize)(this.picture)).BeginInit();
- this.SuspendLayout();
- //
- // picture
- //
- this.picture.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.picture.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.picture.Location = new System.Drawing.Point(8, 9);
- this.picture.Name = "picture";
- this.picture.Size = new System.Drawing.Size(113, 113);
- this.picture.TabIndex = 0;
- this.picture.TabStop = false;
- //
- // message
- //
- this.message.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.message.Location = new System.Drawing.Point(8, 125);
- this.message.Name = "message";
- this.message.Size = new System.Drawing.Size(113, 26);
- this.message.TabIndex = 1;
- this.message.Text = "Click on two points on the map to place tracks";
- this.message.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //! this.message.Text = "マップの２点をクリックして敷設";
- //
- // buttonPlace
- //
- this.buttonPlace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonPlace.Appearance = System.Windows.Forms.Appearance.Button;
- this.buttonPlace.Checked = true;
- this.buttonPlace.Location = new System.Drawing.Point(8, 185);
- this.buttonPlace.Name = "buttonPlace";
- this.buttonPlace.Size = new System.Drawing.Size(48, 26);
- this.buttonPlace.TabIndex = 2;
- this.buttonPlace.TabStop = true;
- this.buttonPlace.Text = "Place";
- //!this.buttonPlace.Text = "敷設";
- this.buttonPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.buttonPlace.CheckedChanged += new System.EventHandler(this.modeChanged);
- //
- // buttonRemove
- //
- this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRemove.Appearance = System.Windows.Forms.Appearance.Button;
- this.buttonRemove.Location = new System.Drawing.Point(56, 185);
- this.buttonRemove.Name = "buttonRemove";
- this.buttonRemove.Size = new System.Drawing.Size(65, 26);
- this.buttonRemove.TabIndex = 3;
- this.buttonRemove.Text = "Remove";
- //! this.buttonRemove.Text = "撤去";
- this.buttonRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.buttonRemove.CheckedChanged += new System.EventHandler(this.modeChanged);
- //
- // costBox
- //
- this.costBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.costBox.cost = 0;
- this.costBox.label = "Cost:";
- this.costBox.Location = new System.Drawing.Point(8, 154);
- //! this.costBox.label = "費用：";
- this.costBox.Name = "costBox";
- this.costBox.Size = new System.Drawing.Size(113, 25);
- this.costBox.TabIndex = 4;
- //
- // RailRoadController
- //
- this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(129, 220);
- this.Controls.Add(this.costBox);
- this.Controls.Add(this.buttonRemove);
- this.Controls.Add(this.buttonPlace);
- this.Controls.Add(this.message);
- this.Controls.Add(this.picture);
- this.Resize += new System.EventHandler(this.updateAfterResize);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
- this.Name = "RailRoadController";
- this.Text = "Track construction";
- //! this.Text = "線路工事";
- ((System.ComponentModel.ISupportInitialize)(this.picture)).EndInit();
- this.ResumeLayout(false);
-
+ {
+ this.message = new System.Windows.Forms.Label();
+ this.buttonPlace = new System.Windows.Forms.RadioButton();
+ this.buttonRemove = new System.Windows.Forms.RadioButton();
+ this.costBox = new freetrain.controls.CostBox();
+ this.SuspendLayout();
+ //
+ // message
+ //
+ this.message.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.message.Location = new System.Drawing.Point(12, 46);
+ this.message.Name = "message";
+ this.message.Size = new System.Drawing.Size(105, 26);
+ this.message.TabIndex = 1;
+ this.message.Text = "Click on two points on the map to place tracks";
+ this.message.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.message.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ this.message.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
+ //
+ // buttonPlace
+ //
+ this.buttonPlace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonPlace.Appearance = System.Windows.Forms.Appearance.Button;
+ this.buttonPlace.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(236)))));
+ this.buttonPlace.Checked = true;
+ this.buttonPlace.Location = new System.Drawing.Point(12, 115);
+ this.buttonPlace.Name = "buttonPlace";
+ this.buttonPlace.Size = new System.Drawing.Size(46, 26);
+ this.buttonPlace.TabIndex = 2;
+ this.buttonPlace.TabStop = true;
+ this.buttonPlace.Text = "Place";
+ this.buttonPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.buttonPlace.UseVisualStyleBackColor = false;
+ this.buttonPlace.CheckedChanged += new System.EventHandler(this.modeChanged);
+ //
+ // buttonRemove
+ //
+ this.buttonRemove.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonRemove.Appearance = System.Windows.Forms.Appearance.Button;
+ this.buttonRemove.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(236)))));
+ this.buttonRemove.Location = new System.Drawing.Point(58, 115);
+ this.buttonRemove.Name = "buttonRemove";
+ this.buttonRemove.Size = new System.Drawing.Size(59, 26);
+ this.buttonRemove.TabIndex = 3;
+ this.buttonRemove.Text = "Remove";
+ this.buttonRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.buttonRemove.UseVisualStyleBackColor = false;
+ this.buttonRemove.CheckedChanged += new System.EventHandler(this.modeChanged);
+ //
+ // costBox
+ //
+ this.costBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.costBox.cost = 0;
+ this.costBox.label = "Cost:";
+ this.costBox.Location = new System.Drawing.Point(12, 84);
+ this.costBox.Name = "costBox";
+ this.costBox.Size = new System.Drawing.Size(105, 25);
+ this.costBox.TabIndex = 4;
+ this.costBox.MouseDown += new MouseEventHandler(this.AbstractControllerForm_MouseDown);
+ this.costBox.MouseMove += new MouseEventHandler(this.AbstractControllerForm_MouseMove);
+
+ //
+ // RailRoadController
+ //
+ this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+ this.ClientSize = new System.Drawing.Size(129, 153);
+ this.Controls.Add(this.buttonRemove);
+ this.Controls.Add(this.buttonPlace);
+ this.Controls.Add(this.costBox);
+ this.Controls.Add(this.message);
+ this.Name = "RailRoadController";
+ this.Text = "Track construction";
+ this.lblTitle.Text = "RAILROAD";
+ this.Resize += new System.EventHandler(this.updateAfterResize);
+ this.Load += new System.EventHandler(this.RailRoadController_Load);
+ this.Controls.SetChildIndex(this.message, 0);
+ this.Controls.SetChildIndex(this.costBox, 0);
+ this.Controls.SetChildIndex(this.buttonPlace, 0);
+ this.Controls.SetChildIndex(this.buttonRemove, 0);
+ this.ResumeLayout(false);
+
}
#endregion
@@ -226,10 +218,10 @@
}
protected virtual void updateAfterResize(object sender, System.EventArgs e){
- this.buttonPlace.Width = this.picture.Width / 2;
- this.buttonRemove.Left = (this.buttonPlace.Left + this.buttonPlace.Width);
- this.buttonRemove.Width = this.buttonPlace.Width;
- updatePreview();
+ //this.buttonPlace.Width = this.picture.Width / 2;
+ //this.buttonRemove.Left = (this.buttonPlace.Left + this.buttonPlace.Width);
+ //this.buttonRemove.Width = this.buttonPlace.Width;
+ //updatePreview();
}
public override void onMouseMove( MapViewWindow view, Location loc, Point ab ) {
@@ -307,7 +299,12 @@
}
public void drawAfter( QuarterViewDrawer view, DrawContextEx canvas ) {
- }
+ }
+
+ private void RailRoadController_Load(object sender, EventArgs e)
+ {
+ this.lblTitle.Text = "Railroad";
+ }
}
}
Modified: branches/FreeTrainSDL/core/controllers/rail/RailRoadController.resx
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/RailRoadController.resx 2007-09-25 05:29:05 UTC (rev 195)
+++ branches/FreeTrainSDL/core/controllers/rail/RailRoadController.resx 2007-09-25 05:30:37 UTC (rev 196)
@@ -1,102 +1,120 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 1.3
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1">this is my long string</data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- [base64 mime encoded serialized .NET Framework object]
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>1.3</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="$this.Name">
- <value>RailRoadController</value>
- </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
</root>
\ No newline at end of file
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2007-09-25 05:29:05 UTC (rev 195)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2007-09-25 05:30:37 UTC (rev 196)
@@ -119,366 +119,367 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.label2 = new System.Windows.Forms.Label();
- this.length = new System.Windows.Forms.NumericUpDown();
- this.label3 = new System.Windows.Forms.Label();
- this.count = new System.Windows.Forms.NumericUpDown();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.label4 = new System.Windows.Forms.Label();
- this.buttonOK = new System.Windows.Forms.Button();
- this.buttonCancel = new System.Windows.Forms.Button();
- this.label5 = new System.Windows.Forms.Label();
- this.speed = new System.Windows.Forms.Label();
- this.totalPrice = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.passenger = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.typeTree = new System.Windows.Forms.TreeView();
- this.label1 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.description = new System.Windows.Forms.TextBox();
- this.author = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.label10 = new System.Windows.Forms.Label();
- this.name = new System.Windows.Forms.Label();
- this.preview = new System.Windows.Forms.PictureBox();
- this.buttonImages = new System.Windows.Forms.ImageList(this.components);
- this.toolBarDayNight = new System.Windows.Forms.ToolBar();
- this.tbDay = new System.Windows.Forms.ToolBarButton();
- this.tbNight = new System.Windows.Forms.ToolBarButton();
- ((System.ComponentModel.ISupportInitialize)(this.length)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.count)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.preview)).BeginInit();
- this.SuspendLayout();
- //
- // label2
- //
- this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label2.Location = new System.Drawing.Point(202, 257);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(76, 24);
- this.label2.TabIndex = 2;
- this.label2.Text = "&Length:";
- this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // length
- //
- this.length.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.length.Location = new System.Drawing.Point(283, 258);
- this.length.Minimum = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.length.Name = "length";
- this.length.Size = new System.Drawing.Size(77, 21);
- this.length.TabIndex = 4;
- this.length.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.length.Value = new decimal(new int[] {
- 3,
- 0,
- 0,
- 0});
- this.length.ValueChanged += new System.EventHandler(this.onAmountChanged);
- //
- // label3
- //
- this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label3.Location = new System.Drawing.Point(409, 259);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(30, 20);
- this.label3.TabIndex = 5;
- this.label3.Text = "x";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // count
- //
- this.count.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.count.Location = new System.Drawing.Point(435, 258);
- this.count.Name = "count";
- this.count.Size = new System.Drawing.Size(76, 21);
- this.count.TabIndex = 6;
- this.count.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- this.count.Value = new decimal(new int[] {
- 1,
- 0,
- 0,
- 0});
- this.count.ValueChanged += new System.EventHandler(this.onAmountChanged);
- //
- // groupBox1
- //
- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBox1.Location = new System.Drawing.Point(180, 291);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(458, 4);
- this.groupBox1.TabIndex = 4;
- this.groupBox1.TabStop = false;
- //
- // label4
- //
- this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label4.Location = new System.Drawing.Point(517, 257);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(39, 22);
- this.label4.TabIndex = 7;
- this.label4.Text = "set(s)";
- this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // buttonOK
- //
- this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.buttonOK.Location = new System.Drawing.Point(356, 346);
- this.buttonOK.Name = "buttonOK";
- this.buttonOK.Size = new System.Drawing.Size(96, 28);
- this.buttonOK.TabIndex = 8;
- this.buttonOK.Text = "&Buy";
- this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
- //
- // buttonCancel
- //
- this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.buttonCancel.Location = new System.Drawing.Point(460, 346);
- this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Size = new System.Drawing.Size(96, 28);
- this.buttonCancel.TabIndex = 9;
- this.buttonCancel.Text = "&Close";
- //
- // label5
- //
- this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label5.Location = new System.Drawing.Point(202, 229);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(76, 19);
- this.label5.TabIndex = 10;
- this.label5.Text = "Speed:";
- this.label5.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // speed
- //
- this.speed.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.speed.Location = new System.Drawing.Point(286, 229);
- this.speed.Name = "speed";
- this.speed.Size = new System.Drawing.Size(264, 19);
- this.speed.TabIndex = 11;
- this.speed.Text = "Rapid";
- this.speed.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // totalPrice
- //
- this.totalPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.totalPrice.Location = new System.Drawing.Point(283, 298);
- this.totalPrice.Name = "totalPrice";
- this.totalPrice.Size = new System.Drawing.Size(273, 20);
- this.totalPrice.TabIndex = 14;
- this.totalPrice.Text = "100,000";
- this.totalPrice.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // label8
- //
- this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label8.Location = new System.Drawing.Point(202, 298);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(76, 20);
- this.label8.TabIndex = 15;
- this.label8.Text = "Total cost:";
- this.label8.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // passenger
- //
- this.passenger.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.passenger.Location = new System.Drawing.Point(283, 318);
- this.passenger.Name = "passenger";
- this.passenger.Size = new System.Drawing.Size(267, 19);
- this.passenger.TabIndex = 17;
- this.passenger.Text = "100";
- this.passenger.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // label9
- //
- this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label9.Location = new System.Drawing.Point(202, 318);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(76, 19);
- this.label9.TabIndex = 16;
- this.label9.Text = "Capacity:";
- this.label9.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // typeTree
- //
- this.typeTree.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.typeTree.Location = new System.Drawing.Point(0, 0);
- this.typeTree.Name = "typeTree";
- this.typeTree.Size = new System.Drawing.Size(194, 380);
- this.typeTree.TabIndex = 18;
- this.typeTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.onTypeChanged);
- //
- // label1
- //
- this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label1.Location = new System.Drawing.Point(202, 130);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(76, 20);
- this.label1.TabIndex = 19;
- this.label1.Text = "Author:";
- this.label1.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // label6
- //
- this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label6.Location = new System.Drawing.Point(202, 154);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(76, 19);
- this.label6.TabIndex = 20;
- this.label6.Text = "Description:";
- this.label6.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // description
- //
- this.description.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.description.BackColor = System.Drawing.SystemColors.Control;
- this.description.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.description.Location = new System.Drawing.Point(286, 158);
- this.description.Multiline = true;
- this.description.Name = "description";
- this.description.ReadOnly = true;
- this.description.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.description.Size = new System.Drawing.Size(264, 68);
- this.description.TabIndex = 21;
- this.description.Text = "tadasdffas";
- //
- // author
- //
- this.author.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.author.Location = new System.Drawing.Point(283, 130);
- this.author.Name = "author";
- this.author.Size = new System.Drawing.Size(267, 20);
- this.author.TabIndex = 22;
- this.author.Text = "477";
- this.author.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // label7
- //
- this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label7.Location = new System.Drawing.Point(370, 257);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(40, 22);
- this.label7.TabIndex = 23;
- this.label7.Text = "car(s)";
- this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // label10
- //
- this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.label10.Location = new System.Drawing.Point(202, 10);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(76, 18);
- this.label10.TabIndex = 24;
- this.label10.Text = "Name:";
- this.label10.TextAlign = System.Drawing.ContentAlignment.BottomRight;
- //
- // name
- //
- this.name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.name.Location = new System.Drawing.Point(286, 10);
- this.name.Name = "name";
- this.name.Size = new System.Drawing.Size(264, 18);
- this.name.TabIndex = 25;
- this.name.Text = "123 Series ABCDEF";
- this.name.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // preview
- //
- this.preview.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.preview.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.preview.Location = new System.Drawing.Point(283, 38);
- this.preview.Name = "preview";
- this.preview.Size = new System.Drawing.Size(267, 84);
- this.preview.TabIndex = 26;
- this.preview.TabStop = false;
- //
- // buttonImages
- //
- this.buttonImages.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
- this.buttonImages.ImageSize = new System.Drawing.Size(16, 15);
- this.buttonImages.TransparentColor = System.Drawing.Color.Transparent;
- //
- // toolBarDayNight
- //
- this.toolBarDayNight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.toolBarDayNight.Buttons.AddRange(new System.Windows.Forms.ToolBarButton[] {
- this.tbDay,
- this.tbNight});
- this.toolBarDayNight.Dock = System.Windows.Forms.DockStyle.None;
- this.toolBarDayNight.DropDownArrows = true;
- this.toolBarDayNight.ImageList = this.buttonImages;
- this.toolBarDayNight.Location = new System.Drawing.Point(230, 38);
- this.toolBarDayNight.Name = "toolBarDayNight";
- this.toolBarDayNight.ShowToolTips = true;
- this.toolBarDayNight.Size = new System.Drawing.Size(46, 48);
- this.toolBarDayNight.TabIndex = 27;
- this.toolBarDayNight.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.toolBar1_ButtonClick);
- //
- // tbDay
- //
- this.tbDay.ImageIndex = 1;
- this.tbDay.Name = "tbDay";
- this.tbDay.Style = System.Windows.Forms.ToolBarButtonStyle.ToggleButton;
- this.tbDay.Tag = freetrain.views.NightSpriteMode.AlwaysDay;
- //
- // tbNight
- //
- this.tbNight.ImageIndex = 2;
- this.tbNight.Name = "tbNight";
- this.tbNight.Style = System.Windows.Forms.ToolBarButtonStyle.ToggleButton;
- this.tbNight.Tag = freetrain.views.NightSpriteMode.AlwaysNight;
- //
- // TrainTradingDialog
- //
- this.AutoScaleBaseSize = new System.Drawing.Size(6, 14);
- this.ClientSize = new System.Drawin...
[truncated message content] |
|
From: <ste...@us...> - 2007-09-26 12:18:23
|
Revision: 200
http://freetrain.svn.sourceforge.net/freetrain/?rev=200&view=rev
Author: stevenhoefel
Date: 2007-09-26 05:17:49 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
File not needed anymore.
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/SDLGUIDrawer.cs
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-09-25 06:15:59 UTC (rev 199)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2007-09-26 12:17:49 UTC (rev 200)
@@ -69,9 +69,6 @@
</Compile>
<Compile Include="SDLGUI.cs" />
<Compile Include="SDLGUIButton.cs" />
- <Compile Include="SDLGUIDrawer.cs">
- <SubType>Code</SubType>
- </Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="core\FreeTrain.Core.csproj">
Deleted: branches/FreeTrainSDL/SDLGUIDrawer.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIDrawer.cs 2007-09-25 06:15:59 UTC (rev 199)
+++ branches/FreeTrainSDL/SDLGUIDrawer.cs 2007-09-26 12:17:49 UTC (rev 200)
@@ -1,440 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Windows.Forms;
-using System.Runtime.InteropServices;
-using System.Drawing;
-using Tao.Sdl;
-using org.kohsuke.directdraw;
-
-namespace FreeTrainSDL
-{
- public enum GUI_DRAWER_Movements
- {
- NO_MOVEMENT,
- DRAWER_OPENING,
- DRAWER_CLOSING
- };
-
- public enum GUI_DRAWER_Alignment
- {
- TOP_DOWN,
- RIGHT_LEFT,
- BOTTOM_UP,
- LEFT_RIGHT
- };
-
- public class SDLGUIDrawer
- {
- protected Rectangle DRAWER_TAB_POS;
- protected Surface drawer, container, containerON;
-
- protected int X_POSITION, Y_POSITION;
- protected int X_POSITION_OFFSET, Y_POSITION_OFFSET;
- protected int CLICK_X_MIN, CLICK_X_MAX, CLICK_Y_MIN, CLICK_Y_MAX;
- protected int DRAWER_HEIGHT = 104;
-
- protected int SCR_WIDTH, SCR_HEIGHT;
-
- protected int REAL_Y_HEIGHT, MIN_SPEED = 15, LIST_BUTTONS = 5;
-
- public int DRAW_OPEN_AMOUNT = 0;
-
- protected bool drawHighlight = false;
-
- public event EventHandler MenuItemClicked;
-
- protected IntPtr freesans;
-
- protected int currentArea = -1;
-
- protected string[] LIST_TEXT = { "NEW","SAVE","LOAD","FULLSCREEN","EXIT" };
-
- public Color drawerColor = Color.FromArgb(236, 236, 184), baseGUIColor = Color.FromArgb(252, 252, 236);
-
- protected int dColor, bColor, wColor, tPlacedColor, tMovingColor;
-
- protected GUI_DRAWER_Movements drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
- protected GUI_DRAWER_Alignment drawer_alignment = GUI_DRAWER_Alignment.TOP_DOWN;
-
- public SDLGUIDrawer(int width, int height, int x_off, int y_off, IntPtr pf)
- {
- X_POSITION_OFFSET = x_off; // FROM RIGHT
- Y_POSITION_OFFSET = y_off; // FROM TOP
- X_POSITION = width - x_off;
- Y_POSITION = y_off;
-
- SCR_WIDTH = width;
- SCR_HEIGHT = height;
-
- drawer = new Surface(Application.StartupPath + "\\gui\\drawer.bmp");
- container = new Surface(Application.StartupPath + "\\gui\\system.bmp");
- containerON = new Surface(Application.StartupPath + "\\gui\\systemon.bmp");
-
- DRAWER_TAB_POS = new Rectangle(X_POSITION, Y_POSITION, drawer.size.Width, drawer.size.Height);
-
- CLICK_X_MIN = X_POSITION;
- CLICK_X_MAX = X_POSITION + drawer.size.Width;
-
- CLICK_Y_MIN = 0;
- CLICK_Y_MAX = Y_POSITION + drawer.size.Height;
-
- REAL_Y_HEIGHT = drawer.size.Height;
-
- freesans = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", 14);
-
- dColor = Sdl.SDL_MapRGB(pf, drawerColor.R, drawerColor.G, drawerColor.B);
- bColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
- wColor = Sdl.SDL_MapRGB(pf, 255,255,255);
- tPlacedColor = Sdl.SDL_MapRGB(pf, 150,150,150);
- }
-
- public void updateDrawer(int width, int height)
- {
- SCR_WIDTH = width;
- SCR_HEIGHT = height;
-
- switch (drawer_movement)
- {
- case GUI_DRAWER_Movements.DRAWER_CLOSING:
- DRAW_OPEN_AMOUNT /= 2;
- if (DRAW_OPEN_AMOUNT <= 0)
- {
- DRAW_OPEN_AMOUNT = 0;
- drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
- }
- break;
- case GUI_DRAWER_Movements.DRAWER_OPENING:
- if (DRAW_OPEN_AMOUNT == 0) DRAW_OPEN_AMOUNT = 1;
- DRAW_OPEN_AMOUNT *= 2;
- if (DRAW_OPEN_AMOUNT > 100)
- {
- DRAW_OPEN_AMOUNT = 100;
- drawer_movement = GUI_DRAWER_Movements.NO_MOVEMENT;
- }
- break;
- case GUI_DRAWER_Movements.NO_MOVEMENT:
- //nothing as yet.
- break;
- }
-
- if (drawer_alignment == GUI_DRAWER_Alignment.LEFT_RIGHT || drawer_alignment == GUI_DRAWER_Alignment.RIGHT_LEFT)
- {
- if (DRAW_OPEN_AMOUNT > 0) DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET) - (DRAWER_HEIGHT / (100/DRAW_OPEN_AMOUNT));
- else DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET);
- DRAWER_TAB_POS.Y = (Y_POSITION_OFFSET);
-
- if (drawer_alignment == GUI_DRAWER_Alignment.RIGHT_LEFT)
- {
- CLICK_X_MIN = DRAWER_TAB_POS.X;
- CLICK_X_MAX = SCR_WIDTH;
- CLICK_Y_MIN = DRAWER_TAB_POS.Y;
- CLICK_Y_MAX = DRAWER_TAB_POS.Y + REAL_Y_HEIGHT;
- }
- }
- else
- {
- DRAWER_TAB_POS.X = (SCR_WIDTH - X_POSITION_OFFSET);
- if (DRAW_OPEN_AMOUNT > 0) DRAWER_TAB_POS.Y = Y_POSITION_OFFSET + (DRAWER_HEIGHT / (100/DRAW_OPEN_AMOUNT));
- else DRAWER_TAB_POS.Y = (Y_POSITION_OFFSET);
-
- if (drawer_alignment == GUI_DRAWER_Alignment.TOP_DOWN)
- {
- CLICK_X_MIN = DRAWER_TAB_POS.X;
- CLICK_X_MAX = DRAWER_TAB_POS.X + drawer.size.Width;
- CLICK_Y_MIN = 0;
- CLICK_Y_MAX = DRAWER_TAB_POS.Y + drawer.size.Height;
- }
- }
- }
-
- public bool checkClick(Sdl.SDL_MouseButtonEvent e)
- {
- bool wasGUIClick = false;
- int x = e.x, y = e.y;
- if (x >= CLICK_X_MIN && x <= CLICK_X_MAX)
- if (y >= CLICK_Y_MIN && y <= CLICK_Y_MAX)
- {
- if (e.button == Sdl.SDL_BUTTON_MIDDLE)
- {
- DRAWER_TAB_POS.Y = y;
- }
- else
- {
- if (currentArea >= 0 && MenuItemClicked != null && DRAW_OPEN_AMOUNT == 100) MenuItemClicked(currentArea, null);
-
- if (drawer_movement == GUI_DRAWER_Movements.NO_MOVEMENT && DRAW_OPEN_AMOUNT == 0)
- drawer_movement = GUI_DRAWER_Movements.DRAWER_OPENING;
- else
- drawer_movement = GUI_DRAWER_Movements.DRAWER_CLOSING;
- }
- wasGUIClick = true;
- }
- Console.WriteLine("CLICK!");
- return wasGUIClick;
- }
-
- public void checkMovement(Sdl.SDL_MouseMotionEvent e)
- {
- drawHighlight = false;
- switch (drawer_alignment)
- {
- case GUI_DRAWER_Alignment.LEFT_RIGHT:
- if (e.x >= 0 && e.x <= (DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width))
- if (e.y >= DRAWER_TAB_POS.Y && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT)) drawHighlight = true;
- break;
- case GUI_DRAWER_Alignment.TOP_DOWN:
- currentArea = -1;
- if (e.x >= DRAWER_TAB_POS.X && e.x <= (DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width))
- if (e.y >= 0 && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT))
- {
- drawHighlight = true;
- currentArea = (e.y - Y_POSITION_OFFSET - 4) / 18;
- }
- break;
- case GUI_DRAWER_Alignment.RIGHT_LEFT:
- if (e.x >= DRAWER_TAB_POS.X && e.x <= SCR_WIDTH)
- if (e.y >= DRAWER_TAB_POS.Y && e.y <= (DRAWER_TAB_POS.Y + REAL_Y_HEIGHT)) drawHighlight = true;
- break;
- case GUI_DRAWER_Alignment.BOTTOM_UP:
- break;
- }
- }
-
- public void drawDrawer(IntPtr screen, int width, int height)
- {
- Sdl.SDL_Rect src, dst;
- if (DRAW_OPEN_AMOUNT > 0)
- {
- src = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 4), (short)(Y_POSITION), (short)(DRAWER_TAB_POS.Width - 9), (short)(DRAWER_TAB_POS.Y - 5));
- Tao.Sdl.Sdl.SDL_FillRect(screen, ref src, dColor);
- Tao.Sdl.SdlGfx.vlineColor(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(DRAWER_TAB_POS.Y + 4), (short)(Y_POSITION), 0);
- Tao.Sdl.SdlGfx.vlineColor(screen, (short)((DRAWER_TAB_POS.X + 3) + (DRAWER_TAB_POS.Width - 8)), (short)(DRAWER_TAB_POS.Y + 4), (short)(Y_POSITION), 0);
- }
-
- src = drawer.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, (short)DRAWER_TAB_POS.Y, (short)drawer.size.Width, (short)drawer.size.Height);
- Tao.Sdl.Sdl.SDL_BlitSurface(drawer.surfacePtr(), ref src, screen, ref dst);
-
- int fColor = 0;
-
- if (DRAW_OPEN_AMOUNT > 0)
- {
- for (int cur = 0; cur < LIST_BUTTONS; cur++)
- {
- fColor = 0;
- Tao.Sdl.SdlGfx.rectangleRGBA(screen,(short)(DRAWER_TAB_POS.X + 7),
- (short)(DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20)),
- (short)(DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width - 9),
- (short)((DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20)) + 16),0,0,0,255);
-
- if (currentArea == cur)
- {
- src=new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 8),
- (short)(DRAWER_TAB_POS.Y - ((LIST_BUTTONS - (cur)) * 20) + 1),
- (short)(DRAWER_TAB_POS.Width - 17),
- (short)15);
- Tao.Sdl.Sdl.SDL_FillRect(screen, ref src,0);
- fColor = 255;
- }
- drawText(screen, freesans, LIST_TEXT[cur], (byte)fColor, (byte)fColor, (byte)fColor, 255, (DRAWER_TAB_POS.X + (DRAWER_TAB_POS.Width / 2)), DRAWER_TAB_POS.Y - (((LIST_BUTTONS - cur) * 20) + 2));
- }
- }
-
- if (drawHighlight)
- {
- src = containerON.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, 0, (short)containerON.size.Width, (short)containerON.size.Height);
- Tao.Sdl.Sdl.SDL_BlitSurface(containerON.surfacePtr(), ref src, screen, ref dst);
- }
- else
- {
- src = container.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X, 0, (short)container.size.Width, (short)container.size.Height);
- Tao.Sdl.Sdl.SDL_BlitSurface(container.surfacePtr(), ref src, screen, ref dst);
- }
- }
-
- public void drawText(IntPtr screen, IntPtr in_font, string in_text, byte r, byte g, byte b, byte a, int x, int y)
- {
- if (in_text != string.Empty)
- {
- IntPtr text = SdlTtf.TTF_RenderUTF8_Blended(in_font, in_text, new Sdl.SDL_Color(r, g, b, a));
- Sdl.SDL_Surface txt = (Sdl.SDL_Surface)Marshal.PtrToStructure(text, typeof(Sdl.SDL_Surface));
- Sdl.SDL_Rect src = new Sdl.SDL_Rect(0, 0, (short)txt.w, (short)txt.h);
- Sdl.SDL_Rect dst = new Sdl.SDL_Rect((short)(x - (txt.w / 2)), (short)y, src.w, src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(text, ref src, screen, ref dst);
- Sdl.SDL_FreeSurface(text);
- }
- }
- }
-
- public class SDLGUIDrawerSatellite : SDLGUIDrawer
- {
- public SDLGUIDrawerSatellite(int w, int h, int x, int y, IntPtr pf) : base(w,h,x,y, pf)
- {
- drawer = new Surface(Application.StartupPath + "\\gui\\satdrawertop.bmp");
- container = new Surface(Application.StartupPath + "\\gui\\sattext.bmp");
- containerON = new Surface(Application.StartupPath + "\\gui\\sattexton.bmp");
-
- DRAWER_TAB_POS = new Rectangle(X_POSITION, Y_POSITION, drawer.size.Width, drawer.size.Height);
-
- drawer_alignment = GUI_DRAWER_Alignment.RIGHT_LEFT;
-
- DRAWER_HEIGHT = 180;
- REAL_Y_HEIGHT = SCR_HEIGHT - 58;
-
- CLICK_X_MIN = X_POSITION;
- CLICK_X_MAX = SCR_WIDTH;
-
- CLICK_Y_MIN = Y_POSITION;
- CLICK_Y_MAX = Y_POSITION + REAL_Y_HEIGHT;
-
- for (int i = 0; i < MAX_TRAINS; i++) TrainStatus[i] = 0;
- }
-
- public int selectedTrain = -1;
- int TrainRegistryLeft, TrainRegistryTop, TrainRegistryButtonWidth = 25, TrainRegistryButtonHeight = 16, TrainRegistryButtonSpacing = 4;
- const int MAX_TRAINS = 30;
- public int[] TrainStatus = new int[MAX_TRAINS];
-
- new public EventHandler MenuItemClicked;
-
- public string currentTrainText;
-
- new public bool checkClick(Sdl.SDL_MouseButtonEvent e)
- {
- bool wasGUIClick = false;
- int x = e.x, y = e.y;
- if (x >= CLICK_X_MIN && x <= CLICK_X_MAX)
- if (y >= CLICK_Y_MIN && y <= CLICK_Y_MAX)
- {
- if ((x >= TrainRegistryLeft && x <= (TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 3)) &&
- y <= (TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2) && y >= TrainRegistryTop)
- {
- selectedTrain = (x-TrainRegistryLeft)/(TrainRegistryButtonWidth + TrainRegistryButtonSpacing) + (((y-TrainRegistryTop)/(TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) * 5);
- //Console.WriteLine(curTrain);
- currentTrainText = "";
- }
- else
- {
-
- if (currentArea >= 0 && MenuItemClicked != null && DRAW_OPEN_AMOUNT == 100) MenuItemClicked(currentArea, null);
-
- if (drawer_movement == GUI_DRAWER_Movements.NO_MOVEMENT && DRAW_OPEN_AMOUNT == 0)
- drawer_movement = GUI_DRAWER_Movements.DRAWER_OPENING;
- else
- drawer_movement = GUI_DRAWER_Movements.DRAWER_CLOSING;
- }
- wasGUIClick = true;
- }
- Console.WriteLine("CLICK!");
- return wasGUIClick;
- }
-
- public void drawDrawer(IntPtr screen, int width, int height, Surface satmap)
- {
- Sdl.SDL_Rect src, dst;
- src = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 3), (short)(DRAWER_TAB_POS.Y), (short)(SCR_WIDTH - 28 - DRAWER_TAB_POS.X), (short)(SCR_HEIGHT - 37 - 24));
- if (DRAW_OPEN_AMOUNT > 0)
- {
- Sdl.SDL_FillRect(screen,ref src,dColor);
-
- Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(SCR_WIDTH - 24), (short)(Y_POSITION),0,0,0,255);
- Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(DRAWER_TAB_POS.X + 3), (short)(SCR_WIDTH - 26), (short)(SCR_HEIGHT - 37), 0, 0, 0, 255);
- Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)((DRAWER_TAB_POS.X + 3) + (DRAWER_TAB_POS.Width - 8)), (short)(SCR_WIDTH - 26), (short)(SCR_HEIGHT - 37), 0, 0, 0, 255);
-
- if (satmap != null)
- {
- src = new Sdl.SDL_Rect(0, 0, (short)satmap.surface.w, (short)satmap.surface.h);
- dst = new Sdl.SDL_Rect((short)(DRAWER_TAB_POS.X + 25), (short)(DRAWER_TAB_POS.Y + 10), (short)((SCR_WIDTH-35) - DRAWER_TAB_POS.X), (short)satmap.surface.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(satmap.surfacePtr(), ref src, screen, ref dst);
- }
-
- TrainRegistryLeft = DRAWER_TAB_POS.X + 25;
- TrainRegistryTop = DRAWER_TAB_POS.Y + 200;
-
- SdlGfx.rectangleRGBA(screen, (short)TrainRegistryLeft, (short)TrainRegistryTop, (short)(TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 3), (short)(TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2), 204, 204, 168, 255);
- for (int curLine = 1; curLine < 6; curLine++)
- {
- if (curLine < 5) SdlGfx.vlineRGBA(screen, (short)(TrainRegistryLeft + 1 + (curLine * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing))), (short)(TrainRegistryTop), (short)(short)(TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 3), 204, 204, 168, 255);
- SdlGfx.hlineRGBA(screen, (short)TrainRegistryLeft, (short)(TrainRegistryLeft + (5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)) + 1), (short)(short)(TrainRegistryTop + (curLine * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 1), 204, 204, 168, 255);
- }
-
- for (int curTrain = 0; curTrain < MAX_TRAINS; curTrain++)
- {
- short x1 = (short)((TrainRegistryLeft + 3) + ((curTrain % 5) * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing)));
- short y1 = (short)(TrainRegistryTop + 3 + ((curTrain / 5) * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)));
- if (TrainStatus[curTrain] >= 1)
- {
- SdlGfx.rectangleRGBA(screen, x1, y1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight), 84, 84, 152, 255);
- SdlGfx.hlineRGBA(screen, x1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight - 1), 84, 84, 152, 255);
- SdlGfx.hlineRGBA(screen, x1, (short)(x1 + TrainRegistryButtonWidth), (short)(y1 + TrainRegistryButtonHeight - 2), 84, 84, 152, 255);
- dst = new Sdl.SDL_Rect((short)(x1 + 1), (short)(y1 + 1), (short)(TrainRegistryButtonWidth - 1), (short)(TrainRegistryButtonHeight - 3));
- if (TrainStatus[curTrain] == 2)
- Sdl.SDL_FillRect(screen, ref dst,0);
- else if (TrainStatus[curTrain] == 3)
- Sdl.SDL_FillRect(screen, ref dst, wColor);
- if (curTrain == selectedTrain) drawText(screen, freesans, curTrain.ToString(), 200, 0, 0, 255, x1 + 13, y1 - 3);
- else drawText(screen, freesans, curTrain.ToString(), 0, 0, 0, 255, x1 + 13, y1 - 3);
- }
- else drawText(screen, freesans, curTrain.ToString(), 204, 204, 168, 255, x1 + 13, y1 - 3);
-
- }
-
- if (selectedTrain >= 0)
- {
- drawText(screen, freesans, currentTrainText, 0, 0, 0, 255, TrainRegistryLeft + ((5 * (TrainRegistryButtonWidth + TrainRegistryButtonSpacing))/2), (TrainRegistryTop + (6 * (TrainRegistryButtonHeight + TrainRegistryButtonSpacing)) + 2) + 20);
- }
- }
-
- src = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X,(short)DRAWER_TAB_POS.Y,(short)(DRAWER_TAB_POS.Width-1),(short)(height - 62));
- Tao.Sdl.Sdl.SDL_FillRect(screen,ref src,dColor);
-
- Tao.Sdl.SdlGfx.rectangleRGBA(screen, (short)DRAWER_TAB_POS.X,
- (short)DRAWER_TAB_POS.Y,
- (short)(DRAWER_TAB_POS.X + DRAWER_TAB_POS.Width - 1),
- (short)(((SCR_HEIGHT - 38))), 0, 0, 0, 255);
-
-
-
- DRAWER_TAB_POS.Y = Y_POSITION;
-
- src = drawer.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)DRAWER_TAB_POS.X,(short)(DRAWER_TAB_POS.Y-1),src.w,src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(drawer.surfacePtr(), ref src, screen, ref dst);
-
-
-
-
- if (drawHighlight)
- {
- src = containerON.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)(SCR_WIDTH - 25), (short)(DRAWER_TAB_POS.Y), src.w, src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(containerON.surfacePtr(), ref src, screen, ref dst);
- }
- else
- {
- src = container.clipSDLRect;
- dst = new Sdl.SDL_Rect((short)(SCR_WIDTH - 25), (short)(DRAWER_TAB_POS.Y), src.w, src.h);
- Tao.Sdl.Sdl.SDL_BlitSurface(container.surfacePtr(), ref src, screen, ref dst);
- }
-
- Tao.Sdl.SdlGfx.hlineRGBA(screen, (short)(SCR_WIDTH - 25), (short)(SCR_WIDTH), (short)(Y_POSITION),0,0,0,255);
- Tao.Sdl.SdlGfx.vlineRGBA(screen, (short)(SCR_WIDTH - 25), (short)(Y_POSITION + 100), (short)(SCR_HEIGHT - 42), 152, 152, 116, 255);
-
-
- Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 1), (short)(SCR_HEIGHT - 40),0,0, 0, 255);
- Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 1), (short)(SCR_HEIGHT - 39), 0, 0, 0, 255);
- Tao.Sdl.SdlGfx.pixelRGBA(screen, (short)(DRAWER_TAB_POS.X + 2), (short)(SCR_HEIGHT - 39), 0,0, 0, 255);
- /*
-
- Color[,] cols = new Color[2, 2];
- cols[0, 0] = Color.Black;
- cols[0, 1] = Color.Black;
- cols[1, 0] = drawerColor;
- cols[1, 1] = Color.Black;
- screen.SetPixels(new Point(DRAWER_TAB_POS.X + 1, SCR_HEIGHT - 39), cols);*/
- }
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-13 16:06:07
|
Revision: 210
http://freetrain.svn.sourceforge.net/freetrain/?rev=210&view=rev
Author: jendave
Date: 2008-03-13 09:06:11 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
cleanup of halvoxelstructure. Fix license copyright. ignored a lot of files
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIButton.cs
branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
branches/FreeTrainSDL/lib/Controls/ColorPicker.cs
branches/FreeTrainSDL/lib/Controls/CostBox.cs
branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs
branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs
branches/FreeTrainSDL/lib/Controls/IndexSelector.cs
branches/FreeTrainSDL/lib/Controls/MruMenu.cs
branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/lib/Controls/SubListSelector.cs
branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs
branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
branches/FreeTrainSDL/lib/Controls/WebBrowser.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/Properties/AssemblyInfo.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseVoxel.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/Properties/AssemblyInfo.cs
Property Changed:
----------------
branches/FreeTrainSDL/bin/Debug/
branches/FreeTrainSDL/bin/Debug/gui/
branches/FreeTrainSDL/bin/Debug/plugins/
branches/FreeTrainSDL/core/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/bin/Debug/
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/Program.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/Properties/AssemblyInfo.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/Properties/AssemblyInfo.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/SDLGUI.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/SDLGUIButton.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Property changes on: branches/FreeTrainSDL/bin/Debug
___________________________________________________________________
Name: svn:ignore
+ AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.Core.dll
FreeTrain.Core.pdb
FreeTrainSDL.exe
FreeTrainSDL.pdb
FreeTrainSDL.vshost.exe
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Tao.Sdl.dll
Tao.Sdl.xml
Property changes on: branches/FreeTrainSDL/bin/Debug/gui
___________________________________________________________________
Name: svn:ignore
+ botleft.bmp
botright.bmp
drawer.bmp
FreeSans.ttf
land.png
land_down.png
playlist.png
playlist_down.png
rail.png
rail_down.png
satdrawertop.bmp
sattext.bmp
sattexton.bmp
splash.bmp
station.png
station_down.png
struct.png
struct_down.png
system.bmp
systemon.bmp
top.bmp
train.png
train_down.png
Property changes on: branches/FreeTrainSDL/bin/Debug/plugins
___________________________________________________________________
Name: svn:ignore
+ system
jp.co.tripod.chiname.lib
jp.co.tripod.chiname.lib.generic
jp.co.tripod.chiname.lib.halfvoxel
jp.co.tripod.chiname.structure.hv.oldhouse
org.kohsuke.freetrain.land.477
org.kohsuke.freetrain.music
org.kohsuke.freetrain.music.bell
org.kohsuke.freetrain.station
org.kohsuke.freetrain.stationary.ayase
org.kohsuke.freetrain.structure.ayase
org.kohsuke.freetrain.structure.c477
org.kohsuke.freetrain.structure.osakaCastle
org.kohsuke.freetrain.trains
org.kohsuke.freetrain.trains.colorTest
Property changes on: branches/FreeTrainSDL/core
___________________________________________________________________
Name: svn:ignore
- obj
+ obj
Debug
Modified: branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -153,4 +153,4 @@
pickerForm.Hide();
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/ColorPicker.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/ColorPicker.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/ColorPicker.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -476,4 +476,4 @@
return list.GetEnumerator();
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/CostBox.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/CostBox.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/CostBox.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -138,9 +138,9 @@
//
// CostBox
//
- this.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.groupBox1,
- this.costTextBox,
+ this.Controls.AddRange(new System.Windows.Forms.Control[] {
+ this.groupBox1,
+ this.costTextBox,
this.labelTextBox});
this.Name = "CostBox";
this.Size = new System.Drawing.Size(96, 32);
@@ -149,4 +149,4 @@
}
#endregion
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -104,4 +104,4 @@
{
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -75,4 +75,4 @@
handler(fileName);
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/IndexSelector.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/IndexSelector.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/IndexSelector.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/lib/Controls/MruMenu.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/Properties/AssemblyInfo.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/lib/Controls/SubListSelector.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/SubListSelector.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/SubListSelector.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -238,14 +238,14 @@
//
// SubListSelector
//
- this.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.titleSelected,
- this.titleAvailables,
- this.down,
- this.up,
- this.unselect,
- this.select,
- this.selectedList,
+ this.Controls.AddRange(new System.Windows.Forms.Control[] {
+ this.titleSelected,
+ this.titleAvailables,
+ this.down,
+ this.up,
+ this.unselect,
+ this.select,
+ this.selectedList,
this.availablesList});
this.Name = "SubListSelector";
this.Size = new System.Drawing.Size(344, 208);
@@ -335,4 +335,4 @@
down.Location = new Point(listWidth * 2 + 48, 16 + listHeight / 2 + 12);
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -45,4 +45,4 @@
OnValueChanged(e);
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -92,4 +92,4 @@
//System.Diagnostics.Process.Start(targetUrl);
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/Controls/WebBrowser.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/WebBrowser.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/Controls/WebBrowser.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -63,4 +63,4 @@
}
}
}
-}
+}
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Properties/AssemblyInfo.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Properties/AssemblyInfo.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Surface.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/Properties/AssemblyInfo.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -122,4 +122,4 @@
}
}
-}
+}
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -484,4 +484,4 @@
}
}
-}
+}
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -67,4 +67,4 @@
}
}
-}
+}
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/Properties/AssemblyInfo.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,6 +1,6 @@
#region LICENSE
/*
- * Copyright (C) 2004 - 2007 David Hudson (je...@ya...)
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -370,4 +370,4 @@
}
}
-}
+}
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/bin/Debug
___________________________________________________________________
Name: svn:ignore
+ AxSHDocVw.dll
FreeTrain.ContribEx.dll
FreeTrain.ContribEx.pdb
FreeTrain.ContribEx.XML
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs 2008-03-13 15:21:23 UTC (rev 209)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs 2008-03-13 16:06:11 UTC (rev 210)
@@ -1,529 +1,569 @@
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using freetrain.controllers;
-using freetrain.contributions.common;
-using freetrain.views;
-using freetrain.views.map;
-using freetrain.world;
-using freetrain.world.terrain;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.util;
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using freetrain.controllers;
+using freetrain.contributions.common;
+using freetrain.views;
+using freetrain.views.map;
+using freetrain.world;
+using freetrain.world.terrain;
+using freetrain.framework;
+using freetrain.framework.graphics;
+using freetrain.framework.plugin;
+using freetrain.util;
//using SDL.net;
-using SDL.net;
-
-namespace freetrain.world.structs.hv
-{
- /// <summary>
- /// Controller that allows the user to
- /// place/remove cars.
- /// </summary>
- public class ControllerForm :ControllerHostForm
- {
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.RadioButton btnRemove;
- private System.Windows.Forms.RadioButton btnPlace;
- private freetrain.controls.CostBox price;
- private System.Windows.Forms.ToolTip toolTip1;
- private System.Windows.Forms.GroupBox group;
- private System.Windows.Forms.Label namelabel;
- private freetrain.controls.IndexSelector idxDesign;
- private freetrain.controls.IndexSelector idxColor;
- private System.Windows.Forms.ComboBox typeBox;
- private System.Windows.Forms.CheckBox cbRndColor;
- private System.Windows.Forms.CheckBox cbRndDesign;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.CheckBox cbRndColor2;
- private freetrain.controls.IndexSelector idxColor2;
-
- private Bitmap previewBitmap;
- private Random rnd;
-
- public ControllerForm() {
- InitializeComponent();
- World.world.viewOptions.OnViewOptionChanged+=new OptionChangedHandler(updatePreview);
- rnd = new Random();
-
- callback = new createCallback(randomize);
- typeBox.DataSource = loadContributions();
- onTypeChanged(this,null);
- onButtonClicked(this,null);
- }
-
- /// <summary>
- /// Called to prepare array of contribution used for typeBox.DataSource
- /// </summary>
- /// <returns></returns>
- private ArrayList loadContributions()
- {
- Array src = PluginManager.theInstance.listContributions(typeof(HalfVoxelContribution));
- Hashtable h = new Hashtable();
- foreach( HalfVoxelContribution c in src)
- {
- string key = c.subgroup;
- if(!h.ContainsKey(key))
- h.Add(key,new SubGroup(key));
- ((SubGroup)h[key]).Add(c);
- }
- ArrayList dest = new ArrayList();
- foreach(object o in h.Values)
- dest.Add(o);
- return dest;
- }
-
- protected override void Dispose( bool disposing ) {
- World.world.viewOptions.OnViewOptionChanged-=new OptionChangedHandler(updatePreview);
- if( disposing && components != null)
- components.Dispose();
- base.Dispose( disposing );
-
- if( previewBitmap!=null )
- previewBitmap.Dispose();
- }
-
- #region Designer generated code
- private System.Windows.Forms.PictureBox preview;
- private System.ComponentModel.IContainer components = null;
- private freetrain.controls.IndexSelector indexSelector;
-
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- this.preview = new System.Windows.Forms.PictureBox();
- this.btnRemove = new System.Windows.Forms.RadioButton();
- this.btnPlace = new System.Windows.Forms.RadioButton();
- this.group = new System.Windows.Forms.GroupBox();
- this.namelabel = new System.Windows.Forms.Label();
- this.idxDesign = new freetrain.controls.IndexSelector();
- this.idxColor = new freetrain.controls.IndexSelector();
- this.label1 = new System.Windows.Forms.Label();
- this.typeBox = new System.Windows.Forms.ComboBox();
- this.label3 = new System.Windows.Forms.Label();
- this.cbRndColor = new System.Windows.Forms.CheckBox();
- this.cbRndDesign = new System.Windows.Forms.CheckBox();
- this.label2 = new System.Windows.Forms.Label();
- this.cbRndColor2 = new System.Windows.Forms.CheckBox();
- this.idxColor2 = new freetrain.controls.IndexSelector();
- this.price = new freetrain.controls.CostBox();
- this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.indexSelector = new freetrain.controls.IndexSelector();
- this.group.SuspendLayout();
- this.SuspendLayout();
- //
- // preview
- //
- this.preview.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Right);
- this.preview.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.preview.Location = new System.Drawing.Point(152, 8);
- this.preview.Name = "preview";
- this.preview.Size = new System.Drawing.Size(80, 112);
- this.preview.TabIndex = 1;
- this.preview.TabStop = false;
- this.toolTip1.SetToolTip(this.preview, "Click to create another random pattern");
- //! this.toolTip1.SetToolTip(this.preview, "クリックすると別のランダムパターンを生成します");
- this.preview.Click += new System.EventHandler(this.onPreviewClick);
- //
- // btnRemove
- //
- this.btnRemove.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.btnRemove.Appearance = System.Windows.Forms.Appearance.Button;
- this.btnRemove.Location = new System.Drawing.Point(188, 164);
- this.btnRemove.Name = "btnRemove";
- this.btnRemove.Size = new System.Drawing.Size(56, 24);
- this.btnRemove.TabIndex = 8;
- this.btnRemove.Text = "Remove";
- //! this.btnRemove.Text = "撤去";
- this.btnRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.btnRemove.Click += new System.EventHandler(this.onButtonClicked);
- //
- // btnPlace
- //
- this.btnPlace.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.btnPlace.Appearance = System.Windows.Forms.Appearance.Button;
- this.btnPlace.Checked = true;
- this.btnPlace.Location = new System.Drawing.Point(140, 164);
- this.btnPlace.Name = "btnPlace";
- this.btnPlace.Size = new System.Drawing.Size(48, 24);
- this.btnPlace.TabIndex = 7;
- this.btnPlace.TabStop = true;
- this.btnPlace.Text = "Place";
- //! this.btnPlace.Text = "設置";
- this.btnPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.btnPlace.Click += new System.EventHandler(this.onButtonClicked);
- //
- // group
- //
- this.group.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.namelabel,
- this.idxDesign,
- this.idxColor,
- this.label1,
- this.typeBox,
- this.label3,
- this.cbRndColor,
- this.cbRndDesign,
- this.label2,
- this.cbRndColor2,
- this.idxColor2});
- this.group.Name = "group";
- this.group.Size = new System.Drawing.Size(136, 188);
- this.group.TabIndex = 1;
- this.group.TabStop = false;
- this.group.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)|(System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
- this.toolTip1.SetToolTip(this.group, "Select a building to the left");
- //! this.toolTip1.SetToolTip(this.group, "左側の建物選択");
- //
- // namelabel
- //
- this.namelabel.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.namelabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.namelabel.Location = new System.Drawing.Point(8, 76);
- this.namelabel.Name = "namelabel";
- this.namelabel.Size = new System.Drawing.Size(120, 28);
- this.namelabel.TabIndex = 13;
- this.namelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // idxDesign
- //
- this.idxDesign.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.idxDesign.count = 10;
- this.idxDesign.current = 0;
- this.idxDesign.dataSource = null;
- this.idxDesign.Location = new System.Drawing.Point(8, 56);
- this.idxDesign.Name = "idxDesign";
- this.idxDesign.Size = new System.Drawing.Size(120, 16);
- this.idxDesign.TabIndex = 5;
- this.idxDesign.indexChanged += new System.EventHandler(this.onDesignChanged);
- //
- // idxColor
- //
- this.idxColor.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.idxColor.count = 10;
- this.idxColor.current = 0;
- this.idxColor.dataSource = null;
- this.idxColor.Location = new System.Drawing.Point(8, 126);
- this.idxColor.Name = "idxColor";
- this.idxColor.Size = new System.Drawing.Size(120, 16);
- this.idxColor.TabIndex = 11;
- this.idxColor.indexChanged += new System.EventHandler(this.onColorChanged);
- //
- // label1
- //
- this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Location = new System.Drawing.Point(8, 40);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(56, 16);
- this.label1.TabIndex = 12;
- this.label1.Text = "Design:";
- //! this.label1.Text = "デザイン：";
- this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // typeBox
- //
- this.typeBox.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.typeBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.typeBox.Location = new System.Drawing.Point(3, 8);
- this.typeBox.Name = "typeBox";
- this.typeBox.Size = new System.Drawing.Size(130, 20);
- this.typeBox.Sorted = true;
- this.typeBox.TabIndex = 1;
- this.toolTip1.SetToolTip(this.typeBox, "Select a building to the left");
- //! this.toolTip1.SetToolTip(this.typeBox, "左側の建物選択");
- this.typeBox.SelectedIndexChanged += new System.EventHandler(this.onTypeChanged);
- //
- // label3
- //
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(8, 108);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(56, 16);
- this.label3.TabIndex = 12;
- this.label3.Text = "Color:";
- //! this.label3.Text = "カラー：";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // cbRndColor
- //
- this.cbRndColor.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
- this.cbRndColor.BackColor = System.Drawing.Color.Transparent;
- this.cbRndColor.Location = new System.Drawing.Point(68, 108);
- this.cbRndColor.Name = "cbRndColor";
- this.cbRndColor.Size = new System.Drawing.Size(68, 16);
- this.cbRndColor.TabIndex = 7;
- this.cbRndColor.Text = "Random";
- //! this.cbRndColor.Text = "ランダム";
- this.cbRndColor.CheckedChanged += new System.EventHandler(this.onCheckBoxChanged);
- //
- // cbRndDesign
- //
- this.cbRndDesign.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
- this.cbRndDesign.BackColor = System.Drawing.Color.Transparent;
- this.cbRndDesign.Location = new System.Drawing.Point(68, 40);
- this.cbRndDesign.Name = "cbRndDesign";
- this.cbRndDesign.Size = new System.Drawing.Size(68, 16);
- this.cbRndDesign.TabIndex = 3;
- this.cbRndDesign.Text = "Random";
- //! this.cbRndDesign.Text = "ランダム";
- this.cbRndDesign.CheckedChanged += new System.EventHandler(this.onCheckBoxChanged);
- //
- // label2
- //
- this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(8, 148);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(56, 16);
- this.label2.TabIndex = 12;
- this.label2.Text = "Color 2:";
- //! this.label2.Text = "カラー2：";
- this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // cbRndColor2
- //
- this.cbRndColor2.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
- this.cbRndColor2.BackColor = System.Drawing.Color.Transparent;
- this.cbRndColor2.Location = new System.Drawing.Point(68, 148);
- this.cbRndColor2.Name = "cbRndColor2";
- this.cbRndColor2.Size = new System.Drawing.Size(68, 16);
- this.cbRndColor2.TabIndex = 7;
- this.cbRndColor2.Text = "Random";
- //! this.cbRndColor2.Text = "ランダム";
- this.cbRndColor2.CheckedChanged += new System.EventHandler(this.onCheckBoxChanged);
- //
- // idxColor2
- //
- this.idxColor2.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.idxColor2.count = 10;
- this.idxColor2.current = 0;
- this.idxColor2.dataSource = null;
- this.idxColor2.Location = new System.Drawing.Point(8, 166);
- this.idxColor2.Name = "idxColor2";
- this.idxColor2.Size = new System.Drawing.Size(120, 16);
- this.idxColor2.TabIndex = 11;
- this.idxColor2.indexChanged += new System.EventHandler(this.onColor2Changed);
- //
- // price
- //
- this.price.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.price.cost = 0;
- this.price.label = "Cost:";
- //! this.price.label = "費用：";
- this.price.Location = new System.Drawing.Point(152, 130);
- this.price.Name = "price";
- this.price.Size = new System.Drawing.Size(80, 32);
- this.price.TabIndex = 14;
- this.toolTip1.SetToolTip(this.price, "Building cost (total)");
- //! this.toolTip1.SetToolTip(this.price, "設置費用（左右合計）");
- //
- // ControllerForm
- //
- this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
- this.ClientSize = new System.Drawing.Size(248, 194);
- this.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.group,
- this.btnRemove,
- this.btnPlace,
- this.preview,
- this.price});
- this.Name = "ControllerForm";
- this.Text = "Half-tile Construction";
- //! this.Text = "半ボクセル建築";
- this.Resize += new EventHandler(this.updateSize);
- this.group.ResumeLayout(false);
- this.ResumeLayout(false);
-
- }
- #endregion
-
- public bool isPlacing {
- get {
- return btnPlace.Checked;
- }
- }
-
- #region private properties
- private int currentColor2
- {
- get
- {
- return idxColor2.current;
- }
- }
-
-
- private int currentColor
- {
- get
- {
- return idxColor.current;
- }
- }
-
- private int currentDesign
- {
- get
- {
- return idxDesign.current;
- }
- }
-
- private SubGroup currentGroup
- {
- get
- {
- return (SubGroup)typeBox.SelectedItem;
- }
- }
-
- private HalfVoxelContribution currentContrib
- {
- get
- {
- return (HalfVoxelContribution)currentGroup[currentDesign];
- }
- }
- #endregion
-
- #region Event Handlers
- private void onTypeChanged(object sender, System.EventArgs e)
- {
- idxDesign.count = currentGroup.size;
- onDesignChanged(sender,e);
- }
-
- private void onDesignChanged(object sender, System.EventArgs e)
- {
- idxColor.count = currentContrib.colors.size;
- idxColor2.count = currentContrib.getHighlihtPatternCount();
- namelabel.Text = currentContrib.name;
- price.cost = currentContrib.price;
- onButtonClicked(sender,e);
- onColorChanged(sender,e);
- onColor2Changed(sender,e);
- }
-
- private void onColorChanged(object sender, System.EventArgs e)
- {
- currentContrib.currentColor = currentColor;
- updatePreview();
- }
-
- private void onColor2Changed(object sender, System.EventArgs e)
- {
- currentContrib.currentHighlight = currentColor2;
- updatePreview();
- }
-
- private void onCheckBoxChanged(object sender, System.EventArgs e)
- {
- idxDesign.Enabled = !cbRndDesign.Checked;
- idxColor.Enabled = !cbRndColor.Checked;
- idxColor2.Enabled = !cbRndColor2.Checked;
- onPreviewClick(sender,e);
- }
-
- private void onPreviewClick(object sender, System.EventArgs e)
- {
- if(cbRndDesign.Checked)
- {
- idxDesign.current = rnd.Next(idxDesign.count);
- idxColor.count = currentContrib.colors.size;
- }
- if(cbRndColor.Checked)
- idxColor.current = rnd.Next(idxColor.count);
- if(cbRndColor2.Checked)
- idxColor2.current = rnd.Next(idxColor2.count);
-
- if(cbRndDesign.Checked)
- onDesignChanged(sender,e);
- else if(cbRndColor.Checked)
- onColorChanged(sender,e);
- }
-
- private void onButtonClicked(object sender, System.EventArgs e)
- {
- if(currentController!=null)
- ((HVControllerImpl)currentController).onCreated -= callback;
- if(isPlacing)
- {
- currentController = currentContrib.createBuilder(this.siteImpl);
- ((HVControllerImpl)currentController).onCreated += callback;
- }
- else
- currentController = currentContrib.createRemover(this.siteImpl);
- }
-
- #endregion
-
- internal void randomize()
- {
- onPreviewClick(this,null);
- }
-
- protected virtual void updateSize(object sender, System.EventArgs e){
- updatePreview();
- }
-
- private createCallback callback;
-
- /// <summary>
- /// Called when a selection of the structure has changed.
- /// </summary>
- protected virtual void updatePreview()
- {
- using( PreviewDrawer drawer = currentContrib.createPreview( preview.Size) ) {
- if( previewBitmap!=null ) previewBitmap.Dispose();
- preview.Image = previewBitmap = drawer.createBitmap();
- }
- }
-
-
- #region SubGroup
- private class SubGroup : object
- {
- public readonly string name;
- private ArrayList arr;
- public SubGroup(string _name)
- {
- name = _name;
- arr = new ArrayList();
- }
-
- public void Add(HalfVoxelContribution contrib)
- {
- arr.Add(contrib);
- }
-
- public int size
- {
- get{ return arr.Count;}
- }
-
- public HalfVoxelContribution this[int index]
- {
- get
- {
- return (HalfVoxelContribution)arr[index];
- }
- }
-
- public override string ToString()
- {
- return name;
- }
- }
- #endregion
- }
-}
-
+using SDL.net;
+
+namespace freetrain.world.structs.hv
+{
+ /// <summary>
+ /// Controller that allows the user to
+ /// place/remove cars.
+ /// </summary>
+ [CLSCompliant(false)]
+ public class ControllerForm : ControllerHostForm
+ {
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.RadioButton btnRemove;
+ private System.Windows.Forms.RadioButton btnPlace;
+ private freetrain.controls.CostBox price;
+ private System.Windows.Forms.ToolTip toolTip1;
+ private System.Windows.Forms.GroupBox group;
+ private System.Windows.Forms.Label namelabel;
+ private freetrain.controls.IndexSelector idxDesign;
+ private freetrain.controls.IndexSelector idxColor;
+ private System.Windows.Forms.ComboBox typeBox;
+ private System.Windows.Forms.CheckBox cbRndColor;
+ private System.Windows.Forms.CheckBox cbRndDesign;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.CheckBox cbRndColor2;
+ private freetrain.controls.IndexSelector idxColor2;
+
+ private Bitmap previewBitmap;
+ private Random rnd;
+ /// <summary>
+ ///
+ /// </summary>
+ public ControllerForm()
+ {
+ InitializeComponent();
+ World.world.viewOptions.OnViewOptionChanged += new OptionChangedHandler(updatePreview);
+ rnd = new Random();
+
+ callback = new createCallback(randomize);
+ typeBox.DataSource = loadContributions();
+ onTypeChanged(this, null);
+ onButtonClicked(this, null);
+ }
+
+ /// <summary>
+ /// Called to prepare array of contribution used for typeBox.DataSource
+ /// </summary>
+ /// <returns></returns>
+ private ArrayList loadContributions()
+ {
+ Array src = PluginManager.theInstance.listContributions(typeof(HalfVoxelContribution));
+ Hashtable h = new Hashtable();
+ foreach (HalfVoxelContribution c in src)
+ {
+ string key = c.subgroup;
+ if (!h.ContainsKey(key))
+ h.Add(key, new SubGroup(key));
+ ((SubGroup)h[key]).Add(c);
+ }
+ ArrayList dest = new ArrayList();
+ foreach (object o in h.Values)
+ dest.Add(o);
+ return dest;
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="disposing"></param>
+ protected override void Dispose(bool disposing)
+ {
+ World.world.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(updatePreview);
+ if (disposing && components != null)
+ components.Dispose();
+ base.Dispose(disposing);
+
+ if (previewBitmap != null)
+ previewBitmap.Dispose();
+ }
+
+ #region Designer generated code
+ private System.Windows.Forms.PictureBox preview;
+ private System.ComponentModel.IContainer components = null;
+ private freetrain.controls.IndexSelector indexSelector;
+
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.preview = new System.Windows.Forms.PictureBox();
+ this.btnRemove = new System.Windows.Forms.RadioButton();
+ this.btnPlace = new System.Windows.Forms.RadioButton();
+ this.group = new System.Windows.Forms.GroupBox();
+ this.namelabel = new System.Windows.Forms.Label();
+ this.idxDesign = new freetrain.controls.IndexSelector();
+ this.idxColor = new freetrain.controls.IndexSelector();
+ this.label1 = new System.Windows.Forms.Label();
+ this.typeBox = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cbRndColor = new System.Windows.Forms.CheckBox();
+ this.cbRndDesign = new System.Windows.Forms.CheckBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cbRndColor2 = new System.Windows.Forms.CheckBox();
+ this.idxColor2 = new freetrain.controls.IndexSelector();
+ this.price = new freetrain.controls.CostBox();
+ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.indexSelector = new freetrain.controls.IndexSelector();
+ this.group.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // preview
+ //
+ this.preview.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right);
+ this.preview.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.preview.Location = new System.Drawing.Point(152, 8);
+ this.preview.Name = "preview";
+ this.preview.Size = new System.Drawing.Size(80, 112);
+ this.preview.TabIndex = 1;
+ this.preview.TabStop = false;
+ this.toolTip1.SetToolTip(this.preview, "Click to create another random pattern");
+ //! this.toolTip1.SetToolTip(this.preview, "クリックすると別のランダムパターンを生成します");
+ this.preview.Click += new System.EventHandler(this.onPreviewClick);
+ //
+ // btnRemove
+ //
+ this.btnRemove.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+ this.btnRemove.Appearance = System.Windows.Forms.Appearance.Button;
+ this.btnRemove.Location = new System.Drawing.Point(188, 164);
+ this.btnRemove.Name = "btnRemove";
+ this.btnRemove.Size = new System.Drawing.Size(56, 24);
+ this.btnRemove.TabIndex = 8;
+ this.btnRemove.Text = "Remove";
+ //! this.btnRemove.Text = "撤去";
+ this.btnRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.btnRemove.Click += new System.EventHandler(this.onButtonClicked);
+ //
+ // btnPlace
+ //
+ this.btnPlace.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+ this.btnPlace.Appearance = System.Windows.Forms.Appearance.Button;
+ this.btnPlace.Checked = true;
+ this.btnPlace.Location = new System.Drawing.Point(140, 164);
+ this.btnPlace.Name = "btnPlace";
+ this.btnPlace.Size = new System.Drawing.Size(48, 24);
+ this.btnPlace.TabIndex = 7;
+ this.btnPlace.TabStop = true;
+ this.btnPlace.Text = "Place";
+ //! this.btnPlace.Text = "設置";
+ this.btnPlace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.btnPlace.Click += new System.EventHandler(this.onButtonClicked);
+ //
+ // group
+ //
+ this.group.Controls.AddRange(new System.Windows.Forms.Control[] {
+ this.namelabel,
+ this.idxDesign,
+ this.idxColor,
+ this.label1,
+ this.typeBox,
+ this.label3,
+ this.cbRndColor,
+ this.cbRndDesign,
+ this.label2,
+ this.cbRndColor2,
+ this.idxColor2});
+ this.group.Name = "group";
+ this.group.Size = new System.Drawing.Size(136, 188);
+ this.group.TabIndex = 1;
+ this.group.TabStop = false;
+ this.group.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right) | (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+ this.toolTip1.SetToolTip(this.group, "Select a building to the left");
+ //! this.toolTip1.SetToolTip(this.group, "左側の建物選択");
+ //
+ // namelabel
+ //
+ this.namelabel.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right);
+ this.namelabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.namelabel.Location = new System.Drawing.Point(8, 76);
+ this.namelabel.Name = "namelabel";
+ this.namelabel.Size = new System.Drawing.Size(120, 28);
+ this.namelabel.TabIndex = 13;
+ this.namelabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // idxDesign
+ //
+ this.idxDesign.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right);
+ this.idxDesign.count = 10;
+ this.idxDesign.current = 0;
+ this.idxDesign.dataSource = null;
+ this.idxDesign.Location = new System.Drawing.Point(8, 56);
+ this.idxDesign.Name = "idxDesign";
+ this.idxDesign.Size = new System.Drawing.Size(120, 16);
+ this.idxDesign.TabIndex = 5;
+ this.idxDesign.indexChanged += new System.EventHandler(this.onDesignChanged);
+ //
+ // idxColor
+ //
+ this.idxColor.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right);
+ this.idxColor.count = 10;
+ this.idxColor.current = 0;
+ this.idxColor.dataSource = null;
+ this.idxColor.Location = new System.Drawing.Point(8, 126);
+ this.idxColor.Name = "idxColor";
+ this.idxColor.Size = new System.Drawing.Size(120, 16);
+ this.idxColor.TabIndex = 11;
+ this.idxColor.indexChanged += new System.EventHandler(this.onColorChanged);
+ //
+ // label1
+ //
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(8, 40);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(56, 16);
+ this.label1.TabIndex = 12;
+ this.label1.Text = "Design:";
+ //! this.label1.Text = "デザイン：";
+ this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // typeBox
+ //
+ this.typeBox.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right);
+ this.typeBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.typeBox.Location = new System.Drawing.Point(3, 8);
+ this.typeBox.Name = "typeBox";
+ this.typeBox.Size = new System.Drawing.Size(130, 20);
+ this.typeBox.Sorted = true;
+ this.typeBox.TabIndex = 1;
+ this.toolTip1.SetToolTip(this.typeBox, "Select a building to the left");
+ //! this.toolTip1.SetToolTip(this.typeBox, "左側の建物選択");
+ this.typeBox.SelectedIndexChanged += new System.EventHandler(this.onTypeChanged);
+ //
+ // label3
+ //
+ this.label3.Ba...
[truncated message content] |
|
From: <je...@us...> - 2008-03-13 17:16:20
|
Revision: 213
http://freetrain.svn.sourceforge.net/freetrain/?rev=213&view=rev
Author: jendave
Date: 2008-03-13 10:16:14 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
start cleanup of core
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
branches/FreeTrainSDL/core/controllers/ModalController.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/map/PreviewForm.cs
branches/FreeTrainSDL/core/world/Car.cs
branches/FreeTrainSDL/core/world/CarState.cs
branches/FreeTrainSDL/core/world/DrawContext.cs
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/SpecialPurposeRailRoad.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
Added Paths:
-----------
branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs
Removed Paths:
-------------
branches/FreeTrainSDL/core/AssemblyInfo.cs
Property Changed:
----------------
branches/FreeTrainSDL/
branches/FreeTrainSDL/bin/Debug/
Property changes on: branches/FreeTrainSDL
___________________________________________________________________
Name: svn:ignore
- FreeTrainSDL.suo
obj
+ FreeTrainSDL.suo
obj
*.user
Property changes on: branches/FreeTrainSDL/bin/Debug
___________________________________________________________________
Name: svn:ignore
- AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.Core.dll
FreeTrain.Core.pdb
FreeTrainSDL.exe
FreeTrainSDL.pdb
FreeTrainSDL.vshost.exe
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Tao.Sdl.dll
Tao.Sdl.xml
+ AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.Core.dll
FreeTrain.Core.pdb
FreeTrainSDL.exe
FreeTrainSDL.pdb
FreeTrainSDL.vshost.exe
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Tao.Sdl.dll
Tao.Sdl.xml
*.xml
Deleted: branches/FreeTrainSDL/core/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/core/AssemblyInfo.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/AssemblyInfo.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("FreeTrain core library")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Kohsuke Kawaguhi (kk...@ko...)")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(C)Copyright by Kohsuke Kawaguchi, 2002")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-13 17:16:14 UTC (rev 213)
@@ -32,8 +32,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile>Debug\FreeTrain.Core.XML</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -91,9 +90,6 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
- <Reference Include="System.Data">
- <Name>System.Data</Name>
- </Reference>
<Reference Include="System.Design">
<Name>System.Design</Name>
</Reference>
@@ -115,9 +111,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="AssemblyInfo.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="contributions\common\FixedSizeStructureContribution.cs">
<SubType>Code</SubType>
</Compile>
@@ -523,6 +516,12 @@
<Compile Include="framework\Splash.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
<Compile Include="util\ArrayEnumerator.cs">
<SubType>Code</SubType>
</Compile>
@@ -1002,6 +1001,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <SubType>Designer</SubType>
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
<ProjectReference Include="..\lib\Controls\FreeTrain.Controls.csproj">
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Name>FreeTrain.Controls</Name>
Added: branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs
===================================================================
--- branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs (rev 0)
+++ branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -0,0 +1,39 @@
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("FreeTrain core library")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Kohsuke Kawaguhi (kk...@ko...)")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("(C)Copyright by Kohsuke Kawaguchi, 2002")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: AssemblyVersion("1.0.*")]
+
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
+[assembly: CLSCompliant(true)]
\ No newline at end of file
Property changes on: branches/FreeTrainSDL/core/Properties/AssemblyInfo.cs
___________________________________________________________________
Name: svn:mime-type
+ text/x-csharp
Name: svn:eol-style
+ native
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,68 +1,106 @@
-using System;
-using System.Drawing;
-using System.Diagnostics;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using freetrain.framework;
-using freetrain.views;
-using freetrain.world;
-
-namespace freetrain.controllers
-{
- /// <summary>
- /// Pop-up tool window to host modal controllers.
- /// </summary>
- public class AbstractControllerForm : Form
- {
- private Point mouse_offset;
-
- public AbstractControllerForm() {
- InitializeComponent();
- try
- {
- World.world.viewOptions.OnViewOptionChanged+=new OptionChangedHandler(updatePreview);
- }
- catch(NullReferenceException nre)
- {
- Debug.WriteLine(nre);
- }
- }
-
- protected override void Dispose( bool disposing ) {
- World.world.viewOptions.OnViewOptionChanged-=new OptionChangedHandler(updatePreview);
- if( disposing && components != null)
- components.Dispose();
- base.Dispose( disposing );
- }
-
-
-
- protected override void OnLoad(System.EventArgs e) {
- try
- {
- // attach this window.
- MainWindow.mainWindow.AddOwnedForm(this);
- // move this window to the left-top position of the parent window
- this.Left = MainWindow.mainWindow.Left;
- this.Top = MainWindow.mainWindow.Top;
- }
- catch
- {
- //Debug.WriteLine(nre);
- }
- }
-
- public virtual void updatePreview(){}
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+using System;
+using System.Drawing;
+using System.Diagnostics;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using freetrain.framework;
+using freetrain.views;
+using freetrain.world;
+
+namespace freetrain.controllers
+{
+ /// <summary>
+ /// Pop-up tool window to host modal controllers.
+ /// </summary>
+ public class AbstractControllerForm : Form
+ {
+ private Point mouse_offset;
+ /// <summary>
+ ///
+ /// </summary>
+ public AbstractControllerForm()
+ {
+ InitializeComponent();
+ try
+ {
+ World.world.viewOptions.OnViewOptionChanged += new OptionChangedHandler(updatePreview);
+ }
+ catch (NullReferenceException nre)
+ {
+ Debug.WriteLine(nre);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="disposing"></param>
+ protected override void Dispose(bool disposing)
+ {
+ World.world.viewOptions.OnViewOptionChanged -= new OptionChangedHandler(updatePreview);
+ if (disposing && components != null)
+ components.Dispose();
+ base.Dispose(disposing);
+ }
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ protected override void OnLoad(System.EventArgs e)
+ {
+ try
+ {
+ // attach this window.
+ MainWindow.mainWindow.AddOwnedForm(this);
+ // move this window to the left-top position of the parent window
+ this.Left = MainWindow.mainWindow.Left;
+ this.Top = MainWindow.mainWindow.Top;
+ }
+ catch
+ {
+ //Debug.WriteLine(nre);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual void updatePreview() { }
+ /// <summary>
+ ///
+ /// </summary>
protected Label lblTitle;
- protected Label lblExit;
-
- #region Windows Form Designer generated code
- private System.ComponentModel.Container components = null;
-
- private void InitializeComponent()
- {
+ /// <summary>
+ ///
+ /// </summary>
+ protected Label lblExit;
+
+ #region Windows Form Designer generated code
+ private System.ComponentModel.Container components = null;
+
+ private void InitializeComponent()
+ {
this.lblTitle = new System.Windows.Forms.Label();
this.lblExit = new System.Windows.Forms.Label();
this.SuspendLayout();
@@ -146,12 +184,20 @@
this.lblTitle.Width = this.Width - (this.lblTitle.Left * 2);
this.lblExit.Left = this.lblTitle.Left + this.lblTitle.Width - this.lblExit.Width;
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
protected void AbstractControllerForm_MouseDown(object sender, MouseEventArgs e)
{
mouse_offset = new Point(-e.X, -e.Y);
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
protected void AbstractControllerForm_MouseMove(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)
@@ -166,9 +212,9 @@
{
System.Drawing.Graphics gr = e.Graphics;
Point[] pts = new Point[4];
- pts[0] = new Point(0,0);
+ pts[0] = new Point(0, 0);
pts[1] = new Point(this.Width - 1, 0);
- pts[2] = new Point(this.Width-1,this.Height-1);
+ pts[2] = new Point(this.Width - 1, this.Height - 1);
pts[3] = new Point(0, this.Height - 1);
gr.DrawPolygon(new Pen(Brushes.Black, 1), pts);
@@ -176,7 +222,7 @@
pts[1].X -= 2; pts[1].Y += 2;
pts[2].X -= 2; pts[2].Y -= 2;
pts[3].X += 2; pts[3].Y -= 2;
- gr.DrawPolygon(new Pen(Color.FromArgb(206,204,170), 3), pts);
+ gr.DrawPolygon(new Pen(Color.FromArgb(206, 204, 170), 3), pts);
pts[0].X += 1; pts[0].Y += 1;
pts[1].X -= 1; pts[1].Y += 1;
@@ -186,7 +232,7 @@
pts[0].X -= 1; pts[0].Y -= 1;
pts[1].Y -= 1;
- gr.DrawLine(new Pen(Color.FromArgb(120,119,102),1), pts[0], pts[1]);
+ gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[0], pts[1]);
pts[3].X -= 1;// pts[3].Y += 1;
gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[0], pts[3]);
@@ -198,10 +244,10 @@
pts[3].X -= 1; pts[3].Y += 2;
gr.DrawLine(new Pen(Color.FromArgb(120, 119, 102), 1), pts[3], pts[2]);
- gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left-1, this.lblTitle.Top-1), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top-1));
- gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left-1, this.lblTitle.Top-1), new Point(this.lblTitle.Left-1, this.lblTitle.Top + this.lblTitle.Height + 1));
- gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top + this.lblTitle.Height), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top + this.lblTitle.Height ));
- gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left + this.lblTitle.Width , this.lblTitle.Top - 1), new Point(this.lblTitle.Left + this.lblTitle.Width , this.lblTitle.Top + this.lblTitle.Height ));
+ gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top - 1), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top - 1));
+ gr.DrawLine(new Pen(Brushes.White, 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top - 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top + this.lblTitle.Height + 1));
+ gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left - 1, this.lblTitle.Top + this.lblTitle.Height), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top + this.lblTitle.Height));
+ gr.DrawLine(new Pen(Brushes.Black, 1), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top - 1), new Point(this.lblTitle.Left + this.lblTitle.Width, this.lblTitle.Top + this.lblTitle.Height));
}
private void AbstractControllerForm_Load(object sender, EventArgs e)
@@ -212,6 +258,6 @@
private void lblExit_Click(object sender, EventArgs e)
{
this.Close();
- }
- }
-}
+ }
+ }
+}
Modified: branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,66 +1,138 @@
-using System;
-using System.Drawing;
-using System.Diagnostics;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using freetrain.framework;
-using freetrain.views.map;
-using freetrain.world;
-
-namespace freetrain.controllers
-{
- public class AbstractControllerImpl : AbstractControllerForm, ModalController
- {
- public AbstractControllerImpl() {
- }
-
- protected override void OnActivated( EventArgs e ) {
- base.OnActivated(e);
- // Attach the control when activated.
- try
- {
- MainWindow.mainWindow.attachController(this);
- }
- catch(NullReferenceException nre)
- {
- Debug.WriteLine(nre);
- }
- }
-
- /// <summary>
- /// Derived class still needs to extend this method and maintain
- /// the singleton.
- /// </summary>
- protected override void OnClosing(System.ComponentModel.CancelEventArgs e) {
- // Detach it when it is closed.
- if(MainWindow.mainWindow.currentController==this)
- MainWindow.mainWindow.detachController();
- }
-
- //
- // default implementation for ModalController
- //
- public void close() {
- base.Close();
- }
-
- public string name { get { return Text; } }
-
- public virtual LocationDisambiguator disambiguator { get { return null;} }
-
- public virtual MapOverlay overlay { get { return this as MapOverlay; } }
-
- public virtual void onAttached() {}
- public virtual void onDetached() {
- // redraw the entire surface to erase any left-over from this controller
- World.world.onAllVoxelUpdated();
- }
-
- public virtual void onClick( MapViewWindow source, Location loc, Point ab ) {}
- public virtual void onMouseMove( MapViewWindow view, Location loc, Point ab ) {}
- public virtual void onRightClick( MapViewWindow source, Location loc, Point ab ) {
- Close(); // cancel
- }
- }
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Drawing;
+using System.Diagnostics;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using freetrain.framework;
+using freetrain.views.map;
+using freetrain.world;
+
+namespace freetrain.controllers
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class AbstractControllerImpl : AbstractControllerForm, ModalController
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public AbstractControllerImpl()
+ {
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ protected override void OnActivated(EventArgs e)
+ {
+ base.OnActivated(e);
+ // Attach the control when activated.
+ try
+ {
+ MainWindow.mainWindow.attachController(this);
+ }
+ catch (NullReferenceException nre)
+ {
+ Debug.WriteLine(nre);
+ }
+ }
+
+ /// <summary>
+ /// Derived class still needs to extend this method and maintain
+ /// the singleton.
+ /// </summary>
+ protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+ {
+ // Detach it when it is closed.
+ if (MainWindow.mainWindow.currentController == this)
+ MainWindow.mainWindow.detachController();
+ }
+
+ //
+ // default implementation for ModalController
+ //
+ /// <summary>
+ ///
+ /// </summary>
+ public void close()
+ {
+ base.Close();
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string name { get { return Text; } }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual LocationDisambiguator disambiguator { get { return null; } }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual MapOverlay overlay { get { return this as MapOverlay; } }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual void onAttached() { }
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual void onDetached()
+ {
+ // redraw the entire surface to erase any left-over from this controller
+ World.world.onAllVoxelUpdated();
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="loc"></param>
+ /// <param name="ab"></param>
+ public virtual void onClick(MapViewWindow source, Location loc, Point ab) { }
+ /// <summary>
+ ///
+ ///
+ /// </summary>
+ /// <param name="view"></param>
+ /// <param name="loc"></param>
+ /// <param name="ab"></param>
+ public virtual void onMouseMove(MapViewWindow view, Location loc, Point ab) { }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="loc"></param>
+ /// <param name="ab"></param>
+ public virtual void onRightClick(MapViewWindow source, Location loc, Point ab)
+ {
+ Close(); // cancel
+ }
+ }
}
Modified: branches/FreeTrainSDL/core/controllers/ModalController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/controllers/ModalController.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -22,7 +22,19 @@
/// <param name="loc">(X,Y,Z) location that was clicked</param>
/// <param name="ab">(A,B) location that was clicked.</param>
void onClick( MapViewWindow source, Location loc, Point ab );
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="loc"></param>
+ /// <param name="ab"></param>
void onRightClick( MapViewWindow source, Location loc, Point ab );
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="loc"></param>
+ /// <param name="ab"></param>
void onMouseMove( MapViewWindow source, Location loc, Point ab );
/// <summary>
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,124 +1,193 @@
-using System;
-using System.Collections;
-using System.Drawing;
-using System.IO;
-using System.Net;
-//using org.kohsuke.directaudio;
-using SDL.net;
-using freetrain.util;
-using freetrain.framework.graphics;
-using freetrain.world;
-
-namespace freetrain.framework
-{
- /// <summary>
- /// Simplified resource manager.
- /// </summary>
- public abstract class ResourceUtil
- {
- public static string findSystemResource( string name ) {
- string path;
-
- path = Path.Combine( Core.installationDirectory, @"res\"+name );
- if( File.Exists(path) ) return path;
-
- path = Path.Combine( Core.installationDirectory, @"..\..\core\res\"+name );
- if( File.Exists(path) ) return path;
-
- throw new FileNotFoundException("system resource: "+name);
- }
-
-// private static WebResponse getStream( Uri uri ) {
-// return WebRequest.Create(uri).GetResponse();
-// }
-
-// public static Bitmap loadBitmap( string location ) {
-// using(WebResponse res = getStream(uri)) {
-// return new Bitmap(res.GetResponseStream());
-// }
-// }
- public static Bitmap loadSystemBitmap( string name ) {
- return new Bitmap(findSystemResource(name));
- }
-
-// public static Icon loadIcon( Uri uri) {
-// using(WebResponse res = getStream(uri)) {
-// return new Icon(res.GetResponseStream());
-// }
-// }
-
- public static Segment loadSystemSound( String name ) {
- // can't read from stream
- return Segment.fromFile(findSystemResource(name));
- }
-
- // using URI is essentially dangerous as Segment only support file names.
- // I should limit it to file names only.
- public static Segment loadSound( Uri uri ) {
- return Segment.fromFile(uri.LocalPath);
- }
-
- public static Picture loadSystemPicture( string name ) {
- string id = "{8AD4EF28-CBEF-4C73-A8FF-5772B87EF005}:"+name;
-
- // check if it has already been loaded
- if( PictureManager.contains(id) )
- return PictureManager.get(id);
-
- // otherwise load a new picture
- return new Picture( id, findSystemResource(name) );
- }
- public static Picture loadSystemPicture( string dayname, string nightname )
- {
- string id = "{8AD4EF28-CBEF-4C73-A8FF-5772B87EF005}:"+dayname;
-
- // check if it has already been loaded
- if( PictureManager.contains(id) )
- return PictureManager.get(id);
-
- // otherwise load a new picture
- return new Picture( id, findSystemResource(dayname), findSystemResource(nightname) );
- }
-
- public static Surface loadTimeIndependentSystemSurface( string name ) {
- //using(Bitmap bmp=loadSystemBitmap(name))
- // return directDraw.createSprite(bmp);
- return new Surface(findSystemResource(name));
- }
-
-
-
- /// <summary>
- /// DirectDraw instance for loading surface objects.
- /// </summary>
- //public static readonly DirectDraw directDraw = new DirectDraw();
-
- private static Picture emptyChips = loadSystemPicture("EmptyChip.bmp","EmptyChip_n.bmp");
- private static Picture cursorChips = loadSystemPicture("cursorChip.bmp","cursorChip.bmp");
-
- public static Sprite emptyChip {
- get {
- return groundChips[0];
- }
- }
- public static Sprite getGroundChip(World w) {
- if( w.clock.season!=Season.Winter )
- return groundChips[0];
- else
- return groundChips[1];
- }
-
- private static Sprite[] groundChips = new Sprite[]{
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.IO;
+using System.Net;
+//using org.kohsuke.directaudio;
+using SDL.net;
+using freetrain.util;
+using freetrain.framework.graphics;
+using freetrain.world;
+
+namespace freetrain.framework
+{
+ /// <summary>
+ /// Simplified resource manager.
+ /// </summary>
+ public abstract class ResourceUtil
+ {
+ public static string findSystemResource(string name)
+ {
+ string path;
+
+ path = Path.Combine(Core.installationDirectory, @"res\" + name);
+ if (File.Exists(path)) return path;
+
+ path = Path.Combine(Core.installationDirectory, @"..\..\core\res\" + name);
+ if (File.Exists(path)) return path;
+
+ throw new FileNotFoundException("system resource: " + name);
+ }
+
+ // private static WebResponse getStream( Uri uri ) {
+ // return WebRequest.Create(uri).GetResponse();
+ // }
+
+ // public static Bitmap loadBitmap( string location ) {
+ // using(WebResponse res = getStream(uri)) {
+ // return new Bitmap(res.GetResponseStream());
+ // }
+ // }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static Bitmap loadSystemBitmap(string name)
+ {
+ return new Bitmap(findSystemResource(name));
+ }
+
+ // public static Icon loadIcon( Uri uri) {
+ // using(WebResponse res = getStream(uri)) {
+ // return new Icon(res.GetResponseStream());
+ // }
+ // }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static Segment loadSystemSound(String name)
+ {
+ // can't read from stream
+ return Segment.fromFile(findSystemResource(name));
+ }
+
+ // using URI is essentially dangerous as Segment only support file names.
+ // I should limit it to file names only.
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="uri"></param>
+ /// <returns></returns>
+ public static Segment loadSound(Uri uri)
+ {
+ return Segment.fromFile(uri.LocalPath);
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static Picture loadSystemPicture(string name)
+ {
+ string id = "{8AD4EF28-CBEF-4C73-A8FF-5772B87EF005}:" + name;
+
+ // check if it has already been loaded
+ if (PictureManager.contains(id))
+ return PictureManager.get(id);
+
+ // otherwise load a new picture
+ return new Picture(id, findSystemResource(name));
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="dayname"></param>
+ /// <param name="nightname"></param>
+ /// <returns></returns>
+ public static Picture loadSystemPicture(string dayname, string nightname)
+ {
+ string id = "{8AD4EF28-CBEF-4C73-A8FF-5772B87EF005}:" + dayname;
+
+ // check if it has already been loaded
+ if (PictureManager.contains(id))
+ return PictureManager.get(id);
+
+ // otherwise load a new picture
+ return new Picture(id, findSystemResource(dayname), findSystemResource(nightname));
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static Surface loadTimeIndependentSystemSurface(string name)
+ {
+ //using(Bitmap bmp=loadSystemBitmap(name))
+ // return directDraw.createSprite(bmp);
+ return new Surface(findSystemResource(name));
+ }
+
+
+
+ /// <summary>
+ /// DirectDraw instance for loading surface objects.
+ /// </summary>
+ //public static readonly DirectDraw directDraw = new DirectDraw();
+
+ private static Picture emptyChips = loadSystemPicture("EmptyChip.bmp", "EmptyChip_n.bmp");
+ private static Picture cursorChips = loadSystemPicture("cursorChip.bmp", "cursorChip.bmp");
+
+ public static Sprite emptyChip
+ {
+ get
+ {
+ return groundChips[0];
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="w"></param>
+ /// <returns></returns>
+ public static Sprite getGroundChip(World w)
+ {
+ if (w.clock.season != Season.Winter)
+ return groundChips[0];
+ else
+ return groundChips[1];
+ }
+
+ private static Sprite[] groundChips = new Sprite[]{
new SimpleSprite(emptyChips,new Point(0,0),new Point( 0,0),new Size(32,16)),
new SimpleSprite(emptyChips,new Point(0,0),new Point(32,0),new Size(32,16))
- };
-
- public static Sprite removerChip =
- new SimpleSprite(cursorChips,new Point(0,0),new Point(0,0),new Size(32,16));
-
- public static Sprite underWaterChip =
- new SimpleSprite(emptyChips,new Point(0,0),new Point(64,0),new Size(32,16));
- public static Sprite underGroundChip =
- new SimpleSprite(emptyChips,new Point(0,0),new Point(96,0),new Size(32,16));
- }
+ };
+ /// <summary>
+ ///
+ /// </summary>
+ public static Sprite removerChip =
+ new SimpleSprite(cursorChips, new Point(0, 0), new Point(0, 0), new Size(32, 16));
+ /// <summary>
+ ///
+ /// </summary>
+ public static Sprite underWaterChip =
+ new SimpleSprite(emptyChips, new Point(0, 0), new Point(64, 0), new Size(32, 16));
+ /// <summary>
+ ///
+ /// </summary>
+ public static Sprite underGroundChip =
+ new SimpleSprite(emptyChips, new Point(0, 0), new Point(96, 0), new Size(32, 16));
+ }
}
Modified: branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,87 +1,125 @@
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using System.Xml;
-using freetrain.world;
-using SDL.net;
-
-namespace freetrain.framework.graphics
-{
- /// <summary>
- /// Draw an image in the picture as-is.
- /// </summary>
- [Serializable]
- public class SimpleSprite : Sprite {
- public SimpleSprite( Picture _picture, Point _offset, Point _origin, Size _size ) {
- this.picture = _picture;
- this._offset = _offset;
- this.origin = _origin;
- Debug.Assert( _size.Height!=0 && _size.Width!=0 );
- this._size = _size;
- }
-
-
- /// <summary>
- /// Surface that contains the image.
- /// </summary>
- public Picture picture;
-
- /// <summary>
- /// The point in the image that will be aligned to
- /// the left-top corner of a voxel.
- /// </summary>
- protected readonly Point _offset;
-
- /// <summary>
- /// The area of the image to be drawn.
- /// </summary>
- protected readonly Point origin;
- protected readonly Size _size;
-
- public virtual void draw( Surface surface, Point pt ) {
- pt.X -= _offset.X;
- pt.Y -= _offset.Y;
- surface.blt( pt, picture.surface, origin, size );
- }
-
- /// <summary>
- /// Draws the shape of this sprite in the specified color.
- /// </summary>
- public virtual void drawShape( Surface surface, Point pt, Color color ) {
- pt.X -= _offset.X;
- pt.Y -= _offset.Y;
- surface.bltShape( pt, picture.surface, origin, _size, color );
- }
-
- public virtual void drawAlpha( Surface surface, Point pt ) {
- pt.X -= _offset.X;
- pt.Y -= _offset.Y;
- surface.bltAlpha( pt, picture.surface, origin, _size );
- }
-
- public Size size { get { return _size; } }
- public Point offset { get { return _offset; } }
- public bool HitTest( int x, int y) { return picture.surface.HitTest(x,y); }
- }
-
-
- /// <summary>
- /// SpriteFactory for SimpleSprite.
- /// </summary>
- public class SimpleSpriteFactory : SpriteFactory
- {
- public override Sprite createSprite( Picture picture, Point offset, Point origin, Size size ) {
- return new SimpleSprite(picture,offset,origin,size);
- }
- }
-
- [Serializable]
- public class SimpleSpriteFactoryContributionImpl : SpriteFactoryContribution
- {
- public SimpleSpriteFactoryContributionImpl( XmlElement e ) : base(e) {}
-
- public override SpriteFactory createSpriteFactory( XmlElement e ) {
- return new SimpleSpriteFactory();
- }
- }
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Xml;
+using freetrain.world;
+using SDL.net;
+
+namespace freetrain.framework.graphics
+{
+ /// <summary>
+ /// Draw an image in the picture as-is.
+ /// </summary>
+ [Serializable]
+ public class SimpleSprite : Sprite
+ {
+ public SimpleSprite(Picture _picture, Point _offset, Point _origin, Size _size)
+ {
+ this.picture = _picture;
+ this._offset = _offset;
+ this.origin = _origin;
+ Debug.Assert(_size.Height != 0 && _size.Width != 0);
+ this._size = _size;
+ }
+
+
+ /// <summary>
+ /// Surface that contains the image.
+ /// </summary>
+ public Picture picture;
+
+ /// <summary>
+ /// The point in the image that will be aligned to
+ /// the left-top corner of a voxel.
+ /// </summary>
+ protected readonly Point _offset;
+
+ /// <summary>
+ /// The area of the image to be drawn.
+ /// </summary>
+ protected readonly Point origin;
+ protected readonly Size _size;
+
+ public virtual void draw(Surface surface, Point pt)
+ {
+ pt.X -= _offset.X;
+ pt.Y -= _offset.Y;
+ surface.blt(pt, picture.surface, origin, size);
+ }
+
+ /// <summary>
+ /// Draws the shape of this sprite in the specified color.
+ /// </summary>
+ public virtual void drawShape(Surface surface, Point pt, Color color)
+ {
+ pt.X -= _offset.X;
+ pt.Y -= _offset.Y;
+ surface.bltShape(pt, picture.surface, origin, _size, color);
+ }
+
+ public virtual void drawAlpha(Surface surface, Point pt)
+ {
+ pt.X -= _offset.X;
+ pt.Y -= _offset.Y;
+ surface.bltAlpha(pt, picture.surface, origin, _size);
+ }
+
+ public Size size { get { return _size; } }
+ public Point offset { get { return _offset; } }
+ public bool HitTest(int x, int y) { return picture.surface.HitTest(x, y); }
+ }
+
+
+ /// <summary>
+ /// SpriteFactory for SimpleSprite.
+ /// </summary>
+ public class SimpleSpriteFactory : SpriteFactory
+ {
+ public override Sprite createSprite(Picture picture, Point offset, Point origin, Size size)
+ {
+ return new SimpleSprite(picture, offset, origin, size);
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [Serializable]
+ public class SimpleSpriteFactoryContributionImpl : SpriteFactoryContribution
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ public SimpleSpriteFactoryContributionImpl(XmlElement e) : base(e) { }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ /// <returns></returns>
+ public override SpriteFactory createSpriteFactory(XmlElement e)
+ {
+ return new SimpleSpriteFactory();
+ }
+ }
}
Modified: branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,20 +1,49 @@
-using System;
-using System.Xml;
-using freetrain.framework.plugin;
-
-namespace freetrain.framework.graphics
-{
- /// <summary>
- /// Let SpriteFactories to be contributed.
- ///
- /// SpriteFactoryContribution assigns a name to SpriteFactory,
- /// and also allows SpriteFactory to be confiugred by parameters.
- /// </summary>
- [Serializable]
- public abstract class SpriteFactoryContribution : Contribution
- {
- public abstract SpriteFactory createSpriteFactory( XmlElement e );
-
- public SpriteFactoryContribution( XmlElement e ) : base(e) {}
- }
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Xml;
+using freetrain.framework.plugin;
+
+namespace freetrain.framework.graphics
+{
+ /// <summary>
+ /// Let SpriteFactories to be contributed.
+ ///
+ /// SpriteFactoryContribution assigns a name to SpriteFactory,
+ /// and also allows SpriteFactory to be confiugred by parameters.
+ /// </summary>
+ [Serializable]
+ public abstract class SpriteFactoryContribution : Contribution
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ /// <returns></returns>
+ public abstract SpriteFactory createSpriteFactory(XmlElement e);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="e"></param>
+ public SpriteFactoryContribution(XmlElement e) : base(e) { }
+ }
}
Modified: branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/framework/plugin/Contribution.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,145 +1,192 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using System.Runtime.Serialization;
-using System.Net;
-using System.Windows.Forms;
-using System.Xml;
-using SDL.net;
-using freetrain.framework.graphics;
-
-
-namespace freetrain.framework.plugin
-{
- /// <summary>
- /// Common base class of contributions.
- ///
- /// A contribution is a functionality provided by a plug-in.
- /// </summary>
- [Serializable]
- public abstract class Contribution : ISerializable
- {
- protected Contribution( XmlElement contrib ) :
- this( contrib.Attributes["type"].Value, contrib.Attributes["id"].Value ) {}
-
- protected Contribution( string _type, string _id ) {
- this.type = _type;
- this.id = _id;
- }
-
- /// <summary>
- /// This method is a backdoor to configure a contribution.
- ///
- /// We could just pass this argument through a constructor,
- /// but Contribution will be inherited multiple times, so it would be
- /// little awkward to pass a lot of parameters around.
- /// </summary>
- /// <param name="_baseUri"></param>
- internal void init( Plugin _parent, Uri _baseUri ) {
- this._parent = _parent;
- this._baseUri = _baseUri;
- }
-
-
- /// <summary>
- /// Notifies the end of the initialization.
- ///
- /// This method is called after all the contributions are loaded
- /// into memory. This is a good chance to run additional tasks
- /// that need to access other contributions.
- /// </summary>
- protected internal virtual void onInitComplete() {
- }
-
- /// <summary>
- /// Type of this contribution.
- /// This is the value of the type attribute.
- /// </summary>
- public readonly string type;
-
- /// <summary>
- /// Unique ID of this contribution.
- ///
- /// Either GUID or URI, but can be anything as long
- /// as it's unique.
- /// </summary>
- public readonly string id;
-
-
- /// <summary>
- /// Base URI for this contribution (which is the same
- /// as the base URI for the plug-in.)
- ///
- /// This poinst to the plug-in directory.
- /// </summary>
- public Uri baseUri { get { return _baseUri; } }
- private Uri _baseUri;
-
- /// <summary>
- /// Returns the Plugin object that contains this contribution.
- /// </summary>
- public Plugin parent { get { return _parent; } }
- private Plugin _parent;
-
-
- /// <summary>
- /// If a plug-in is implemented by using an assembly,
- /// it should override property and return the Assembly
- /// object, so that obejcts from this assembly can be
- /// de-serialized.
- ///
- /// Returns null if this contribution doesn't rely on
- /// any assembly.
- /// </summary>
- public virtual Assembly assembly { get { return this.GetType().Assembly; } }
-
-
-
-
- #region utility methods
- protected Picture loadPicture( string name ) {
- return new Picture( this.id+":"+name, new Uri( baseUri,name).LocalPath );
- }
-
- /// <summary>
- /// Locate the Picture from which sprites should be loaded.
- /// </summary>
- /// <param name="sprite"><sprite> element in the manifest.</param>
- /// <returns>non-null valid object.</returns>
- protected Picture getPicture( XmlElement sprite ) {
- XmlElement pic = (XmlElement)XmlUtil.selectSingleNode(sprite,"picture");
-
- XmlAttribute r = pic.Attributes["ref"];
- if(r!=null)
- // reference to externally defined pictures.
- return PictureManager.get(r.Value);
-
- // otherwise look for local picture definition
- return new Picture(pic,
- sprite.SelectSingleNode("ancestor-or-self::contribution/@id").InnerText);
- }
- #endregion
-
-
-
- // serialize this object by reference
- public virtual void GetObjectData( SerializationInfo info, StreamingContext context) {
- info.SetType(typeof(ReferenceImpl));
- info.AddValue("id",id);
- }
-
- [Serializable]
- internal sealed class ReferenceImpl : IObjectReference {
- private string id=null;
- public object GetRealObject(StreamingContext context) {
- object o = Core.plugins.getContribution(id);
- if(o==null)
- throw new SerializationException(
- "Plugin that contains Contribution \""+id+"\" could not be found");
- //! "コントリビューション¥""+id+"¥"を含むプラグインが見つかりません");
- return o;
- }
- }
- }
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
+using System;
+using System.Drawing;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Net;
+using System.Windows.Forms;
+using System.Xml;
+using SDL.net;
+using freetrain.framework.graphics;
+
+
+namespace freetrain.framework.plugin
+{
+ /// <summary>
+ /// Common base class of contributions.
+ ///
+ /// A contribution is a functionality provided by a plug-in.
+ /// </summary>
+ [Serializable]
+ public abstract class Contribution : ISerializable
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="contrib"></param>
+ protected Contribution(XmlElement contrib)
+ :
+ this(contrib.Attributes["type"].Value, contrib.Attributes["id"].Value) { }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_type"></param>
+ /// <param name="_id"></param>
+ protected Contribution(string _type, string _id)
+ {
+ this.type = _type;
+ this.id = _id;
+ }
+
+ /// <summary>
+ /// This method is a backdoor to configure a contribution.
+ ///
+ /// We could just pass this argument through a constructor,
+ /// but Contribution will be inherited multiple times, so it would be
+ /// little awkward to pass a lot of parameters around.
+ /// </summary>
+ /// <param name="_baseUri"></param>
+ internal void init(Plugin _parent, Uri _baseUri)
+ {
+ this._parent = _parent;
+ this._baseUri = _baseUri;
+ }
+
+
+ /// <summary>
+ /// Notifies the end of the initialization.
+ ///
+ /// This method is called after all the contributions are loaded
+ /// into memory. This is a good chance to run additional tasks
+ /// that need to access other contributions.
+ /// </summary>
+ protected internal virtual void onInitComplete()
+ {
+ }
+
+ /// <summary>
+ /// Type of this contribution.
+ /// This is the value of the type attribute.
+ /// </summary>
+ public readonly string type;
+
+ /// <summary>
+ /// Unique ID of this contribution.
+ ///
+ /// Either GUID or URI, but can be anything as long
+ /// as it's unique.
+ /// </summary>
+ public readonly string id;
+
+
+ /// <summary>
+ /// Base URI for this contribution (which is the same
+ /// as the base URI for the plug-in.)
+ ///
+ /// This poinst to the plug-in directory.
+ /// </summary>
+ public Uri baseUri { get { return _baseUri; } }
+ private Uri _baseUri;
+
+ /// <summary>
+ /// Returns the Plugin object that contains this contribution.
+ /// </summary>
+ public Plugin parent { get { return _parent; } }
+ private Plugin _parent;
+
+
+ /// <summary>
+ /// If a plug-in is implemented by using an assembly,
+ /// it should override property and return the Assembly
+ /// object, so that obejcts from this assembly can be
+ /// de-serialized.
+ ///
+ /// Returns null if this contribution doesn't rely on
+ /// any assembly.
+ /// </summary>
+ public virtual Assembly assembly { get { return this.GetType().Assembly; } }
+
+
+
+
+ #region utility methods
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ protected Picture loadPicture(string name)
+ {
+ return new Picture(this.id + ":" + name, new Uri(baseUri, name).LocalPath);
+ }
+
+ /// <summary>
+ /// Locate the Picture from which sprites should be loaded.
+ /// </summary>
+ /// <param name="sprite"><sprite> element in the manifest.</param>
+ /// <returns>non-null valid object.</returns>
+ protected Picture getPicture(XmlElement sprite)
+ {
+ XmlElement pic = (XmlElement)XmlUtil.selectSingleNode(sprite, "picture");
+
+ XmlAttribute r = pic.Attributes["ref"];
+ if (r != null)
+ // reference to externally defined pictures.
+ return PictureManager.get(r.Value);
+
+ // otherwise look for local picture definition
+ return new Picture(pic,
+ sprite.SelectSingleNode("ancestor-or-self::contribution/@id").InnerText);
+ }
+ #endregion
+
+
+
+ // serialize this object by reference
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="info"></param>
+ /// <param name="context"></param>
+ public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+ {
+ info.SetType(typeof(ReferenceImpl));
+ info.AddValue("id", id);
+ }
+
+ [Serializable]
+ internal sealed class ReferenceImpl : IObjectReference
+ {
+ private string id = null;
+ public object GetRealObject(StreamingContext context)
+ {
+ object o = Core.plugins.getContribution(id);
+ if (o == null)
+ throw new SerializationException(
+ "Plugin that contains Contribution \"" + id + "\" could not be found");
+ //! "コントリビューション¥""+id+"¥"を含むプラグインが見つかりません");
+ return o;
+ }
+ }
+ }
}
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-13 16:22:54 UTC (rev 212)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-13 17:16:14 UTC (rev 213)
@@ -1,3 +1,23 @@
+#region LICENSE
+/*
+ * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#endregion LICENSE
+
using System;
using System.Runtime.InteropServices;
using System.Windows.Forms;
@@ -6,67 +26,77 @@
namespace freetrain.framework.sound
{
- /// <summary>
- /// Coordinates sound effects.
- /// </summary>
- public sealed class SoundEffectManager
- {
-
- private bool available = false;
- public bool IsAvailable { get { return available; } }
+ /// <summary>
+ /// Coordinates sound effects.
+ /// </summary>
+ public sealed class SoundEffectManager
+ {
+ private bool available = false;
+ /// <summary>
+ ///
+ /// </summary>
+ public bool IsAvailable { get { return available; } }
+
private SDL.net.Audio _audio;
- /// <summary>
- /// A new instance should be created only by the MainWindow class.
- /// </summary>
- public SoundEffectManager( IWin32Window owner )
- {
- try {
+ /// <summary>
+ /// A new instance should be created only by the MainWindow class.
+ /// </summary>
+ public SoundEffectManager(IWin32Window owner)
+ {
+ try
+ {
this._audio = new Audio();
- available = true;
- } catch( Exception e ) {
- MessageBox.Show( owner, e.StackTrace, "DirectAudio can not be initialized. Sound is disabled.",
- //! MessageBox.Show( owner, e.StackTrace, "DirectAudioが初期化できません。サウンドは無効です。",
- MessageBoxButtons.OK, MessageBoxIcon.Stop );
- available = false;
- Core.options.enableSoundEffect = false;
- }
- }
+ available = true;
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show(owner, e.StackTrace, "DirectAudio can not be initialized. Sound is disabled.",
+ //! MessageBox.Show( owner, e.StackTrace, "DirectAudioが初期化できません。サウンドは無効です。",
+ MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ available = false;
+ Core.options.enableSoundEffect = false;
+ }
+ }
- //private readonly Performance performance;
+ //private readonly Performance performance;
- /// <summary>
- /// Internal method for the SoundEffect class.
- ///
- /// Plays a sound segment, if the sound effect is turned on.
- /// </summary>
- /// <returns>non-null if the sound is actually played.</returns>
- /*internal SegmentState play( Segment seg, int leadTime ) {
- if( !Core.options.enableSoundEffect|| !available ) return null;
+ /// <summary>
+ /// Internal method for the SoundEffect class.
+ ///
+ /// Plays a sound segment, if the sound effect is turned on.
+ /// </summary>
+ /// <returns>non-null if the sound is actually played.</returns>
+ /*internal SegmentState play( Segment seg, int leadTime ) {
+ if( !Core.options.enableSoundEffect|| !available ) return null;
- seg.downloadTo(performance);
- return performance.play( seg, leadTime );
- }*/
+ seg.downloadTo(performance);
+ return performance.play( seg, leadTime );
+ }*/
- //[DllImport("winmm.dll")]
- //private static extern long sndPlaySound(String lpszName, long dwFlags);
+ //[DllImport("winmm.dll")]
+ //private static extern long sndPlaySound(String lpszName, long dwFlags);
- /// <summary>
- /// Plays a wav file in a synchronous way.
- ///
- /// This method is slow compared to SoundEffect object, but
- /// it is less resource intensive. Useful for one time sound effect
- /// that can take time.
- /// </summary>
+ /// <summary>
+ /// Plays a wav file in a sync...
[truncated message content] |
|
From: <je...@us...> - 2008-03-13 19:04:55
|
Revision: 216
http://freetrain.svn.sourceforge.net/freetrain/?rev=216&view=rev
Author: jendave
Date: 2008-03-13 12:05:00 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
cleanup some extraneous references
Modified Paths:
--------------
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
Modified: branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-13 18:57:11 UTC (rev 215)
+++ branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-13 19:05:00 UTC (rev 216)
@@ -112,7 +112,7 @@
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
this.ClientSize = new System.Drawing.Size(592, 206);
- this.Controls.AddRange(new System.Windows.Forms.Control[] {
+ this.Controls.AddRange(new System.Windows.Forms.Control[] {
this.webBrowser});
this.Name = "BalanceSheetForm";
this.Text = "Balance Sheet";
@@ -123,4 +123,4 @@
}
#endregion
}
-}
+}
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-13 18:57:11 UTC (rev 215)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-13 19:05:00 UTC (rev 216)
@@ -75,14 +75,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxSHDocVw, Version=1.1.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\AxSHDocVw.dll</HintPath>
- </Reference>
- <Reference Include="MsHtmlHost, Version=0.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\MsHtmlHost.dll</HintPath>
- </Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-13 18:57:11 UTC (rev 215)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-13 19:05:00 UTC (rev 216)
@@ -75,14 +75,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxSHDocVw, Version=1.1.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\AxSHDocVw.dll</HintPath>
- </Reference>
- <Reference Include="MsHtmlHost, Version=0.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\MsHtmlHost.dll</HintPath>
- </Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
@@ -105,10 +97,8 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
- <Name>FreeTrain.Controls</Name>
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
+ <Name>FreeTrain.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
<Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 06:58:14
|
Revision: 219
http://freetrain.svn.sourceforge.net/freetrain/?rev=219&view=rev
Author: jendave
Date: 2008-03-13 23:51:22 -0700 (Thu, 13 Mar 2008)
Log Message:
-----------
remove bin dir from SVN.
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/SDLGUI.cs
branches/FreeTrainSDL/SDLGUIButton.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
Removed Paths:
-------------
branches/FreeTrainSDL/bin/
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-13 22:26:57 UTC (rev 218)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-14 06:51:22 UTC (rev 219)
@@ -110,7 +110,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>copy /Y "$(SolutionDir)gui\*.*" "$(TargetDir)gui"
-xcopy /Y /E "$(SolutionDir)plugins\*.*" "$(TargetDir)plugins"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/SDLGUI.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUI.cs 2008-03-13 22:26:57 UTC (rev 218)
+++ branches/FreeTrainSDL/SDLGUI.cs 2008-03-14 06:51:22 UTC (rev 219)
@@ -24,6 +24,7 @@
using System.Collections;
using System.Windows.Forms;
using System.Drawing;
+using System.IO;
using Tao.Sdl;
using SDL.net;
@@ -60,8 +61,26 @@
baseGUIColor = Color.FromArgb(252, 252, 236);
shadeGUIColor = Color.FromArgb(152, 152, 116);
drawerGUIColor = Color.FromArgb(236, 236, 184);
+ initGuiDirectory();
}
+ static string guiDirectory = "gui";
+
+ public static string GuiDirectory
+ {
+ get { return guiDirectory; }
+ set { guiDirectory = value; }
+ }
+ static string filePath = Path.Combine("..", "..");
+ private static void initGuiDirectory()
+ {
+ if (File.Exists(Path.Combine(guiDirectory, "FreeSans.ttf")))
+ {
+ filePath = "";
+ }
+ guiDirectory = Path.Combine(filePath, guiDirectory);
+ }
+
public void initGUI(int width, int height, IntPtr pf)
{
baseColor = Sdl.SDL_MapRGB(pf, baseGUIColor.R, baseGUIColor.G, baseGUIColor.B);
@@ -78,9 +97,9 @@
station = new SDLGUIButton("station","Station Construction", 10, 10);
if (ButtonClick != null) station.ButtonClick += ButtonClick;*/
- top_bar = new Surface(Application.StartupPath + "\\gui\\top.bmp");
- splash = new Surface(Application.StartupPath + "\\gui\\splash.bmp");
- freesans = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", SPLASH_TEXT_HEIGHT);
+ top_bar = new Surface(Path.Combine(Application.StartupPath, Path.Combine(guiDirectory, "top.bmp")));
+ splash = new Surface(Path.Combine(Application.StartupPath, Path.Combine(guiDirectory, "splash.bmp")));
+ freesans = SdlTtf.TTF_OpenFont(Path.Combine(Application.StartupPath, Path.Combine(guiDirectory, "FreeSans.ttf")), SPLASH_TEXT_HEIGHT);
SPLASH_TEXT = new string[MAX_SPLASH_LINES];
for (int cur = 0; cur < MAX_SPLASH_LINES; cur++) SPLASH_TEXT[cur] = string.Empty;
}
Modified: branches/FreeTrainSDL/SDLGUIButton.cs
===================================================================
--- branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-13 22:26:57 UTC (rev 218)
+++ branches/FreeTrainSDL/SDLGUIButton.cs 2008-03-14 06:51:22 UTC (rev 219)
@@ -24,6 +24,7 @@
using System.Text;
using System.Drawing;
using System.Windows.Forms;
+using System.IO;
using Tao.Sdl;
using SDL.net;
@@ -48,10 +49,10 @@
ButtonClick += click;
- btnoff = new Surface(Application.StartupPath + "\\gui\\" + name + ".png");
- btnon = new Surface(Application.StartupPath + "\\gui\\" + name + "_down.png");
+ btnoff = new Surface(Path.Combine(Application.StartupPath, Path.Combine(SDLGUI.GuiDirectory, name + ".png")));
+ btnon = new Surface(Path.Combine(Application.StartupPath, Path.Combine(SDLGUI.GuiDirectory, name + "_down.png")));
- fnt = SdlTtf.TTF_OpenFont(Application.StartupPath + "\\gui\\freesans.ttf", 12);
+ fnt = SdlTtf.TTF_OpenFont(Path.Combine(Application.StartupPath, Path.Combine(SDLGUI.GuiDirectory, "FreeSans.ttf")), 12);
button_name = name;
}
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-13 22:26:57 UTC (rev 218)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-14 06:51:22 UTC (rev 219)
@@ -405,10 +405,14 @@
{
// try the IDE directory first
//string pluginDir = Path.GetFullPath(Path.Combine(Core.installationDirectory, @"..\..\plugins" ));
- string pluginDir = Application.StartupPath + "\\plugins";
+ string pluginDir = Path.Combine(Application.StartupPath,"plugins");
if (Directory.Exists(pluginDir))
return pluginDir;
+ pluginDir = Path.Combine(Application.StartupPath, Path.Combine(Path.Combine("..",".."),"plugins"));
+ if (Directory.Exists(pluginDir))
+ return pluginDir;
+
// if we can't find it, try the directory under the executable directory
pluginDir = Path.GetFullPath(Path.Combine(
Core.installationDirectory, @"plugins"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 07:38:05
|
Revision: 222
http://freetrain.svn.sourceforge.net/freetrain/?rev=222&view=rev
Author: jendave
Date: 2008-03-14 00:38:10 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
cleaned up plugins
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/Properties/Resources.Designer.cs
branches/FreeTrainSDL/Properties/Resources.resx
branches/FreeTrainSDL/Properties/Settings.Designer.cs
branches/FreeTrainSDL/Properties/Settings.settings
branches/FreeTrainSDL/core/Properties/Resources.Designer.cs
branches/FreeTrainSDL/core/Properties/Resources.resx
Property Changed:
----------------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/bin/Debug/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -7,7 +7,7 @@
<ProjectGuid>{B43DC0F1-5C4B-490F-8171-C3754A02D605}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>FreeTrainSDL</RootNamespace>
+ <RootNamespace>FreeTrain</RootNamespace>
<AssemblyName>FreeTrainSDL</AssemblyName>
<StartupObject>FreeTrainSDL.FreeTrainSDL</StartupObject>
<PublishUrl>http://localhost/FreeTrainSDL/</PublishUrl>
@@ -58,16 +58,6 @@
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Program.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- <DependentUpon>Settings.settings</DependentUpon>
- </Compile>
<Compile Include="SDLGUI.cs" />
<Compile Include="SDLGUIButton.cs" />
</ItemGroup>
@@ -82,19 +72,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0</ProductName>
Deleted: branches/FreeTrainSDL/Properties/Resources.Designer.cs
===================================================================
--- branches/FreeTrainSDL/Properties/Resources.Designer.cs 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/Properties/Resources.Designer.cs 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.832
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FreeTrainSDL.Properties {
- using System;
-
-
- /// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
- /// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- /// <summary>
- /// Returns the cached ResourceManager instance used by this class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FreeTrainSDL.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- /// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
Deleted: branches/FreeTrainSDL/Properties/Resources.resx
===================================================================
--- branches/FreeTrainSDL/Properties/Resources.resx 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/Properties/Resources.resx 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 1.3
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1">this is my long string</data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- [base64 mime encoded serialized .NET Framework object]
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
-
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>1.3</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
Deleted: branches/FreeTrainSDL/Properties/Settings.Designer.cs
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.Designer.cs 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/Properties/Settings.Designer.cs 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.832
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FreeTrainSDL.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
Deleted: branches/FreeTrainSDL/Properties/Settings.settings
===================================================================
--- branches/FreeTrainSDL/Properties/Settings.settings 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/Properties/Settings.settings 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
- <Profiles>
- <Profile Name="(Default)" />
- </Profiles>
-</SettingsFile>
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -16,7 +16,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>freetrain</RootNamespace>
+ <RootNamespace>FreeTrain.Core</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -32,7 +32,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>Debug\FreeTrain.Core.XML</DocumentationFile>
+ <DocumentationFile>Debug\FreeTrain.Core.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -505,11 +505,6 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
<Compile Include="util\ArrayEnumerator.cs">
<SubType>Code</SubType>
</Compile>
@@ -989,13 +984,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <SubType>Designer</SubType>
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\lib\Controls\FreeTrain.Controls.csproj">
<Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
<Name>FreeTrain.Controls</Name>
@@ -1007,7 +995,8 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>rem del $(ProjectDir)\obj\Debug\*.PDB</PreBuildEvent>
+ <PreBuildEvent>
+ </PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
Deleted: branches/FreeTrainSDL/core/Properties/Resources.Designer.cs
===================================================================
--- branches/FreeTrainSDL/core/Properties/Resources.Designer.cs 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/core/Properties/Resources.Designer.cs 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace freetrain.Properties {
- using System;
-
-
- /// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
- /// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- /// <summary>
- /// Returns the cached ResourceManager instance used by this class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("freetrain.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- /// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
Deleted: branches/FreeTrainSDL/core/Properties/Resources.resx
===================================================================
--- branches/FreeTrainSDL/core/Properties/Resources.resx 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/core/Properties/Resources.resx 2008-03-14 07:38:10 UTC (rev 222)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -18,7 +18,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>freetrain.controls</RootNamespace>
+ <RootNamespace>FreeTrain.Controls</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\FreeTrain.Controls.XML</DocumentationFile>
+ <DocumentationFile>bin\Debug\FreeTrain.Controls.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -151,6 +151,7 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
- <PostBuildEvent>copy "$(TargetDir)*.dll" "$(SolutionDir)core\Debug\"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -41,6 +41,7 @@
</Compile>
</ItemGroup>
<PropertyGroup>
- <PostBuildEvent>copy "$(ProjectDir)bin\Debug\*.dll" "$(SolutionDir)core\Debug\"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib
___________________________________________________________________
Name: svn:ignore
- SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
+ SDLGFX.net.xml
DummyCars.dll
DummyCars.pdb
RoadAccessory.dll
RoadAccessory.pdb
RoadAccessory.XML
SDLGFX.net.dll
SDLGFX.net.pdb
*.XML
FreeTrain.DummyCars.dll
FreeTrain.DummyCars.pdb
FreeTrain.DummyCars.xml
FreeTrain.RoadAccessory.dll
FreeTrain.RoadAccessory.pdb
FreeTrain.RoadAccessory.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml 2008-03-14 07:38:10 UTC (rev 222)
@@ -12,26 +12,26 @@
<name>roadAccessory</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.world.road.accessory.RoadAccessoryContribution"
- codebase="RoadAccessory.DLL" />
+ codebase="FreeTrain.RoadAccessory.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{3773CA2C-11B5-4DCC-C477-2296E9EBEBA7}">
<class name="freetrain.world.road.accessory.MenuContributionImpl"
- codebase="RoadAccessory.DLL" />
+ codebase="FreeTrain.RoadAccessory.dll" />
</contribution>
<contribution type="contribution" id="{0A73F9C6-BDCC-43DF-C477-E28B76058E8C}">
<name>DummyCar</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.world.road.dummycar.DummyCarContribution"
- codebase="DummyCars.DLL" />
+ codebase="FreeTrain.DummyCars.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{BFC035E9-8B0E-41D6-C477-72F99D820290}">
<class name="freetrain.world.road.dummycar.MenuContributionImpl"
- codebase="DummyCars.DLL" />
+ codebase="FreeTrain.DummyCars.dll" />
</contribution>
</plug-in>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -10,7 +10,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>DummyCars</AssemblyName>
+ <AssemblyName>FreeTrain.DummyCars</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -18,7 +18,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>DummyCars</RootNamespace>
+ <RootNamespace>FreeTrain.DummyCars</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>..\..\DummyCars.XML</DocumentationFile>
+ <DocumentationFile>..\..\FreeTrain.DummyCars.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -10,7 +10,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>RoadAccessory</AssemblyName>
+ <AssemblyName>FreeTrain.RoadAccessory</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -18,7 +18,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>RoadAccessory</RootNamespace>
+ <RootNamespace>FreeTrain.RoadAccessory</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>..\..\RoadAccessory.XML</DocumentationFile>
+ <DocumentationFile>..\..\FreeTrain.RoadAccessory.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic
___________________________________________________________________
Name: svn:ignore
- obj
+ obj
FreeTrain.ExpandedContributions.dll
FreeTrain.ExpandedContributions.pdb
FreeTrain.ExpandedContributions.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -10,7 +10,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.ContribEx</AssemblyName>
+ <AssemblyName>FreeTrain.ExpandedContributions</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -18,7 +18,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>ExpandedContributions</RootNamespace>
+ <RootNamespace>FreeTrain.ExpandedContributions</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
@@ -28,7 +28,7 @@
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\FreeTrain.ContribEx.XML</DocumentationFile>
+ <DocumentationFile>FreeTrain.ExpandedContributions.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/bin/Debug
___________________________________________________________________
Name: svn:ignore
- AxSHDocVw.dll
FreeTrain.ContribEx.dll
FreeTrain.ContribEx.pdb
FreeTrain.ContribEx.XML
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
+ AxSHDocVw.dll
FreeTrain.ContribEx.dll
FreeTrain.ContribEx.pdb
FreeTrain.ContribEx.XML
MsHtmlHost.dll
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
FreeTrain.ExpandedContributions.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml 2008-03-14 07:38:10 UTC (rev 222)
@@ -34,20 +34,20 @@
<contribution type="menu" id="{2E1EE15E-101A-43E5-C477-95363F8E8AF0}">
<class name="freetrain.framework.plugin.generic.MenuContributionImpl"
- codebase="bin/Debug/FreeTrain.ContribEx.dll" />
+ codebase="FreeTrain.ExpandedContributions.dll" />
</contribution>
<contribution type="contribution" id="{F9C26336-8D20-44FE-C477-453A270EC37D}">
<name>GenericStructure</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.framework.plugin.generic.GenericStructureContribution"
- codebase="bin/Debug/FreeTrain.ContribEx.dll" />
+ codebase="FreeTrain.ExpandedContributions.dll" />
</contribution>
<contribution type="contribution" id="{E58C4314-E57B-4F02-C477-A86CF1E1D655}">
<name>GenericLand</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.framework.plugin.generic.GenericLandContribution"
- codebase="bin/Debug/FreeTrain.ContribEx.dll" />
+ codebase="FreeTrain.ExpandedContributions.dll" />
</contribution>
<!--<contribution type="dockingContent" id="{C7E08038-DADA-46FD-C477-AEB5A4112B1C}">-->
<!-- <name>StructureTypeTree</name>-->
Property changes on: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
AxSHDocVw.dll
FreeTrain.Controls.dll
FreeTrain.Controls.pdb
FreeTrain.Controls.xml
FreeTrain.HalfVoxelStructure.dll
FreeTrain.HalfVoxelStructure.pdb
FreeTrain.HalfVoxelStructure.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -10,7 +10,7 @@
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
- <AssemblyName>HalfVoxelStructure</AssemblyName>
+ <AssemblyName>FreeTrain.HalfVoxelStructure</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
@@ -28,7 +28,7 @@
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\HalfVoxelStructure.XML</DocumentationFile>
+ <DocumentationFile>FreeTrain.HalfVoxelStructure.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml 2008-03-14 07:38:10 UTC (rev 222)
@@ -38,14 +38,14 @@
<name>HalfVoxelStructure</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.world.structs.hv.HalfVoxelContribution"
- codebase="bin/Debug/HalfVoxelStructure.DLL" />
+ codebase="FreeTrain.HalfVoxelStructure.dll" />
</contribution>
<!-- temporary -->
<contribution type="menu" id="{01AA051B-6112-4C00-C477-DE82E240F19F}">
<class name="freetrain.world.structs.hv.MenuContributionImpl"
- codebase="bin/Debug/HalfVoxelStructure.DLL" />
+ codebase="FreeTrain.HalfVoxelStructure.dll" />
</contribution>
<!--ここまでの順序は大切-->
-</plugin>
\ No newline at end of file
+</plugin>
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
FreeTrain.VinylHouse.dll
FreeTrain.VinylHouse.pdb
FreeTrain.VinylHouse.xml
SDLGFX.net.dll
SDLGFX.net.pdb
SDLGFX.net.xml
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -18,7 +18,7 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
- <RootNamespace>VinylHouse</RootNamespace>
+ <RootNamespace>FreeTrain.VinylHouse</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
@@ -28,7 +28,7 @@
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -36,7 +36,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>bin\Debug\FreeTrain.VinylHouse.XML</DocumentationFile>
+ <DocumentationFile>FreeTrain.VinylHouse.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml 2008-03-14 07:38:10 UTC (rev 222)
@@ -19,7 +19,7 @@
<contribution type="land" id="{66B81CAD-8B41-416C-8624-137C2D8110F2}">
<group>Greenhouse</group>
<class name="freetrain.world.land.vinylhouse.XVinylHouseBuilder"
- codebase="bin/Debug/FreeTrain.VinylHouse.dll"/>
+ codebase="FreeTrain.VinylHouse.dll"/>
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="0" />
<price>20</price>
<population>
@@ -31,7 +31,7 @@
<contribution type="land" id="{4F97D7DD-749E-4B65-BF13-5733B10D8570}">
<group>Greenhouse</group>
<class name="freetrain.world.land.vinylhouse.YVinylHouseBuilder"
- codebase="bin/Debug/FreeTrain.VinylHouse.dll"/>
+ codebase="FreeTrain.VinylHouse.dll"/>
<picture ref="{5981B3EA-5CCF-4DB2-94DC-B7EC854987D7}" offset="32" />
<price>20</price>
<population>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-14 07:07:52 UTC (rev 221)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-14 07:38:10 UTC (rev 222)
@@ -4,7 +4,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4380999E-CA4C-4AA2-8848-12FFABF72535}</ProjectGuid>
- <RootNamespace>freetrain.world.rail.cttrain</RootNamespace>
+ <RootNamespace>FreeTrain.ColorTestTrain</RootNamespace>
<AssemblyName>FreeTrain.ColorTestTrain</AssemblyName>
<OutputType>Library</OutputType>
<ApplicationIcon />
@@ -25,7 +25,7 @@
<OutputPath>bin\Debug\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\FreeTrain.ColorTestTrain.XML</DocumentationFile>
+ <DocumentationFile>bin\Debug\FreeTrain.ColorTestTrain.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<NoStdLib>false</NoStdLib>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 07:45:42
|
Revision: 223
http://freetrain.svn.sourceforge.net/freetrain/?rev=223&view=rev
Author: jendave
Date: 2008-03-14 00:45:45 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
made the plugins projects more consistent
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.sln
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
Added Paths:
-----------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj.user
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/bin/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj.user
Property Changed:
----------------
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/
Modified: branches/FreeTrainSDL/FreeTrainSDL.sln
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/FreeTrainSDL.sln 2008-03-14 07:45:45 UTC (rev 223)
@@ -13,14 +13,14 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ColorTestTrain", "plugins\org.kohsuke.freetrain.trains.colorTest\FreeTrain.ColorTestTrain.csproj", "{4380999E-CA4C-4AA2-8848-12FFABF72535}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ContribEx", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.ContribEx.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.DummyCars", "plugins\jp.co.tripod.chiname.lib\src\DummyCars\FreeTrain.DummyCars.csproj", "{733996EC-7260-4A94-B118-D1E957F0474D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.RoadAccessory", "plugins\jp.co.tripod.chiname.lib\src\RoadAccessory\FreeTrain.RoadAccessory.csproj", "{7264D32E-75DB-4C13-9EE4-E6263FD5B652}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.VinylHouse", "plugins\org.kohsuke.freetrain.land.477\FreeTrain.VinylHouse.csproj", "{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeTrain.ExpandedContributions", "plugins\jp.co.tripod.chiname.lib.generic\FreeTrain.ExpandedContributions.csproj", "{14C6D588-E391-49CE-A1D2-2A8A2A60A540}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -51,10 +51,6 @@
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4380999E-CA4C-4AA2-8848-12FFABF72535}.Release|Any CPU.Build.0 = Release|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.Build.0 = Release|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{733996EC-7260-4A94-B118-D1E957F0474D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,6 +63,10 @@
{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D01D6622-F67B-4EDC-8CA3-4E1A8FCA422B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14C6D588-E391-49CE-A1D2-2A8A2A60A540}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj 2008-03-14 07:45:45 UTC (rev 223)
@@ -1,148 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{14C6D588-E391-49CE-A1D2-2A8A2A60A540}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>FreeTrain.ExpandedContributions</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
- <DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
- <RootNamespace>FreeTrain.ExpandedContributions</RootNamespace>
- <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>.\</OutputPath>
- <PlatformTarget>x86</PlatformTarget>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>FreeTrain.ExpandedContributions.xml</DocumentationFile>
- <DebugSymbols>true</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
- <Optimize>false</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>full</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>bin\Release\</OutputPath>
- <PlatformTarget>x86</PlatformTarget>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
- <Optimize>true</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- <Reference Include="System.Drawing">
- <Name>System.Drawing</Name>
- </Reference>
- <Reference Include="System.Windows.Forms">
- <Name>System.Windows.Forms</Name>
- </Reference>
- <Reference Include="System.Xml">
- <Name>System.XML</Name>
- </Reference>
- <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
- <Name>FreeTrain.Core</Name>
- <Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
- <Name>FreeTrain.Controls</Name>
- <Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
- <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
- <Name>SDL.net</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="CategoryTree.xml" />
- <Content Include="icons.bmp" />
- <Content Include="icons_sp.bmp" />
- <Content Include="mouse.ico" />
- <Compile Include="CategoryTreeWnd.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="GenericLandContribution.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="GenericStructureContribution.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="MenuContributionImpl.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="MultiSelectorController.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="StructCategory.cs">
- <SubType>Code</SubType>
- </Compile>
- <EmbeddedResource Include="CategoryTreeWnd.resx">
- <DependentUpon>CategoryTreeWnd.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="MultiSelectorController.resx">
- <DependentUpon>MultiSelectorController.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <None Include="plugin.xml" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj.user
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj.user 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ContribEx.csproj.user 2008-03-14 07:45:45 UTC (rev 223)
@@ -1,57 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <LastOpenVersion>7.10.3077</LastOpenVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReferencePath>C:\Project\FreeTrain\Patch\FreeTrain\extlib\;C:\Project\FreeTrain\FreeTrain\extlib\</ReferencePath>
- <CopyProjectDestinationFolder>
- </CopyProjectDestinationFolder>
- <CopyProjectUncPath>
- </CopyProjectUncPath>
- <CopyProjectOption>0</CopyProjectOption>
- <ProjectView>ProjectFiles</ProjectView>
- <ProjectTrust>0</ProjectTrust>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Added: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj (rev 0)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/FreeTrain.ExpandedContributions.csproj 2008-03-14 07:45:45 UTC (rev 223)
@@ -0,0 +1,148 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{14C6D588-E391-49CE-A1D2-2A8A2A60A540}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>FreeTrain.ExpandedContributions</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FreeTrain.ExpandedContributions</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>.\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>FreeTrain.ExpandedContributions.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <PlatformTarget>x86</PlatformTarget>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ </Reference>
+ <Reference Include="System.Windows.Forms">
+ <Name>System.Windows.Forms</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\..\core\FreeTrain.Core.csproj">
+ <Name>FreeTrain.Core</Name>
+ <Project>{7746CF50-D84E-4E7B-83FB-AB43DB854DA8}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\lib\Controls\FreeTrain.Controls.csproj">
+ <Name>FreeTrain.Controls</Name>
+ <Project>{D3B86CCE-530E-4472-AE8E-3FA5F903C206}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\lib\SDLGFX.net\SDL.net.csproj">
+ <Project>{778C6318-394F-4DE7-B9AF-FCCFA1B68AAE}</Project>
+ <Name>SDL.net</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="CategoryTree.xml" />
+ <Content Include="icons.bmp" />
+ <Content Include="icons_sp.bmp" />
+ <Content Include="mouse.ico" />
+ <Compile Include="CategoryTreeWnd.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GenericLandContribution.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="GenericStructureContribution.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="MenuContributionImpl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="MultiSelectorController.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="StructCategory.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <EmbeddedResource Include="CategoryTreeWnd.resx">
+ <DependentUpon>CategoryTreeWnd.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MultiSelectorController.resx">
+ <DependentUpon>MultiSelectorController.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <None Include="plugin.xml" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj.user
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj.user 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/FreeTrain.HalfVoxelStructure.csproj.user 2008-03-14 07:45:45 UTC (rev 223)
@@ -1,57 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <LastOpenVersion>7.10.3077</LastOpenVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReferencePath>C:\Project\FreeTrain\FreeTrain\extlib\</ReferencePath>
- <CopyProjectDestinationFolder>
- </CopyProjectDestinationFolder>
- <CopyProjectUncPath>
- </CopyProjectUncPath>
- <CopyProjectOption>0</CopyProjectOption>
- <ProjectView>ProjectFiles</ProjectView>
- <ProjectTrust>0</ProjectTrust>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Property changes on: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest
___________________________________________________________________
Name: svn:ignore
- bin
obj
+ bin
obj
FreeTrain.ColorTestTrain.dll
FreeTrain.ColorTestTrain.pdb
FreeTrain.ColorTestTrain.xml
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/FreeTrain.ColorTestTrain.csproj 2008-03-14 07:45:45 UTC (rev 223)
@@ -22,10 +22,10 @@
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>.\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <DocumentationFile>bin\Debug\FreeTrain.ColorTestTrain.xml</DocumentationFile>
+ <DocumentationFile>FreeTrain.ColorTestTrain.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<NoStdLib>false</NoStdLib>
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-14 07:38:10 UTC (rev 222)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml 2008-03-14 07:45:45 UTC (rev 223)
@@ -6,14 +6,14 @@
<contribution type="menu" id="{8CA8F000-4DC6-4441-8F53-A628C952BD9F}">
<class name="freetrain.world.rail.cttrain.ColorConfigCommand"
- codebase="bin/Debug/FreeTrain.ColorTestTrain.dll" />
+ codebase="FreeTrain.ColorTestTrain.dll" />
</contribution>
<!-- Test Train -->
<contribution type="trainCar" id="{6E5E12DD-69CB-4DF2-B4F0-2BCDA703CBB0}">
<class
name="freetrain.world.rail.cttrain.ColorTestTrainCar"
- codebase="bin/Debug/FreeTrain.ColorTestTrain.dll" />
+ codebase="FreeTrain.ColorTestTrain.dll" />
</contribution>
<contribution type="train" id="{719F0922-EA74-409C-B829-C4950201C226}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 09:07:09
|
Revision: 224
http://freetrain.svn.sourceforge.net/freetrain/?rev=224&view=rev
Author: jendave
Date: 2008-03-14 02:07:15 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
remove Sdl.net audio. Replaced with SdlDotNet
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
Added Paths:
-----------
branches/FreeTrainSDL/lib/SdlDotNet.dll
branches/FreeTrainSDL/lib/SdlDotNet.xml
Property Changed:
----------------
branches/FreeTrainSDL/lib/SDLGFX.net/
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 09:07:15 UTC (rev 224)
@@ -79,6 +79,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\MsHtmlHost.dll</HintPath>
</Reference>
+ <Reference Include="SdlDotNet, Version=6.1.0.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\SdlDotNet.dll</HintPath>
+ </Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
Modified: branches/FreeTrainSDL/core/framework/BGMManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-14 09:07:15 UTC (rev 224)
@@ -24,7 +24,8 @@
using System.Windows.Forms;
using freetrain.contributions.sound;
using freetrain.framework.plugin;
-using SDL.net;
+//using SDL.net;
+using SdlDotNet.Audio;
namespace freetrain.framework
{
@@ -34,7 +35,8 @@
public class BGMManager
{
/// <summary> BGM player. </summary>
- private readonly BGM bgm = new BGM();
+ //private readonly BGM bgm = new BGM();
+ private static SdlDotNet.Audio.Music bgm;
/// <summary> Reference to the "music" menu item. </summary>
//private readonly MenuItem musicMenu;
@@ -132,8 +134,15 @@
{
if (contrib == currentBGM)
{
- if (currentPlaylist.Count > 1) nextSong();
- else bgm.stop();
+ if (currentPlaylist.Count > 1)
+ {
+ nextSong();
+ }
+ else
+ {
+ SdlDotNet.Audio.MusicPlayer.Stop();
+ }
+ //else bgm.stop();
}
currentPlaylist.Remove(contrib);
}
@@ -196,8 +205,10 @@
{
try
{
- bgm.fileName = current.fileName;
- bgm.run();
+ bgm = new SdlDotNet.Audio.Music(current.fileName);
+ bgm.Play();
+ //SdlDotNet.Audio.MusicPlayer.Play();
+ //bgm.run();
}
catch (Exception e)
{
Modified: branches/FreeTrainSDL/core/framework/ResourceUtil.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/core/framework/ResourceUtil.cs 2008-03-14 09:07:15 UTC (rev 224)
@@ -25,6 +25,7 @@
using System.Net;
//using org.kohsuke.directaudio;
using SDL.net;
+using SdlDotNet.Audio;
using freetrain.util;
using freetrain.framework.graphics;
using freetrain.world;
@@ -83,10 +84,10 @@
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
- public static Segment loadSystemSound(String name)
+ public static Sound loadSystemSound(String name)
{
// can't read from stream
- return Segment.fromFile(findSystemResource(name));
+ return new Sound(findSystemResource(name));
}
// using URI is essentially dangerous as Segment only support file names.
@@ -96,9 +97,9 @@
/// </summary>
/// <param name="uri"></param>
/// <returns></returns>
- public static Segment loadSound(Uri uri)
+ public static Sound loadSound(Uri uri)
{
- return Segment.fromFile(uri.LocalPath);
+ return new Sound(uri.LocalPath);
}
/// <summary>
///
Modified: branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs 2008-03-14 09:07:15 UTC (rev 224)
@@ -22,7 +22,9 @@
using System.Collections;
using freetrain.world;
using freetrain.views.map;
-using SDL.net;
+using SdlDotNet.Audio;
+using SdlDotNet;
+//using SDL.net;
namespace freetrain.framework.sound
{
@@ -43,7 +45,7 @@
/// <param name="seg">Sound-effect object</param>
/// <param name="concurrentPlaybackMax">Number of maximum concurrent playback.</param>
/// <param name="intervalTime">Interval between two successive playbacks</param>
- public RepeatableSoundEffectImpl(Segment seg, int concurrentPlaybackMax, int intervalTime)
+ public RepeatableSoundEffectImpl(Sound seg, int concurrentPlaybackMax, int intervalTime)
{
this.segment = seg;
this.concurrentPlaybackMax = concurrentPlaybackMax;
@@ -53,9 +55,9 @@
///
/// </summary>
/// <param name="seg"></param>
- public RepeatableSoundEffectImpl(Segment seg) : this(seg, 3, 200) { }
+ public RepeatableSoundEffectImpl(Sound seg) : this(seg, 3, 200) { }
- private readonly Segment segment;
+ private readonly Sound segment;
///// <summary>
///// SegmentState objects that represent the state
@@ -101,8 +103,14 @@
{
//SegmentState st = Core.soundEffectManager.play(segment,ms);
//if(st!=null) states.Add(st);
- //Core.soundEffectManager.play(segment, ms);
- segment.play();
+ try
+ {
+ segment.Play();
+ }
+ catch (SdlDotNet.Core.SdlException e)
+ {
+ e.Message.ToString();
+ }
}
}
}
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs 2008-03-14 09:07:15 UTC (rev 224)
@@ -22,7 +22,9 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
using System.Collections;
-using SDL.net;
+using SdlDotNet.Audio;
+using SdlDotNet.Core;
+//using SDL.net;
namespace freetrain.framework.sound
{
@@ -38,7 +40,7 @@
/// </summary>
public bool IsAvailable { get { return available; } }
- private SDL.net.Audio _audio;
+ //private SDL.net.Audio _audio;
/// <summary>
/// A new instance should be created only by the MainWindow class.
@@ -47,7 +49,7 @@
{
try
{
- this._audio = new Audio();
+ //this._audio = new Audio();
available = true;
}
catch (Exception e)
@@ -97,13 +99,20 @@
{
//if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
// sndPlaySound(fileName,0);
- if (sounds.Contains(fileName)) { ((Segment)sounds[fileName]).play(); }
- else
+ try
{
- Segment newSound = new Segment(fileName);
- sounds.Add(fileName, newSound);
- newSound.play();
+ if (sounds.Contains(fileName)) { ((Sound)sounds[fileName]).Play(); }
+ else
+ {
+ Sound newSound = new Sound(fileName);
+ sounds.Add(fileName, newSound);
+ newSound.Play();
+ }
}
+ catch (SdlException e)
+ {
+ e.Message.ToString();
+ }
//SDL.net.Audio.play(fileName);
}
@@ -116,13 +125,20 @@
//if( Core.options.enableSoundEffect && Core.soundEffectManager.IsAvailable )
// sndPlaySound(fileName,1);
//SDL.net.Audio.play(fileName);
- if (sounds.Contains(fileName)) { ((Segment)sounds[fileName]).play(); }
- else
+ try
{
- Segment newSound = new Segment(fileName);
- sounds.Add(fileName, newSound);
- newSound.play();
+ if (sounds.Contains(fileName)) { ((Sound)sounds[fileName]).Play(); }
+ else
+ {
+ Sound newSound = new Sound(fileName);
+ sounds.Add(fileName, newSound);
+ newSound.Play();
+ }
}
+ catch (SdlException e)
+ {
+ e.Message.ToString();
+ }
}
/*internal SegmentState play(Segment segment, int ms)
@@ -131,10 +147,17 @@
segment.play(ms);
}*/
- internal void play(Segment segment, int ms)
+ //internal void play(Segment segment, int ms)
+ internal void play(Sound segment, int ms)
{
- //throw new Exception("The method or operation is not implemented.");
- segment.play(ms);
+ try
+ {
+ segment.Play();
+ }
+ catch (SdlException e)
+ {
+ e.Message.ToString();
+ }
}
}
}
Property changes on: branches/FreeTrainSDL/lib/SDLGFX.net
___________________________________________________________________
Name: svn:ignore
- obj
bin
+ obj
bin
*.swp
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-14 09:07:15 UTC (rev 224)
@@ -28,39 +28,6 @@
/// <summary>
///
/// </summary>
- public class Audio : IDisposable
- {
- /// <summary>
- ///
- /// </summary>
- public Audio()
- {
- //SdlMixer.Mix_OpenAudio(SdlMixer.MIX_DEFAULT_FREQUENCY, unchecked(Sdl.AUDIO_S16LSB), 2, 1024);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="filename"></param>
- public static void play(string filename)
- {
- IntPtr tmp = SdlMixer.Mix_LoadWAV(filename);
- SdlMixer.Mix_PlayChannel(-1, tmp, 0);
- //SdlMixer.Mix_FreeChunk(tmp);
- }
-
- /// <summary>
- ///
- /// </summary>
- public void Dispose()
- {
- //SdlMixer.Mix_CloseAudio();
- }
- }
-
- /// <summary>
- ///
- /// </summary>
public class Segment
{
IntPtr sndHandle;
@@ -111,61 +78,4 @@
return new Segment(p);
}
}
-
- /// <summary>
- ///
- /// </summary>
- public class BGM
- {
- private string _filename;
- /// <summary>
- ///
- /// </summary>
- public string fileName
- {
- get
- {
- return _filename;
- }
- set
- {
- if (music != IntPtr.Zero) SdlMixer.Mix_FreeMusic(music);
- _filename = value;
- music = SdlMixer.Mix_LoadMUS(_filename);
- }
- }
-
- private IntPtr music;
-
- /// <summary>
- ///
- /// </summary>
- public BGM()
- {
- _filename = string.Empty;
- music = IntPtr.Zero;
- }
-
- /// <summary>
- ///
- /// </summary>
- public void stop()
- {
- //throw new Exception("The method or operation is not implemented.");
- SdlMixer.Mix_HaltMusic();
- }
-
- /// <summary>
- ///
- /// </summary>
- public void run()
- {
- //throw new Exception("The method or operation is not implemented.");
- if (_filename != string.Empty)
- {
- SdlMixer.Mix_LoadMUS(fileName);
- SdlMixer.Mix_PlayMusic(music, 0);
- }
- }
- }
}
Modified: branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-14 07:45:45 UTC (rev 223)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/SDL.net.csproj 2008-03-14 09:07:15 UTC (rev 224)
@@ -34,7 +34,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="Audio.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Surface.cs">
<SubType>Code</SubType>
Added: branches/FreeTrainSDL/lib/SdlDotNet.dll
===================================================================
(Binary files differ)
Property changes on: branches/FreeTrainSDL/lib/SdlDotNet.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/FreeTrainSDL/lib/SdlDotNet.xml
===================================================================
--- branches/FreeTrainSDL/lib/SdlDotNet.xml (rev 0)
+++ branches/FreeTrainSDL/lib/SdlDotNet.xml 2008-03-14 09:07:15 UTC (rev 224)
@@ -0,0 +1,12606 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>SdlDotNet</name>
+ </assembly>
+ <members>
+ <member name="T:SdlDotNet.Audio.AudioException">
+ <summary>
+ Represents a Audio run-time error from the Sdl library.
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Core.SdlException">
+ <summary>
+ Represents a run-time error from the Sdl library.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlException.#ctor">
+ <summary>
+ Returns basic exception
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlException.#ctor(System.String)">
+ <summary>
+ Initializes an SdlException instance
+ </summary>
+ <param name="message">
+ The string representing the error message
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlException.#ctor(System.String,System.Exception)">
+ <summary>
+ Returns exception
+ </summary>
+ <param name="message">Exception message</param>
+ <param name="exception">Exception type</param>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Returns SerializationInfo
+ </summary>
+ <param name="info"></param>
+ <param name="context"></param>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlException.Generate">
+ <summary>
+ Generates an SdlException based on the last Sdl Error code.
+ </summary>
+ <returns>
+ A new SdlException object
+ </returns>
+ </member>
+ <member name="P:SdlDotNet.Core.SdlException.GetError">
+ <summary>
+ Returns SDL error.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioException.#ctor">
+ <summary>
+ Returns basic exception
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.String)">
+ <summary>
+ Initializes an AudioException instance
+ </summary>
+ <param name="message">
+ The string representing the error message
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.String,System.Exception)">
+ <summary>
+ Returns exception
+ </summary>
+ <param name="message">Exception message</param>
+ <param name="exception">Exception type</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+ <summary>
+ Returns SerializationInfo
+ </summary>
+ <param name="info"></param>
+ <param name="context"></param>
+ </member>
+ <member name="T:SdlDotNet.Audio.AudioStream">
+ <summary>
+ An active audio stream for queueing audio data to be played asynchronously.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioStream.#ctor(System.Int32,SdlDotNet.Audio.AudioFormat,SdlDotNet.Audio.SoundChannel,System.Int16,SdlDotNet.Audio.AudioCallback,System.Object)">
+ <summary>
+ Creates an AudioStream
+ </summary>
+ <param name="sampleFrequency">Frequency</param>
+ <param name="format">format of stream data</param>
+ <param name="channels">Mono or Stereo</param>
+ <param name="samples">number of samples</param>
+ <param name="callback">Method callback to get more data</param>
+ <param name="data">data object</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioStream.#ctor(System.Int32,SdlDotNet.Audio.AudioFormat,SdlDotNet.Audio.SoundChannel,System.Int16)">
+ <summary>
+ Creates an AudioStream
+ </summary>
+ <param name="sampleFrequency">Frequency</param>
+ <param name="format">format of stream data</param>
+ <param name="channels">Mono or Stereo</param>
+ <param name="samples">number of samples</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.AudioStream.Write(System.Int16[])">
+ <summary>
+ Asynchronously queues audio data in <paramref name="data"/>.
+ </summary>
+ <param name="data">Buffer formatted as <see cref="F:SdlDotNet.Audio.AudioFormat.Unsigned16Little"/> of audio data to be played</param>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Offset">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.AudioStatus">
+ <summary>
+ Returns the current playback state of the audio subsystem. See <see cref="P:SdlDotNet.Audio.AudioStream.AudioStatus"/>.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Paused">
+ <summary>
+ Gets or sets the paused state of the audio subsystem.
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Bits">
+ <summary>
+ Returns the format of the stream
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Samples">
+ <summary>
+ Size of the SDL audio sample buffer
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.RemainingSamples">
+ <summary>
+ Total remaining samples queued
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.RemainingMilliseconds">
+ <summary>
+ Total remaining milliseconds before sample queue is emptied
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.RemainingQueues">
+ <summary>
+ Remaining number of buffers queued
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Frequency">
+ <summary>
+ Audio frequency in samples per second
+ </summary>
+ <remarks>
+ The number of samples sent to the sound device every second.
+ Common values are 11025, 22050 and 44100. The higher the better.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Format">
+ <summary>
+ Audio data format.
+ </summary>
+ <remarks>
+ Specifies the size and type of each sample element.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Channels">
+ <summary>
+ Number of channels: 1 mono, 2 stereo.
+ </summary>
+ <remarks>
+ The number of seperate sound channels.
+ 1 is mono (single channel), 2 is stereo (dual channel).
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.BufferSamples">
+ <summary>
+ Audio buffer size in samples.
+ </summary>
+ <remarks>
+ When used with <see cref="M:SdlDotNet.Audio.Mixer.OpenAudio(SdlDotNet.Audio.AudioStream)"/> this refers
+ to the size of the
+ audio buffer in samples. A sample a chunk of audio data
+ of the size specified in format mulitplied by the number
+ of channels.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.BufferSize">
+ <summary>
+ Audio buffer size in bytes (calculated)
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.AudioStream.Silence">
+ <summary>
+ Audio buffer silence value (calculated).
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.CDDrive">
+ <summary>
+ Represents an individual CD drive on the system
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="T:SdlDotNet.Core.BaseSdlResource">
+ <summary>
+ Base class for SdlResources
+ </summary>
+ <remarks>
+ Several SdlDotNet classes inherit from this class
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.#ctor(System.IntPtr)">
+ <summary>
+ Creates class using a handle.
+ </summary>
+ <param name="handle">
+ Pointer to unmanaged Sdl resource
+ </param>
+ <remarks>
+ Often used by internal classes.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.#ctor">
+ <summary>
+ Default constructor.
+ </summary>
+ <remarks>
+ Used by outside classes.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.Finalize">
+ <summary>
+ Allows an Object to attempt to free resources
+ and perform other cleanup operations before the Object
+ is reclaimed by garbage collection.
+ </summary>
+ <remarks>
+ Frees managed resources
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.Dispose(System.Boolean)">
+ <summary>
+ Dispose objects
+ </summary>
+ <param name="disposing">
+ If true, it will dispose close the handle
+ </param>
+ <remarks>
+ Will dispose managed and unmanaged resources.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.CloseHandle">
+ <summary>
+ Close the handle.
+ </summary>
+ <remarks>
+ Used to close handle to unmanaged SDL resources
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.Dispose">
+ <summary>
+ Closes and destroys this object
+ </summary>
+ <remarks>
+ Destroys managed and unmanaged objects
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Core.BaseSdlResource.Close">
+ <summary>
+ Closes and destroys this object
+ </summary>
+ <remarks>
+ Same as Dispose(true)
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Core.BaseSdlResource.Handle">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.#ctor(System.IntPtr,System.Int32)">
+ <summary>
+ Represents a CD drive on the system
+ </summary>
+ <param name="handle">Handle to CDDrive</param>
+ <param name="index">Index number of drive</param>
+ <remarks>used internally</remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.#ctor(System.Int32)">
+ <summary>
+ Represents a CDROM drive on the system
+ </summary>
+ <param name="index">Index number of drive</param>
+ <remarks>Initializes drive</remarks>
+ <exception cref="T:SdlDotNet.Core.SdlException">
+ An exception will be thrown if the drive number
+ is below zero or above the number of drive on the system.
+ </exception>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.DriveName">
+ <summary>
+ Returns a platform-specific name for a CD-ROM drive
+ </summary>
+ <remarks></remarks>
+ <returns>A platform-specific name, i.e. "D:\"</returns>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Dispose(System.Boolean)">
+ <summary>
+ Disposes object.
+ </summary>
+ <remarks>Destroys unmanaged resources</remarks>
+ <param name="disposing">
+ If true, it disposes the handle to the drive
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.CloseHandle">
+ <summary>
+ Closes CDDrive handle
+ </summary>
+ <remarks>Closes handle to unmanaged SDL resource</remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.IsAudioTrack(System.Int32)">
+ <summary>
+ Checks to see if the track has audio data.
+ </summary>
+ <remarks></remarks>
+ <param name="trackNumber">
+ Returns true if the track is an audio track
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.IsDataTrack(System.Int32)">
+ <summary>
+ Checks to see if the track is a data track.
+ </summary>
+ <remarks></remarks>
+ <param name="trackNumber">
+ Returns true if the track is a data track
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.TrackLength(System.Int32)">
+ <summary>
+ Returns the length of an audio track in seconds.
+ </summary>
+ <remarks></remarks>
+ <param name="trackNumber">Track to query</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.TrackStart(System.Int32)">
+ <summary>
+ Returns the number of seconds before the audio track starts on the cd.
+ </summary>
+ <remarks></remarks>
+ <param name="trackNumber">Track to query</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.TrackEnd(System.Int32)">
+ <summary>
+ Returns the end time of the track in seconds.
+ </summary>
+ <remarks></remarks>
+ <param name="trackNumber">Track to query</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Play(System.Int32,System.Int32)">
+ <summary>
+ Plays the tracks on a CD in the drive
+ </summary>
+ <remarks></remarks>
+ <param name="startTrack">
+ The starting track to play (numbered 0-99)
+ </param>
+ <param name="numberOfTracks">
+ The number of tracks to play
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Play(System.Int32,System.Int32,System.Int32,System.Int32)">
+ <summary>
+ Plays the tracks on a CD in the drive
+ </summary>
+ <param name="startTrack">
+ The starting track to play
+ (numbered 0-99)
+ </param>
+ <param name="startFrame">
+ The frame (75th of a second increment) offset from the
+ starting track to play from
+ </param>
+ <param name="numberOfTracks">
+ The number of tracks to play
+ </param>
+ <param name="numberOfFrames">
+ The frame (75th of a second increment) offset after the last
+ track to stop playing after
+ </param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Play(System.Int32)">
+ <summary>
+ Play CD from a given track
+ </summary>
+ <remarks></remarks>
+ <param name="startTrack">Track to start from</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Play">
+ <summary>
+ Play CD from the first track.
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Pause">
+ <summary>
+ Pauses the CD in this drive
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Resume">
+ <summary>
+ Resumes a previously paused CD in this drive
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Stop">
+ <summary>
+ Stops playing the CD in this drive
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDDrive.Eject">
+ <summary>
+ Ejects this drive
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.Index">
+ <summary>
+ The drive number
+ </summary>
+ <remarks>Returns the drive number.</remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.Status">
+ <summary>
+ Gets the current drive status
+ </summary>
+ <remarks>
+ used to determine if the drive is busy, stopped, empty.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.IsPlaying">
+ <summary>
+ Checks to see if the CD is currently playing.
+ </summary>
+ <remarks>
+ Returns true if the drive is in use.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.IsEmpty">
+ <summary>
+ Checks to see if the CD drive is currently empty.
+ </summary>
+ <remarks>
+ Returns true if the drive is empty.
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.IsPaused">
+ <summary>
+ Checks to see if the CD drive is currently paused.
+ </summary>
+ <remarks>Returns true if the drive has been paused.</remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.NumberOfTracks">
+ <summary>
+ Gets the number of tracks in the currently inserted CD
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.CurrentTrack">
+ <summary>
+ Gets the currently playing track number
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.CurrentTrackFrame">
+ <summary>
+ Gets the currently playing frame of the current track.
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDDrive.CurrentTrackSeconds">
+ <summary>
+ Gets the number of seconds into the current track.
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="T:SdlDotNet.Audio.CDRom">
+ <summary>
+ Contains methods querying the CD drives on the system.
+ </summary>
+ <remarks>
+ This class is initialized when the CDDrive object is first called.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDRom.Close">
+ <summary>
+ Closes and destroys this object
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDRom.Initialize">
+ <summary>
+ Starts the CDRom subsystem.
+ </summary>
+ <remarks>
+ This normally automatically started when
+ the CDRom or the CDDrive classes are initialized.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDRom.IsValidDriveNumber(System.Int32)">
+ <summary>
+ Checks if the drive number is valid
+ </summary>
+ <param name="index">drive number</param>
+ <returns>
+ true is the number is greater than 0 and less
+ than the number of drives on the system.
+ </returns>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDRom.OpenDrive(System.Int32)">
+ <summary>
+ Opens a CD-ROM drive for manipulation
+ </summary>
+ <param name="index">
+ The number of the drive to open, from 0 - CDAudio.NumDrives
+ </param>
+ <returns>
+ The CDDrive object representing the CD-ROM drive
+ </returns>
+ <remarks>
+ Opens a CD-ROM drive for manipulation
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.CDRom.DriveName(System.Int32)">
+ <summary>
+ Returns a platform-specific name for a CD-ROM drive
+ </summary>
+ <param name="index">The number of the drive</param>
+ <returns>A platform-specific name, i.e. "D:\"</returns>
+ <remarks>
+ </remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDRom.IsInitialized">
+ <summary>
+ Returns true if the CDRom system has been initialized
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.CDRom.NumberOfDrives">
+ <summary>
+ Gets the number of CD-ROM drives available on the system
+ </summary>
+ <remarks>
+ </remarks>
+ </member>
+ <member name="T:SdlDotNet.Audio.Channel">
+ <summary>
+ Represents a channel that can play a sound sample.
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.#ctor(System.Int32)">
+ <summary>
+ Creates a channel with the given index
+ </summary>
+ <param name="index">Index number of channel</param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Play(SdlDotNet.Audio.Sound)">
+ <summary>
+ Plays a sound once on a specific channel
+ </summary>
+ <param name="sound">The sound to play</param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Play(SdlDotNet.Audio.Sound,System.Int32)">
+ <summary>
+ Plays a sound the specified number of times on a specific channel
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="loops">
+ The number of loops. Specify 1 to have the sound play twice
+ </param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Play(SdlDotNet.Audio.Sound,System.Int32,System.Int32)">
+ <summary>
+ Plays a sound the specified number of times on a
+ specific channel, stopping after the specified number of ms
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="loops">
+ The number of loops. Specify 1 to have the sound play twice
+ </param>
+ <param name="milliseconds">The time limit in milliseconds</param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Play(SdlDotNet.Audio.Sound,System.Boolean)">
+ <summary>
+ Plays a sound the specified number of times on a specific channel
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="continuous">If true, sound will be looped.</param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.PlayTimed(SdlDotNet.Audio.Sound,System.Int32)">
+ <summary>
+ Plays a sound the specified number of times on a
+ specific channel, stopping after the specified number of ms
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="milliseconds">The time limit in milliseconds</param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.FadeIn(SdlDotNet.Core.BaseSdlResource,System.Int32,System.Int32)">
+ <summary>
+ Fades in a sound the specified number of times on a
+ specific channel
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="milliseconds">
+ The number of milliseconds to fade in for
+ </param>
+ <param name="loops">
+ The number of loops.
+ Specify 1 to have the sound play twice
+ </param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.FadeIn(SdlDotNet.Core.BaseSdlResource,System.Int32,System.Int32,System.Int32)">
+ <summary>
+ Fades in a sound the specified number of times on
+ a specific channel, stopping after the specified number of ms
+ </summary>
+ <param name="sound">The sound to play</param>
+ <param name="milliseconds">The number of milliseconds to fade in for
+ </param>
+ <param name="loops">The number of loops.
+ Specify 1 to have the sound play twice</param>
+ <param name="ticks">The time limit in milliseconds</param>
+ <returns>The channel used to play the sound</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Pause">
+ <summary>
+ Pauses playing on a specific channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Resume">
+ <summary>
+ Resumes playing on a paused channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Stop">
+ <summary>
+ Stop playing on a specific channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Expire(System.Int32)">
+ <summary>
+ Stop playing a channel after a specified time interval
+ </summary>
+ <param name="ms">
+ The number of milliseconds to stop playing after
+ </param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Fadeout(System.Int32)">
+ <summary>
+ Fades out a channel.
+ </summary>
+ <param name="ms">
+ The number of milliseconds to fade out for
+ </param>
+ <returns>The number of channels fading out</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.IsPlaying">
+ <summary>
+ Returns a flag indicating whether or not a channel is playing
+ </summary>
+ <returns>True if the channel is playing, otherwise False</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.IsPaused">
+ <summary>
+ Returns a flag indicating whether or not a channel is paused
+ </summary>
+ <returns>True if the channel is paused, otherwise False</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.FadingStatus">
+ <summary>
+ Returns the current fading status of a channel
+ </summary>
+ <returns>The current fading status of the channel</returns>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.SetPanning(System.Int32,System.Int32)">
+ <summary>
+ Sets the panning (stereo attenuation) for a specific channel
+ </summary>
+ <param name="left">A left speaker value from 0-255 inclusive</param>
+ <param name="right">A right speaker value from 0-255 inclusive</param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Distance(System.Byte)">
+ <summary>
+ Sets the distance (attenuate sounds based on distance
+ from listener) for a specific channel
+ </summary>
+ <param name="distanceValue">
+ Distance value from 0-255 inclusive
+ </param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.SetPosition(System.Int32,System.Int32)">
+ <summary>
+ Sets the "position" of a sound (approximate '3D' audio)
+ for a specific channel
+ </summary>
+ <param name="angle">The angle of the sound, between 0 and 359,
+ 0 = directly in front</param>
+ <param name="distance">The distance of the sound from 0-255
+ inclusive</param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.ReverseStereo(System.Boolean)">
+ <summary>
+ Flips the left and right stereo for the channel
+ </summary>
+ <param name="flip">True to flip, False to reset to normal</param>
+ <remarks></remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.EnableChannelFinishedCallback">
+ <summary>
+ Enables the callback for this channel
+ </summary>
+ <remarks>
+ When the sound stops playing, the delegate will be called.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Dispose(System.Boolean)">
+ <summary>
+ Destroy sprite
+ </summary>
+ <param name="disposing">If true, remove all unamanged resources</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Dispose">
+ <summary>
+ Destroy object
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Close">
+ <summary>
+ Destroy object
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.Channel.Finalize">
+ <summary>
+ Destroy object
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Audio.Channel.Index">
+ <summary>
+ Returns index of channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.Channel.Volume">
+ <summary>
+ Sets the volume for a channel
+ </summary>
+ <returns>Channel volume</returns>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.Channel.Sound">
+ <summary>
+ Returns the Sound object that is attached to this channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.Channel.LastSound">
+ <summary>
+ Returns sound previously played on this channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="P:SdlDotNet.Audio.Channel.QueuedSound">
+ <summary>
+ Returns queued sound on this channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="T:SdlDotNet.Audio.ChannelFinishedEventArgs">
+ <summary>
+ Events args for when a channel finishes playing a sound.
+ </summary>
+ <remarks>
+ This will create event args to trigger an
+ event after a sound has finished playing.
+ </remarks>
+ </member>
+ <member name="T:SdlDotNet.Core.UserEventArgs">
+ <summary>
+ Event args for user-defined events.
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Core.SdlEventArgs">
+ <summary>
+ Base class for SdlEventArgs.
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Core.SdlEventArgs.eventStruct">
+ <summary>
+ Corrresponding SDL_Event
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlEventArgs.#ctor">
+ <summary>
+ Constructor
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlEventArgs.#ctor(Tao.Sdl.Sdl.SDL_Event)">
+ <summary>
+ Holds SDL_Event
+ </summary>
+ <param name="eventStruct">Event Struct</param>
+ </member>
+ <member name="M:SdlDotNet.Core.SdlEventArgs.CreateEventArgs(Tao.Sdl.Sdl.SDL_Event)">
+ <summary>
+
+ </summary>
+ <param name="ev"></param>
+ <returns></returns>
+ </member>
+ <member name="P:SdlDotNet.Core.SdlEventArgs.EventStruct">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Core.SdlEventArgs.Type">
+ <summary>
+ Returns Event type
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.UserEventArgs.#ctor">
+ <summary>
+ Default constructor
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Core.UserEventArgs.#ctor(System.Object)">
+ <summary>
+ Constructor for using a given user event
+ </summary>
+ <param name="userEvent">The user event object</param>
+ </member>
+ <member name="M:SdlDotNet.Core.UserEventArgs.#ctor(Tao.Sdl.Sdl.SDL_Event)">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Core.UserEventArgs.UserEvent">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Core.UserEventArgs.UserCode">
+ <summary>
+ User code that uniquely defines this user event.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.ChannelFinishedEventArgs.#ctor(System.Int32)">
+ <summary>
+ Constructor
+ </summary>
+ <remarks>Can be passed into the event queue.</remarks>
+ <param name="channel">The channel which has finished</param>
+ </member>
+ <member name="P:SdlDotNet.Audio.ChannelFinishedEventArgs.Channel">
+ <summary>
+ Return channel number
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="T:SdlDotNet.Audio.AudioFormat">
+ <summary>
+ Specifies an audio format to mix audio in
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.None">
+ <summary>
+ None. required by FXCop
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Unsigned8">
+ <summary>
+ Unsigned 8-bit
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Signed8">
+ <summary>
+ Signed 8-bit
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Unsigned16Little">
+ <summary>
+ Unsigned 16-bit, little-endian
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Signed16Little">
+ <summary>
+ Signed 16-bit, little-endian
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Unsigned16Big">
+ <summary>
+ Unsigned 16-bit, big-endian
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Signed16Big">
+ <summary>
+ Signed 16-bit, big-endian
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioFormat.Default">
+ <summary>
+ Default, equal to Signed16Little
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.FadingStatus">
+ <summary>
+ Indicates the current fading status of a sound
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.FadingStatus.NoFading">
+ <summary>
+ Sound is not fading
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.FadingStatus.FadingOut">
+ <summary>
+ Sound is fading out
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.FadingStatus.FadingIn">
+ <summary>
+ Sound is fading in
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.SoundChannel">
+ <summary>
+ Type of sound channel
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.SoundChannel.None">
+ <summary>
+ None
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.SoundChannel.Mono">
+ <summary>
+ Mono
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.SoundChannel.Stereo">
+ <summary>
+ Stereo
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.CDTrackType">
+ <summary>
+ CD Track Type
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDTrackType.Audio">
+ <summary>
+ Audio
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDTrackType.Data">
+ <summary>
+ Data
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.AudioStatus">
+ <summary>
+ Audio playing status
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioStatus.Stopped">
+ <summary>
+ Audio is not playing
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioStatus.Playing">
+ <summary>
+ Audio is paused
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.AudioStatus.Paused">
+ <summary>
+ Audio is currently playing
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.CDStatus">
+ <summary>
+ The possible states which a CD-ROM drive can be in.
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDStatus.TrayEmpty">
+ <summary>
+ The CD tray is empty.
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDStatus.Stopped">
+ <summary>
+ The CD has stopped playing.
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDStatus.Playing">
+ <summary>
+ The CD is playing.
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDStatus.Paused">
+ <summary>
+ The CD has been paused.
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.CDStatus.Error">
+ <summary>
+ An error occured while getting the status.
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.SoundAction">
+ <summary>
+ SoundAction
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.SoundAction.Stop">
+ <summary>
+ Stop sound
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.SoundAction.Fadeout">
+ <summary>
+ Fadeout sound
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.MusicType">
+ <summary>
+ MusicType
+ </summary>
+ <remarks></remarks>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.None">
+ <summary>
+ None
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.ExternalCommand">
+ <summary>
+ Starts external player
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.Wave">
+ <summary>
+ .WAV file
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.Mod">
+ <summary>
+ Mod music file
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.Midi">
+ <summary>
+ MIDI file
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.Ogg">
+ <summary>
+ Ogg file
+ </summary>
+ </member>
+ <member name="F:SdlDotNet.Audio.MusicType.Mp3">
+ <summary>
+ mp3 file
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.AudioCallback">
+ <summary>
+ Used in the SDL_AudioSpec struct
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Audio.Mixer">
+ <summary>
+ Provides methods to access the sound system.
+ You can obtain an instance of this class by accessing the
+ Mixer property of the main Sdl object.
+ </summary>
+ <remarks>
+ Before instantiating an instance of Movie,
+ you must call Mixer.Close() to turn off the default mixer.
+ If you do not do this, any movie will play very slowly.
+ Smpeg uses a custom mixer for audio playback.
+ </remarks>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.OpenAudio(SdlDotNet.Audio.AudioStream)">
+ <summary>
+ Open Audio device
+ </summary>
+ <param name="stream">stream to open</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Close">
+ <summary>
+ Closes and destroys this object
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Initialize">
+ <summary>
+ Start Mixer subsystem
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Open">
+ <summary>
+ Re-opens the sound system with default values.
+ You do not have to call this method
+ in order to start using the Mixer object.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Open(System.Int32,SdlDotNet.Audio.AudioFormat,SdlDotNet.Audio.SoundChannel,System.Int32)">
+ <summary>
+ Re-opens the sound-system. You do not have to call this method
+ in order to start using the Mixer object.
+ </summary>
+ <param name="frequency">The frequency to mix at</param>
+ <param name="format">The audio format to use</param>
+ <param name="soundChannels">
+ Number of sound channels in output.
+ Set to SoundChannel.Stereo for stereo, SoundChannel.Mono for mono.
+ This has nothing to do with mixing channels.
+ </param>
+ <param name="chunkSize">The chunk size for samples</param>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.CreateChannel(System.Int32)">
+ <summary>
+ Creates sound channel
+ </summary>
+ <param name="index">Index of new channel</param>
+ <returns>new Channel</returns>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Sound(System.String)">
+ <summary>
+ Loads a .wav, .ogg, .mp3, .mod or .mid file into memory
+ </summary>
+ <param name="file">sound file name</param>
+ <returns>Sound object</returns>
+ </member>
+ <member name="M:SdlDotNet.Audio.Mixer.Load(System.String,System.Int64@)">
+ <summary>
+ Loads a .wav, .ogg, .mp3, .mod or .mid file into memory
+ </summar...
[truncated message content] |
|
From: <je...@us...> - 2008-03-14 09:44:14
|
Revision: 225
http://freetrain.svn.sourceforge.net/freetrain/?rev=225&view=rev
Author: jendave
Date: 2008-03-14 02:44:19 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
removed deps - MsHtmlHost.dll and AxSHDocVw.dll. .NET 2.0 has a webBrowser control
Modified Paths:
--------------
branches/FreeTrainSDL/FreeTrainSDL.csproj
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/lib/AxSHDocVw.dll
branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs
branches/FreeTrainSDL/lib/Controls/WebBrowser.cs
branches/FreeTrainSDL/lib/MsHtmlHost.dll
branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
Modified: branches/FreeTrainSDL/FreeTrainSDL.csproj
===================================================================
--- branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/FreeTrainSDL.csproj 2008-03-14 09:44:19 UTC (rev 225)
@@ -44,6 +44,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="SdlDotNet, Version=6.1.0.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>lib\SdlDotNet.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/Program.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -26,6 +26,7 @@
using System.Runtime.InteropServices;
using Tao.Sdl;
+//using SdlDotNet.Graphics;
using SDL.net;
using freetrain.world;
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 09:44:19 UTC (rev 225)
@@ -71,14 +71,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxSHDocVw, Version=1.1.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\AxSHDocVw.dll</HintPath>
- </Reference>
- <Reference Include="MsHtmlHost, Version=0.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\MsHtmlHost.dll</HintPath>
- </Reference>
<Reference Include="SdlDotNet, Version=6.1.0.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\SdlDotNet.dll</HintPath>
@@ -930,6 +922,7 @@
</EmbeddedResource>
<EmbeddedResource Include="framework\AboutDialog.resx">
<DependentUpon>AboutDialog.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="framework\BGMPlaylist.resx">
<SubType>Designer</SubType>
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -31,7 +31,7 @@
namespace freetrain.framework
{
/// <summary>
- /// AboutDialog の概要の説明です。
+ /// AboutDialog
/// </summary>
public class AboutDialog : System.Windows.Forms.Form
{
@@ -50,9 +50,9 @@
{
InitializeComponent();
- browser.navigate("about:blank");
- browser.docHostUIHandler = new DocHostUIHandlerImpl(this);
- browser.navigate(ResourceUtil.findSystemResource("about.html"));
+ browser.Navigate("about:blank");
+ //browser.docHostUIHandler = new DocHostUIHandlerImpl(this);
+ browser.Navigate(ResourceUtil.findSystemResource("about.html"));
}
/// <summary>
///
@@ -92,7 +92,7 @@
private System.Windows.Forms.Label size;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label displayMode;
- private freetrain.controls.WebBrowser browser;
+ private System.Windows.Forms.WebBrowser browser;
private System.Windows.Forms.Panel panel1;
private System.ComponentModel.Container components = null;
/// <summary>
@@ -108,7 +108,7 @@
this.size = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.displayMode = new System.Windows.Forms.Label();
- this.browser = new freetrain.controls.WebBrowser();
+ this.browser = new System.Windows.Forms.WebBrowser();
this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.browser)).BeginInit();
this.panel1.SuspendLayout();
@@ -180,10 +180,10 @@
//
// browser
//
- this.browser.ContainingControl = this;
+ //this.browser.Container = this;
this.browser.Dock = System.Windows.Forms.DockStyle.Fill;
this.browser.Enabled = true;
- this.browser.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("browser.OcxState")));
+ //this.browser.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("browser.OcxState")));
this.browser.Size = new System.Drawing.Size(320, 192);
this.browser.TabIndex = 0;
//
Modified: branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
===================================================================
--- branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -23,8 +23,8 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using AxSHDocVw;
-using MsHtmlHost;
+//using AxSHDocVw;
+//using MsHtmlHost;
using freetrain.controls;
using freetrain.framework;
using freetrain.framework.plugin;
@@ -64,7 +64,7 @@
private System.ComponentModel.Container components = null;
- private freetrain.controls.WebBrowser webBrowser;
+ private System.Windows.Forms.WebBrowser webBrowser;
private BalanceSheetForm()
{
@@ -77,9 +77,9 @@
// object headers = String.Empty;
// webBrowser.Navigate("about:hello", ref flags, ref targetFrame, ref postData, ref headers);
- webBrowser.navigate("about:blank");
- webBrowser.docHostUIHandler = new DocHostUIHandlerImpl(this);
- webBrowser.navigate(ResourceUtil.findSystemResource("balanceSheet.html"));
+ webBrowser.Navigate("about:blank");
+ //webBrowser.docHostUIHandler = new DocHostUIHandlerImpl(this);
+ webBrowser.Navigate(ResourceUtil.findSystemResource("balanceSheet.html"));
}
/// <summary>
///
@@ -96,7 +96,7 @@
private void InitializeComponent()
{
System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(BalanceSheetForm));
- this.webBrowser = new freetrain.controls.WebBrowser();
+ this.webBrowser = new System.Windows.Forms.WebBrowser();
((System.ComponentModel.ISupportInitialize)(this.webBrowser)).BeginInit();
this.SuspendLayout();
//
@@ -104,7 +104,7 @@
//
this.webBrowser.Dock = System.Windows.Forms.DockStyle.Fill;
this.webBrowser.Enabled = true;
- this.webBrowser.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("webBrowser.OcxState")));
+ //this.webBrowser.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("webBrowser.OcxState")));
this.webBrowser.Size = new System.Drawing.Size(592, 206);
this.webBrowser.TabIndex = 0;
//
Deleted: branches/FreeTrainSDL/lib/AxSHDocVw.dll
===================================================================
(Binary files differ)
Deleted: branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/lib/Controls/DocHostUIHandlerImpl.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -1,107 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#endregion LICENSE
-
-using System;
-using System.Runtime.InteropServices;
-using MsHtmlHost;
-
-namespace freetrain.controls
-{
- /// <summary>
- /// IDocHostUIHandler implementation.
- /// </summary>
- public class DocHostUIHandlerImpl : IDocHostUIHandler
- {
- private readonly object externalObject;
-
- /// <param name="_externalObject">
- /// This object will be accessible from within HTML as "window.external"
- /// </param>
- public DocHostUIHandlerImpl(object _externalObject)
- {
- this.externalObject = _externalObject;
- }
-
- void IDocHostUIHandler.EnableModeless(int fEnable)
- {
- }
-
- void IDocHostUIHandler.FilterDataObject(IDataObject pDO, out IDataObject ppDORet)
- {
- ppDORet = null;
- }
-
- void IDocHostUIHandler.GetDropTarget(IDropTarget pDropTarget, out IDropTarget ppDropTarget)
- {
- ppDropTarget = null;
- }
-
- void IDocHostUIHandler.GetExternal(out object ppDispatch)
- {
- ppDispatch = externalObject;
- }
-
- void IDocHostUIHandler.GetHostInfo(ref _DOCHOSTUIINFO pInfo)
- {
- }
-
- void IDocHostUIHandler.GetOptionKeyPath(out string pchKey, uint dw)
- {
- pchKey = null;
- }
-
- void IDocHostUIHandler.HideUI()
- {
- }
-
- void IDocHostUIHandler.OnDocWindowActivate(int fActivate)
- {
- }
-
- void IDocHostUIHandler.OnFrameWindowActivate(int fActivate)
- {
- }
-
- void IDocHostUIHandler.ResizeBorder(ref tagRECT prcBorder, IOleInPlaceUIWindow pUIWindow, int fRameWindow)
- {
- }
-
- void IDocHostUIHandler.ShowContextMenu(uint dwID, ref tagPOINT ppt, object pcmdtReserved, object pdispReserved)
- {
- }
-
- void IDocHostUIHandler.ShowUI(uint dwID, IOleInPlaceActiveObject pActiveObject, IOleCommandTarget pCommandTarget, IOleInPlaceFrame pFrame, IOleInPlaceUIWindow pDoc)
- {
- }
-
- void IDocHostUIHandler.TranslateAccelerator(ref tagMSG lpmsg, ref Guid pguidCmdGroup, uint nCmdID)
- {
- throw new COMException("", 1); // return 1
- }
-
- void IDocHostUIHandler.TranslateUrl(uint dwTranslate, ref ushort pchURLIn, IntPtr ppchURLOut)
- {
- }
-
- void IDocHostUIHandler.UpdateUI()
- {
- }
- }
-}
Modified: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj 2008-03-14 09:44:19 UTC (rev 225)
@@ -75,14 +75,6 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AxSHDocVw, Version=1.1.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\AxSHDocVw.dll</HintPath>
- </Reference>
- <Reference Include="MsHtmlHost, Version=0.0.0.0, Culture=neutral">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\MsHtmlHost.dll</HintPath>
- </Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
@@ -107,7 +99,6 @@
<Compile Include="CostBox.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="DocHostUIHandlerImpl.cs" />
<Compile Include="FileDropHandler.cs" />
<Compile Include="IndexSelector.cs">
<SubType>UserControl</SubType>
@@ -123,9 +114,6 @@
<Compile Include="UrlLinkLabel.cs">
<SubType>Component</SubType>
</Compile>
- <Compile Include="WebBrowser.cs">
- <SubType>Component</SubType>
- </Compile>
<EmbeddedResource Include="ColorPickButton.resx">
<DependentUpon>ColorPickButton.cs</DependentUpon>
<SubType>Designer</SubType>
Deleted: branches/FreeTrainSDL/lib/Controls/WebBrowser.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/WebBrowser.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/lib/Controls/WebBrowser.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -1,66 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#endregion LICENSE
-
-using System;
-using MsHtmlHost;
-using AxSHDocVw;
-
-namespace freetrain.controls
-{
- /// <summary>
- /// WebBrowser control.
- /// </summary>
- [CLSCompliant(false)]
- public class WebBrowser : AxWebBrowser
- {
- /// <summary>
- ///
- /// </summary>
- public WebBrowser()
- {
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="url"></param>
- public void navigate(string url)
- {
- object flags = 0;
- object targetFrame = String.Empty;
- object postData = String.Empty;
- object headers = String.Empty;
- base.Navigate(url, ref flags, ref targetFrame, ref postData, ref headers);
- }
-
- /// <summary>
- ///
- /// </summary>
- [CLSCompliant(false)]
- public IDocHostUIHandler docHostUIHandler
- {
- set
- {
- ICustomDoc cDoc = (ICustomDoc)base.Document;
- cDoc.SetUIHandler(value);
- }
- }
- }
-}
Deleted: branches/FreeTrainSDL/lib/MsHtmlHost.dll
===================================================================
(Binary files differ)
Deleted: branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs
===================================================================
--- branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-14 09:07:15 UTC (rev 224)
+++ branches/FreeTrainSDL/lib/SDLGFX.net/Audio.cs 2008-03-14 09:44:19 UTC (rev 225)
@@ -1,81 +0,0 @@
-#region LICENSE
-/*
- * Copyright (C) 2007 - 2008 FreeTrain Team (http://freetrain.sourceforge.net)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#endregion LICENSE
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Tao.Sdl;
-
-namespace SDL.net
-{
- /// <summary>
- ///
- /// </summary>
- public class Segment
- {
- IntPtr sndHandle;
-
- /// <summary>
- ///
- /// </summary>
- public Segment()
- {
- sndHandle = IntPtr.Zero;
- }
-
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="p"></param>
- public Segment(string p)
- {
- sndHandle = SdlMixer.Mix_LoadWAV(p);
- }
-
- /// <summary>
- ///
- /// </summary>
- public void play()
- {
- if (sndHandle != IntPtr.Zero) SdlMixer.Mix_PlayChannel(-1, sndHandle, 0);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="ms"></param>
- public void play(int ms)
- {
- play();
- //if (sndHandle != IntPtr.Zero) then do something!
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="p"></param>
- /// <returns></returns>
- public static Segment fromFile(string p)
- {
- return new Segment(p);
- }
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 09:50:52
|
Revision: 226
http://freetrain.svn.sourceforge.net/freetrain/?rev=226&view=rev
Author: jendave
Date: 2008-03-14 02:50:55 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
remove windows-specific code. I'll add settings stuff to save the window state
Modified Paths:
--------------
branches/FreeTrainSDL/core/framework/Core.cs
branches/FreeTrainSDL/core/util/UrlInvoker.cs
branches/FreeTrainSDL/core/util/WindowState.cs
branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
Modified: branches/FreeTrainSDL/core/framework/Core.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/Core.cs 2008-03-14 09:44:19 UTC (rev 225)
+++ branches/FreeTrainSDL/core/framework/Core.cs 2008-03-14 09:50:55 UTC (rev 226)
@@ -24,7 +24,7 @@
using System.IO;
using System.Windows.Forms;
using System.Xml;
-using Microsoft.Win32;
+//using Microsoft.Win32;
using freetrain.framework.plugin;
using freetrain.framework.sound;
using freetrain.util;
@@ -39,17 +39,17 @@
private Core() { } // no instantiation
- /// <summary>
- /// Registry key where the per-user application setting
- /// should be stored.
- /// </summary>
- public static RegistryKey userRegistry
- {
- get
- {
- return Registry.CurrentUser.CreateSubKey(@"Software\FreeTrain");
- }
- }
+ ///// <summary>
+ ///// Registry key where the per-user application setting
+ ///// should be stored.
+ ///// </summary>
+ //public static RegistryKey userRegistry
+ //{
+ // get
+ // {
+ // return Registry.CurrentUser.CreateSubKey(@"Software\FreeTrain");
+ // }
+ //}
/// <summary>
/// Installation directory of the FreeTrain framework.
@@ -63,7 +63,7 @@
}
set
{
- userRegistry.SetValue("installationDirectory", value);
+ //userRegistry.SetValue("installationDirectory", value);
}
}
Modified: branches/FreeTrainSDL/core/util/UrlInvoker.cs
===================================================================
--- branches/FreeTrainSDL/core/util/UrlInvoker.cs 2008-03-14 09:44:19 UTC (rev 225)
+++ branches/FreeTrainSDL/core/util/UrlInvoker.cs 2008-03-14 09:50:55 UTC (rev 226)
@@ -21,7 +21,7 @@
using System;
using System.Diagnostics;
using System.IO;
-using Microsoft.Win32;
+//using Microsoft.Win32;
namespace freetrain.util
{
@@ -38,8 +38,8 @@
{
ProcessStartInfo info = new ProcessStartInfo();
// URLに関連づけられたアプリケーションを探す
- RegistryKey rkey = Registry.ClassesRoot.OpenSubKey(@"http\shell\open\command");
- String val = rkey.GetValue("").ToString();
+ //RegistryKey rkey = Registry.ClassesRoot.OpenSubKey(@"http\shell\open\command");
+ String val = "";// rkey.GetValue("").ToString();
// レジストリ値には、起動パラメータも含まれるので、
// 実行ファイル名と起動パラメータを分離する
if (val.StartsWith("\""))
Modified: branches/FreeTrainSDL/core/util/WindowState.cs
===================================================================
--- branches/FreeTrainSDL/core/util/WindowState.cs 2008-03-14 09:44:19 UTC (rev 225)
+++ branches/FreeTrainSDL/core/util/WindowState.cs 2008-03-14 09:50:55 UTC (rev 226)
@@ -20,7 +20,7 @@
using System;
using System.IO;
-using Microsoft.Win32;
+//using Microsoft.Win32;
using System.Drawing;
using System.Windows.Forms;
using System.Xml.Serialization;
@@ -190,44 +190,44 @@
/// <summary>
/// PersistentWindowState that saves the state to a registry.
/// </summary>
- public class RegistryPersistentWindowState : PersistentWindowState
- {
- private readonly RegistryKey key;
- /// <summary>
- ///
- /// </summary>
- /// <param name="_key"></param>
- public RegistryPersistentWindowState(RegistryKey _key)
- {
- this.key = _key;
- }
- /// <summary>
- ///
- /// </summary>
- internal protected override void load()
- {
- left = (int)key.GetValue("Left");
- top = (int)key.GetValue("Top");
- width = (int)key.GetValue("Width");
- height = (int)key.GetValue("Height");
- windowState = (FormWindowState)key.GetValue("WindowState");
- }
- /// <summary>
- ///
- /// </summary>
- internal protected override void save()
- {
- // save position, size and state
- key.SetValue("Left", left);
- key.SetValue("Top", top);
- key.SetValue("Width", width);
- key.SetValue("Height", height);
+ //public class RegistryPersistentWindowState : PersistentWindowState
+ //{
+ // private readonly RegistryKey key;
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // /// <param name="_key"></param>
+ // public RegistryPersistentWindowState(RegistryKey _key)
+ // {
+ // this.key = _key;
+ // }
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // internal protected override void load()
+ // {
+ // left = (int)key.GetValue("Left");
+ // top = (int)key.GetValue("Top");
+ // width = (int)key.GetValue("Width");
+ // height = (int)key.GetValue("Height");
+ // windowState = (FormWindowState)key.GetValue("WindowState");
+ // }
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // internal protected override void save()
+ // {
+ // // save position, size and state
+ // key.SetValue("Left", left);
+ // key.SetValue("Top", top);
+ // key.SetValue("Width", width);
+ // key.SetValue("Height", height);
- if (windowState == FormWindowState.Minimized)
- windowState = FormWindowState.Normal;
+ // if (windowState == FormWindowState.Minimized)
+ // windowState = FormWindowState.Normal;
- key.SetValue("WindowState", (int)windowState);
- }
- }
+ // key.SetValue("WindowState", (int)windowState);
+ // }
+ //}
}
Modified: branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-14 09:44:19 UTC (rev 225)
+++ branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs 2008-03-14 09:50:55 UTC (rev 226)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using System.Windows.Forms;
using System.IO;
-using Microsoft.Win32;
+//using Microsoft.Win32;
namespace freetrain.controls
{
@@ -64,8 +64,9 @@
// we have to specify executing module directory
ProcessStartInfo info = new ProcessStartInfo();
// get default browser (exe) path
- RegistryKey rkey = Registry.ClassesRoot.OpenSubKey(@"http\shell\open\command");
- String val = rkey.GetValue("").ToString();
+ //TODO
+ //RegistryKey rkey = Registry.ClassesRoot.OpenSubKey(@"http\shell\open\command");
+ String val = "";// rkey.GetValue("").ToString();
Debug.WriteLine(val);
if (val.StartsWith("\""))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 10:03:56
|
Revision: 227
http://freetrain.svn.sourceforge.net/freetrain/?rev=227&view=rev
Author: jendave
Date: 2008-03-14 03:03:58 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
remove more win32 specific stuff. App shjould not use registry. It should keep settings in a config/setting file
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/AboutDialog.resx
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/util/WindowState.cs
branches/FreeTrainSDL/lib/Controls/MruMenu.cs
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 10:03:58 UTC (rev 227)
@@ -966,6 +966,7 @@
</EmbeddedResource>
<EmbeddedResource Include="world\accounting\BalanceSheetForm.resx">
<DependentUpon>BalanceSheetForm.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="world\accounting\GenreSelectorDialog.resx">
<DependentUpon>GenreSelectorDialog.cs</DependentUpon>
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 10:03:58 UTC (rev 227)
@@ -101,7 +101,7 @@
/// </summary>
private void InitializeComponent()
{
- System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(AboutDialog));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDialog));
this.progressBar = new System.Windows.Forms.ProgressBar();
this.label3 = new System.Windows.Forms.Label();
this.okButton = new System.Windows.Forms.Button();
@@ -110,108 +110,102 @@
this.displayMode = new System.Windows.Forms.Label();
this.browser = new System.Windows.Forms.WebBrowser();
this.panel1 = new System.Windows.Forms.Panel();
- ((System.ComponentModel.ISupportInitialize)(this.browser)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// progressBar
//
- this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.progressBar.Location = new System.Drawing.Point(8, 167);
+ this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.progressBar.Location = new System.Drawing.Point(8, 162);
this.progressBar.Maximum = 10000;
this.progressBar.Name = "progressBar";
- this.progressBar.Size = new System.Drawing.Size(320, 16);
+ this.progressBar.Size = new System.Drawing.Size(320, 17);
this.progressBar.TabIndex = 3;
this.progressBar.Value = 30;
//
// label3
//
- this.label3.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
- this.label3.Location = new System.Drawing.Point(8, 151);
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label3.Location = new System.Drawing.Point(8, 145);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(96, 16);
+ this.label3.Size = new System.Drawing.Size(96, 17);
this.label3.TabIndex = 4;
this.label3.Text = "Available VRAM:";
- //! this.label3.Text = "VRAM空き容量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// okButton
//
- this.okButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+ this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.okButton.Location = new System.Drawing.Point(248, 191);
+ this.okButton.Location = new System.Drawing.Point(248, 188);
this.okButton.Name = "okButton";
- this.okButton.Size = new System.Drawing.Size(80, 24);
+ this.okButton.Size = new System.Drawing.Size(80, 26);
this.okButton.TabIndex = 5;
this.okButton.Text = "&OK";
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// size
//
- this.size.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
- this.size.Location = new System.Drawing.Point(104, 151);
+ this.size.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.size.Location = new System.Drawing.Point(104, 145);
this.size.Name = "size";
- this.size.Size = new System.Drawing.Size(152, 16);
+ this.size.Size = new System.Drawing.Size(152, 17);
this.size.TabIndex = 6;
this.size.Text = "100KB/64MB";
this.size.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label4
//
- this.label4.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
- this.label4.Location = new System.Drawing.Point(8, 135);
+ this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.label4.Location = new System.Drawing.Point(8, 127);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(96, 16);
+ this.label4.Size = new System.Drawing.Size(96, 18);
this.label4.TabIndex = 7;
this.label4.Text = "Display mode:";
- //! this.label4.Text = "画面モード：";
this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// displayMode
//
- this.displayMode.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
- this.displayMode.Location = new System.Drawing.Point(104, 135);
+ this.displayMode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.displayMode.Location = new System.Drawing.Point(104, 127);
this.displayMode.Name = "displayMode";
- this.displayMode.Size = new System.Drawing.Size(144, 16);
+ this.displayMode.Size = new System.Drawing.Size(144, 18);
this.displayMode.TabIndex = 8;
this.displayMode.Text = "---";
this.displayMode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// browser
//
- //this.browser.Container = this;
this.browser.Dock = System.Windows.Forms.DockStyle.Fill;
- this.browser.Enabled = true;
- //this.browser.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("browser.OcxState")));
- this.browser.Size = new System.Drawing.Size(320, 192);
+ this.browser.Location = new System.Drawing.Point(0, 0);
+ this.browser.Name = "browser";
+ this.browser.Size = new System.Drawing.Size(320, 111);
this.browser.TabIndex = 0;
//
// panel1
//
- this.panel1.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right);
- this.panel1.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.browser});
- this.panel1.Location = new System.Drawing.Point(8, 8);
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel1.Controls.Add(this.browser);
+ this.panel1.Location = new System.Drawing.Point(8, 9);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(320, 120);
+ this.panel1.Size = new System.Drawing.Size(320, 111);
this.panel1.TabIndex = 9;
//
// AboutDialog
//
this.AcceptButton = this.okButton;
- this.AutoScaleBaseSize = new System.Drawing.Size(5, 12);
+ this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
this.ClientSize = new System.Drawing.Size(338, 223);
- this.Controls.AddRange(new System.Windows.Forms.Control[] {
- this.panel1,
- this.displayMode,
- this.label4,
- this.size,
- this.okButton,
- this.label3,
- this.progressBar});
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.displayMode);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.size);
+ this.Controls.Add(this.okButton);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.progressBar);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
@@ -219,8 +213,6 @@
this.Name = "AboutDialog";
this.ShowInTaskbar = false;
this.Text = "About FreeTrain";
- //! this.Text = "FreeTrainについて";
- ((System.ComponentModel.ISupportInitialize)(this.browser)).EndInit();
this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.resx
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.resx 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.resx 2008-03-14 10:03:58 UTC (rev 227)
@@ -1,177 +1,186 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 1.3
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1">this is my long string</data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- [base64 mime encoded serialized .NET Framework object]
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>1.3</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="browser.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuMzMw
- MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFT
- eXN0ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAsQAA
- AAIBAAAAAQAAAAAAAAAAAAAAAJwAAABMAAAAAh8AAIEPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABM
- AAAAAAAAAAAAAAABAAAA4NBXAHM1zxGuaQgAKy4SYggAAAAAAAAATAAAAAEUAgAAAAAAwAAAAAAAAEaA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAL
-</value>
- </data>
- <data name="$this.Name">
- <value>AboutDialog</value>
- </data>
- <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAABAAIAICAAAAAAAACoCAAAJgAAABAQAAAAAAAAaAUAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAE
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAALBwAAAgUBAA8PDQAPDQUADwkEAAkJCQABAAYAAwMDAA8NBgAKCg
- oAAwQHAA8HAwALCwsAAQACAAIBCQAEBAQACAgIAA0ODgANDQwAAQAHAAUEBwAODg4ADAwNAAMABAAPDw
- 8ADg8PAAgHCgAKCg4AAAAOAAEACwAFBgUADw4NAA4ODwAEBAcAAgABAAgHBwAPDg4ADAwMAAQECQAJCQ
- wADw4HAAQACQABAAwADw0HAA0LDgAFAAgAAAAMAAUAAQAJCAcADg0NAAwMDwADAQ8AAwAMAAAAAQACBQ
- IADAcDAA8GAgAJCQ8AAwgEAAkPCAAECwYADwgDAAoLCwADBA8ADwsEAA8JAwACAgIAAQECAAMADwAICQ
- 8ACAMEAA8MBQAPBwQAAAAGAAYCDgAKCw8ABgYFAA8HAgAPDQ0AAQEPAA8KBAADAAUABQQPAAcHDwANDw
- 8ABQUPAAUFBQAPDAQAAAAJAAoNDwANCg8ABwcHAA0FAgAMCw8ACAQPAAcFDAAFCQUAAgIPAAcBDwADAA
- oABwcIAAkFCAAEBA0ACgMBAA4GAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAsQEBAfJB8VCzExMQsVMTExMTExXDExMTExMQAAAAAHBw8U
- Dg4AAAAjIzYLAjZENgtNGxsbLS0VAAAAAAAAAAAADgcYHgcOBw4OAAA2GDYfGwotIBkgIBEAAAAAAAAA
- AAAABw4dBx4rHg4ODjYAQzdNTVcfFWBlMQwAAAAAAAAAAA4GCwcjDysrByseFAceFBQUFFk0Hg5pDAwA
- AAAAAAAADgYXHCIOKi8eNB4eHh4rKysrK1s0ZGgMDAAAAAAAAAAOCgobGw4PLhQ0KysvLysrKys0Ol9j
- RwwAAAAAAAAAAA4KChoSKA4rMDUrKysrKysrNDRaW18HOWkAAAAAAAAOBgoTFhYnDgceNSo0KysrHTRW
- OlpeXh5pDAwAAAAAAA4KChMWICYbGw40Kx00NDRAQFUhICFeDzkMDGkAAAAOBgoKFhYWEQotGw40K0BA
- RkxMISAgISEhBAUFaQAAAA4KCgoWFhYRCicnJx40NDQ0NEAhICAhIWcFPgwAAAAOBgoKExYWFhEgJQMz
- Dgc0NDQ0UFRUGUZiZjk5DAAAAAAOCgoTFhYWERkZGRY6Jw40RSk0U0YhJzg+DAwAAAAAAAUODRIWGRER
- GRklFhMDPxQrS09PIBldPgwMAAAAAAAABQUODhURERMZGSUyChkgAxBKFFJHBAwMAAAAAAAAAAAABQUF
- DgoRExklJRMKICAgDgxOPgxRDAxJAAAAAAAAAAAAAAUOERElGSUgChYgCg4OST4+BVEFBQU+AAAAAAAA
- AAAMDgoRExkhICAKDg4OOD5CBQVRUVFBQVFRAAAAAAAABQQOERETISEgIA45PgVCQgUFBUFRQQQJCQkA
- AAAAAAQFDgoRESElICAgDjc3N0IFBQUFBQUFNzc3AwAAAAAABAQOERERISUgICAOOD03BUFBQVFRQQVh
- PTcAAAAAAAADCQwOChEgICAgIA43PDdBBARIQUFRBTc8NwAAAAAAAAMJCQkOChEKGRkOCTc8N0EESEFB
- WEFRNzw3AAAAAAAAAAMJCQ4RChcZDgksNzw3NzdHCQkEBEE3PDcAAAAAAAAAAAMJCQ4TDg4sCSw3PDw8
- PQIsLAkJBDc8NwAAAAAAAAAAAAAADg4DKQkECTc8Nzc3NwkpCQkJNzw3AAAAAAAAAAAAAAAOAAMJBAQJ
- Nzw3BAkJBAQJBAQ3PDcAAAAAAAAAAAAADgAAGQQEBCw3PDc3Nzc3BAQ3Nzc8Nzc3AAAAAAAAAAAOAAAA
- AwQJKTc7PDw8PTcEBDc9PDw8PTcAAAAAAAAAAA4AAAAAAAMEBDc3Nzc3NwQDNzc3Nzc3NwAAAAAAAAAO
- AAAAAAAAAAAAAykpKQAAAAAAAAAAAAAAAADAAAADwAAAH/AAAB/4AAAP8AAAB/AAAAfwAAAP8AAAB+AA
- AAPgAAABwAAAAcAAAAOAAAADwAAAB8AAAA/AAAA/4AAAH/gAAA/wAAAH4AAAB8AAAAfAAAAPwAAAD8AA
- AA/gAAAP8AAAD/4AAA/+gAAP/YAAA/3AAAP98AAD+/4f/ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAuXoAAP/isQD5oEwAw2ZSACoqKgDXTS0ACAU/APuiTAD/sXMAoaSnAKSl
- pgASEkUA/7xjAIeIiQCFhIMA4eHhANjY2ACUlZoAu8LJAM7OzwCjqa0Ax8fHANva2QDW1tcAwsLOABoL
- tQAUFEYA/69YAOfs8ADn6esA4ODhANfX1wCwr7QAAAC5AAYCswAdHTYA/7xbAOXu6wDY2NEAqaXEABkI
- dgAAAH4ADw8pAP+yWQD/sFcA+65SAJWQjwDHycYAqai0ABoGwwAhD9EAAADpAAMDWwD/rlUA/7FWAP+W
- QQAAAOsACAT3AAAA9AD/umIA/7tjAP+1WwD/rVQA/6FJAP/ibAAKCP8Am5f/AAAA5AAAAM8AMDBkAF9g
- XwD/uWAA/6tSAP+eRwD/jDoA/3EgAFln+wCKke8AHR3hAAAA0QBUVFUA/7tiAP+nUAD/lUEA/5E+AP9+
- LgD/q1MArqjmANbf/ADg7PQAppz/AOnp6QCIiIgA/7phAP+uZgD/kkIA/5pGAP+CNQD4WxwAutL5ANLv
- /gDlXjQAvD02AIyOjwDzWyIA92AkAPeGVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAABwcHGyQrKytHR11daAAAAAAMDBojKjUMRlFcXFFnAAAABRIMIho0IkVQ
- QxpnAAAAAAULGQwiMztET1tNKmsAAAYFCxghKTI6Q05aZVhXZwAFCxEXFSgpOUJNWWQqamcABQoQFhUn
- MSlBQVgqZmkAAAQFBRUgJjAmKSlXYwYAAAAACQUVHyYvJgVMVmJiAAAAAwUPFR4mBQUFS1VhV1cAAAMF
- DhQdJgU4QEpUYFMAAAACCAUTFQUuNz9JU18AAAAAAAINBQUlLTY+SFJePAAAAAAAAAUcHCwNPTxIDTwA
- AAAAAAUAAgINDQ08DTw8AAAAAAAAAAAAAgI8PAAAAAAAAAAHAACAAwAAgAcAAIADAAAAAQAAAAEAAAAD
- AAAABwAAgAcAAAADAAAABwAAAA8AAIAHAADgBwAA0AcAAPw/AAA=
-</value>
- </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAIAICAAAAAAAACoCAAAJgAAABAQAAAAAAAAaAUAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAE
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAALBwAAAgUBAA8PDQAPDQUADwkEAAkJCQABAAYAAwMDAA8NBgAKCg
+ oAAwQHAA8HAwALCwsAAQACAAIBCQAEBAQACAgIAA0ODgANDQwAAQAHAAUEBwAODg4ADAwNAAMABAAPDw
+ 8ADg8PAAgHCgAKCg4AAAAOAAEACwAFBgUADw4NAA4ODwAEBAcAAgABAAgHBwAPDg4ADAwMAAQECQAJCQ
+ wADw4HAAQACQABAAwADw0HAA0LDgAFAAgAAAAMAAUAAQAJCAcADg0NAAwMDwADAQ8AAwAMAAAAAQACBQ
+ IADAcDAA8GAgAJCQ8AAwgEAAkPCAAECwYADwgDAAoLCwADBA8ADwsEAA8JAwACAgIAAQECAAMADwAICQ
+ 8ACAMEAA8MBQAPBwQAAAAGAAYCDgAKCw8ABgYFAA8HAgAPDQ0AAQEPAA8KBAADAAUABQQPAAcHDwANDw
+ 8ABQUPAAUFBQAPDAQAAAAJAAoNDwANCg8ABwcHAA0FAgAMCw8ACAQPAAcFDAAFCQUAAgIPAAcBDwADAA
+ oABwcIAAkFCAAEBA0ACgMBAA4GAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAsQEBAfJB8VCzExMQsVMTExMTExXDExMTExMQAAAAAHBw8U
+ Dg4AAAAjIzYLAjZENgtNGxsbLS0VAAAAAAAAAAAADgcYHgcOBw4OAAA2GDYfGwotIBkgIBEAAAAAAAAA
+ AAAABw4dBx4rHg4ODjYAQzdNTVcfFWBlMQwAAAAAAAAAAA4GCwcjDysrByseFAceFBQUFFk0Hg5pDAwA
+ AAAAAAAADgYXHCIOKi8eNB4eHh4rKysrK1s0ZGgMDAAAAAAAAAAOCgobGw4PLhQ0KysvLysrKys0Ol9j
+ RwwAAAAAAAAAAA4KChoSKA4rMDUrKysrKysrNDRaW18HOWkAAAAAAAAOBgoTFhYnDgceNSo0KysrHTRW
+ OlpeXh5pDAwAAAAAAA4KChMWICYbGw40Kx00NDRAQFUhICFeDzkMDGkAAAAOBgoKFhYWEQotGw40K0BA
+ RkxMISAgISEhBAUFaQAAAA4KCgoWFhYRCicnJx40NDQ0NEAhICAhIWcFPgwAAAAOBgoKExYWFhEgJQMz
+ Dgc0NDQ0UFRUGUZiZjk5DAAAAAAOCgoTFhYWERkZGRY6Jw40RSk0U0YhJzg+DAwAAAAAAAUODRIWGRER
+ GRklFhMDPxQrS09PIBldPgwMAAAAAAAABQUODhURERMZGSUyChkgAxBKFFJHBAwMAAAAAAAAAAAABQUF
+ DgoRExklJRMKICAgDgxOPgxRDAxJAAAAAAAAAAAAAAUOERElGSUgChYgCg4OST4+BVEFBQU+AAAAAAAA
+ AAAMDgoRExkhICAKDg4OOD5CBQVRUVFBQVFRAAAAAAAABQQOERETISEgIA45PgVCQgUFBUFRQQQJCQkA
+ AAAAAAQFDgoRESElICAgDjc3N0IFBQUFBQUFNzc3AwAAAAAABAQOERERISUgICAOOD03BUFBQVFRQQVh
+ PTcAAAAAAAADCQwOChEgICAgIA43PDdBBARIQUFRBTc8NwAAAAAAAAMJCQkOChEKGRkOCTc8N0EESEFB
+ WEFRNzw3AAAAAAAAAAMJCQ4RChcZDgksNzw3NzdHCQkEBEE3PDcAAAAAAAAAAAMJCQ4TDg4sCSw3PDw8
+ PQIsLAkJBDc8NwAAAAAAAAAAAAAADg4DKQkECTc8Nzc3NwkpCQkJNzw3AAAAAAAAAAAAAAAOAAMJBAQJ
+ Nzw3BAkJBAQJBAQ3PDcAAAAAAAAAAAAADgAAGQQEBCw3PDc3Nzc3BAQ3Nzc8Nzc3AAAAAAAAAAAOAAAA
+ AwQJKTc7PDw8PTcEBDc9PDw8PTcAAAAAAAAAAA4AAAAAAAMEBDc3Nzc3NwQDNzc3Nzc3NwAAAAAAAAAO
+ AAAAAAAAAAAAAykpKQAAAAAAAAAAAAAAAADAAAADwAAAH/AAAB/4AAAP8AAAB/AAAAfwAAAP8AAAB+AA
+ AAPgAAABwAAAAcAAAAOAAAADwAAAB8AAAA/AAAA/4AAAH/gAAA/wAAAH4AAAB8AAAAfAAAAPwAAAD8AA
+ AA/gAAAP8AAAD/4AAA/+gAAP/YAAA/3AAAP98AAD+/4f/ygAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAuXoAAP/isQD5oEwAw2ZSACoqKgDXTS0ACAU/APuiTAD/sXMAoaSnAKSl
+ pgASEkUA/7xjAIeIiQCFhIMA4eHhANjY2ACUlZoAu8LJAM7OzwCjqa0Ax8fHANva2QDW1tcAwsLOABoL
+ tQAUFEYA/69YAOfs8ADn6esA4ODhANfX1wCwr7QAAAC5AAYCswAdHTYA/7xbAOXu6wDY2NEAqaXEABkI
+ dgAAAH4ADw8pAP+yWQD/sFcA+65SAJWQjwDHycYAqai0ABoGwwAhD9EAAADpAAMDWwD/rlUA/7FWAP+W
+ QQAAAOsACAT3AAAA9AD/umIA/7tjAP+1WwD/rVQA/6FJAP/ibAAKCP8Am5f/AAAA5AAAAM8AMDBkAF9g
+ XwD/uWAA/6tSAP+eRwD/jDoA/3EgAFln+wCKke8AHR3hAAAA0QBUVFUA/7tiAP+nUAD/lUEA/5E+AP9+
+ LgD/q1MArqjmANbf/ADg7PQAppz/AOnp6QCIiIgA/7phAP+uZgD/kkIA/5pGAP+CNQD4WxwAutL5ANLv
+ /gDlXjQAvD02AIyOjwDzWyIA92AkAPeGVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAABwcHGyQrKytHR11daAAAAAAMDBojKjUMRlFcXFFnAAAABRIMIho0IkVQ
+ QxpnAAAAAAULGQwiMztET1tNKmsAAAYFCxghKTI6Q05aZVhXZwAFCxEXFSgpOUJNWWQqamcABQoQFhUn
+ MSlBQVgqZmkAAAQFBRUgJjAmKSlXYwYAAAAACQUVHyYvJgVMVmJiAAAAAwUPFR4mBQUFS1VhV1cAAAMF
+ DhQdJgU4QEpUYFMAAAACCAUTFQUuNz9JU18AAAAAAAINBQUlLTY+SFJePAAAAAAAAAUcHCwNPTxIDTwA
+ AAAAAAUAAgINDQ08DTw8AAAAAAAAAAAAAgI8PAAAAAAAAAAHAACAAwAAgAcAAIADAAAAAQAAAAEAAAAD
+ AAAABwAAgAcAAAADAAAABwAAAA8AAIAHAADgBwAA0AcAAPw/AAA=
+</value>
+ </data>
</root>
\ No newline at end of file
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-14 10:03:58 UTC (rev 227)
@@ -28,7 +28,7 @@
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Data;
-using Microsoft.Win32;
+//using Microsoft.Win32;
//using freetrain.contributions.dock;
using freetrain.contributions.common;
using freetrain.contributions.rail;
Modified: branches/FreeTrainSDL/core/util/WindowState.cs
===================================================================
--- branches/FreeTrainSDL/core/util/WindowState.cs 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/core/util/WindowState.cs 2008-03-14 10:03:58 UTC (rev 227)
@@ -187,9 +187,9 @@
}
}
- /// <summary>
- /// PersistentWindowState that saves the state to a registry.
- /// </summary>
+ ///// <summary>
+ ///// PersistentWindowState that saves the state to a registry.
+ ///// </summary>
//public class RegistryPersistentWindowState : PersistentWindowState
//{
// private readonly RegistryKey key;
Modified: branches/FreeTrainSDL/lib/Controls/MruMenu.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-14 09:50:55 UTC (rev 226)
+++ branches/FreeTrainSDL/lib/Controls/MruMenu.cs 2008-03-14 10:03:58 UTC (rev 227)
@@ -26,7 +26,7 @@
using System.Text;
using System.Windows.Forms;
using System.Xml;
-using Microsoft.Win32;
+//using Microsoft.Win32;
namespace freetrain.controls
{
@@ -774,20 +774,20 @@
RemoveAll();
- RegistryKey regKey = Registry.CurrentUser.OpenSubKey(registryKeyName);
- if (regKey != null)
- {
- maxEntries = (int)regKey.GetValue("max", maxEntries);
+ //RegistryKey regKey = Registry.CurrentUser.OpenSubKey(registryKeyName);
+ //if (regKey != null)
+ //{
+ // maxEntries = (int)regKey.GetValue("max", maxEntries);
- for (int number = maxEntries; number > 0; number--)
- {
- String filename = (String)regKey.GetValue("File" + number.ToString());
- if (filename != null)
- AddFile(filename);
- }
+ // for (int number = maxEntries; number > 0; number--)
+ // {
+ // String filename = (String)regKey.GetValue("File" + number.ToString());
+ // if (filename != null)
+ // AddFile(filename);
+ // }
- regKey.Close();
- }
+ // regKey.Close();
+ //}
}
/// <summary>
@@ -797,25 +797,25 @@
{
Debug.Assert(registryKeyName != null);
- RegistryKey regKey = Registry.CurrentUser.CreateSubKey(registryKeyName);
- if (regKey != null)
- {
- regKey.SetValue("max", maxEntries);
+ //RegistryKey regKey = Registry.CurrentUser.CreateSubKey(registryKeyName);
+ //if (regKey != null)
+ //{
+ // regKey.SetValue("max", maxEntries);
- int number = 1;
- int i = StartIndex;
- for (; i < EndIndex; i++, number++)
- {
- regKey.SetValue("File" + number.ToString(), ((MruMenuItem)MenuItems[i]).fileName);
- }
+ // int number = 1;
+ // int i = StartIndex;
+ // for (; i < EndIndex; i++, number++)
+ // {
+ // regKey.SetValue("File" + number.ToString(), ((MruMenuItem)MenuItems[i]).fileName);
+ // }
- for (; number <= 16; number++)
- {
- regKey.DeleteValue("File" + number.ToString(), false);
- }
+ // for (; number <= 16; number++)
+ // {
+ // regKey.DeleteValue("File" + number.ToString(), false);
+ // }
- regKey.Close();
- }
+ // regKey.Close();
+ //}
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 17:28:08
|
Revision: 229
http://freetrain.svn.sourceforge.net/freetrain/?rev=229&view=rev
Author: jendave
Date: 2008-03-14 10:28:06 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
some small cleanups
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/plugins/system/plugin.xml
Added Paths:
-----------
branches/FreeTrainSDL/lib/Tao.Sdl.dll.config
Property Changed:
----------------
branches/FreeTrainSDL/plugins/system/
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-14 10:38:29 UTC (rev 228)
+++ branches/FreeTrainSDL/Program.cs 2008-03-14 17:28:06 UTC (rev 229)
@@ -26,6 +26,7 @@
using System.Runtime.InteropServices;
using Tao.Sdl;
+using SdlDotNet.Audio;
//using SdlDotNet.Graphics;
using SDL.net;
@@ -117,8 +118,10 @@
dragStartScrollPos = new Point(0, 0);
scrollPos = new Point(0, 0);
- Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING | Sdl.SDL_INIT_AUDIO);
- SdlMixer.Mix_OpenAudio(SdlMixer.MIX_DEFAULT_FREQUENCY, unchecked(Sdl.AUDIO_S16LSB), 2, 1024);
+ //Sdl.SDL_Init(Sdl.SDL_INIT_EVERYTHING | Sdl.SDL_INIT_AUDIO);
+ SdlDotNet.Graphics.Video.Initialize();
+ Mixer.Initialize();
+ //SdlMixer.Mix_OpenAudio(SdlMixer.MIX_DEFAULT_FREQUENCY, unchecked(Sdl.AUDIO_S16LSB), 2, 1024);
SdlMixer.MusicFinishedDelegate musicStopped = new SdlMixer.MusicFinishedDelegate(musicHasStopped);
SdlMixer.Mix_HookMusicFinished(musicStopped);
Added: branches/FreeTrainSDL/lib/Tao.Sdl.dll.config
===================================================================
--- branches/FreeTrainSDL/lib/Tao.Sdl.dll.config (rev 0)
+++ branches/FreeTrainSDL/lib/Tao.Sdl.dll.config 2008-03-14 17:28:06 UTC (rev 229)
@@ -0,0 +1,37 @@
+<configuration>
+ <dllmap dll="SDL.dll">
+ <dllentry os="linux" dll="libSDL-1.2.so.0"/>
+ <dllentry os="windows" dll="SDL.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL.framework/SDL" />
+ </dllmap>
+ <dllmap dll="SDL_image.dll">
+ <dllentry os="linux" dll="libSDL_image-1.2.so.0" />
+ <dllentry os="windows" dll="SDL_image.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL_image.framework/SDL_image" />
+ </dllmap>
+ <dllmap dll="SDL_mixer.dll">
+ <dllentry os="linux" dll="libSDL_mixer-1.2.so.0" />
+ <dllentry os="windows" dll="SDL_mixer.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL_mixer.framework/SDL_mixer" />
+ </dllmap>
+ <dllmap dll="SDL_ttf.dll">
+ <dllentry os="linux" dll="libSDL_ttf-2.0.so.0" />
+ <dllentry os="windows" dll="SDL_ttf.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL_ttf.framework/SDL_ttf" />
+ </dllmap>
+ <dllmap dll="SDL_net.dll">
+ <dllentry os="linux" dll="libSDL_net-1.2.so.0" />
+ <dllentry os="windows" dll="SDL_net.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL_net.framework/SDL_net" />
+ </dllmap>
+ <dllmap dll="smpeg.dll">
+ <dllentry os="linux" dll="libsmpeg-0.4.so.0" />
+ <dllentry os="windows" dll="smpeg.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/smpeg.framework/smpeg" />
+ </dllmap>
+ <dllmap dll="SDL_gfx.dll">
+ <dllentry os="linux" dll="libSDL_gfx.so.4" />
+ <dllentry os="windows" dll="SDL_gfx.dll"/>
+ <dllentry os="osx" dll="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
+ </dllmap>
+</configuration>
Property changes on: branches/FreeTrainSDL/plugins/system
___________________________________________________________________
Name: svn:ignore
+ .plugin.xml.swp
Modified: branches/FreeTrainSDL/plugins/system/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/system/plugin.xml 2008-03-14 10:38:29 UTC (rev 228)
+++ branches/FreeTrainSDL/plugins/system/plugin.xml 2008-03-14 17:28:06 UTC (rev 229)
@@ -1,122 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<plug-in>
<title>System</title>
- <!--!<title>システム</title>-->
<author>Kohsuke Kawaguchi</author>
- <!--!<author>川口耕介</author>-->
<homepage>http://www.kohsuke.org/freetrain/</homepage>
-<!--
- システムの機能もほとんどがコントリビューションとして定義されています。
- このファイルでは、システム組み込みのコントリビューションを定義します。
--->
-
-
-
-
-
-
-
-
-<!-- システム組み込みの標準コントリビューション型 -->
-
<contribution type="contribution" id="{312E3101-E7A6-4276-8AC9-617FA6D7ADEA}">
- <!-- ＢＧＭ -->
<name>bgm</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.sound.BGMContribution" />
</contribution>
<contribution type="contribution" id="{5E0E178B-835A-4987-8ECC-B9E7A70EB39A}">
- <!-- ＢＧＭのファクトリ -->
<name>bgmFactory</name>
<class name="freetrain.contributions.sound.BGMFactoryContributionFactory"/>
</contribution>
<contribution type="contribution" id="{32A5AFB2-B676-4A4E-A06E-917AF760FFB6}">
- <!-- 駅 -->
<name>station</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.rail.StationContribution" />
</contribution>
<contribution type="contribution" id="{636703FB-D70F-4AF8-9254-FBDA1DAB4344}">
- <!-- 地表 -->
<name>land</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.land.LandBuilderContribution" />
</contribution>
<contribution type="contribution" id="{6D1F34DC-F3E0-4CA8-B705-028C2F4D2F39}">
- <!-- メニュー項目 -->
<name>menu</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.others.MenuContribution" />
</contribution>
<contribution type="contribution" id="{12975FE4-93CB-41D5-9947-59FF28A8C961}">
- <!-- 列車（一編成） -->
<name>train</name>
<class name="freetrain.contributions.train.TrainContributionFactory"/>
</contribution>
<contribution type="contribution" id="{A18E14FD-1EC5-4C78-A721-42C91A864084}">
- <!-- 列車（一両） -->
<name>trainCar</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.train.TrainCarContribution" />
</contribution>
<contribution type="contribution" id="{A53A5080-8F66-4CA3-A88F-8B4D5D7EC0AC}">
- <!-- 列車制御アルゴリズム -->
<name>trainController</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.rail.TrainControllerContribution" />
</contribution>
<contribution type="contribution" id="{9D6AC382-8A79-4CCF-BE16-15AAA5EBD5F3}">
- <!-- 鉄橋・トンネルなどの特殊な線路 -->
<name>specialRail</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.rail.SpecialRailContribution" />
</contribution>
<contribution type="contribution" id="{DE8F9D81-67D0-4F8E-810D-E53D2251E64B}">
- <!-- 空港などの特殊な「プロジェクト」建物 -->
<name>specialStructure</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.structs.SpecialStructureContribution" />
</contribution>
<contribution type="contribution" id="{C9E8E541-FD55-47DB-B2D9-222E941DDB63}">
- <!-- 建物 -->
<name>commercial</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.structs.CommercialStructureContribution" />
</contribution>
<contribution type="contribution" id="{94B9070E-DEEA-4C70-AEF2-7E795312FEC3}">
- <!-- 道路 -->
<name>road</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.contributions.road.RoadContribution" />
</contribution>
<contribution type="contribution" id="{BFA3A8EA-05B0-4910-907F-4F617528B7CD}">
- <!-- 鉄道用小物アクセサリ -->
<name>railStationary</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.rail.RailStationaryContribution" />
</contribution>
<contribution type="contribution" id="{8D79D146-21F9-4E9E-ACAB-5B43A003F032}">
- <!-- 高さ可変の建物 -->
<name>varHeightBuilding</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.structs.VarHeightBuildingContribution" />
</contribution>
-<!--J[Cu-->
<contribution type="contribution" id="{C6F610B7-5046-4F74-C477-049B238F262D}">
<name>ColorLibrary</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
@@ -129,7 +98,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-RAINBOW}">
<name>Rainbow</name>
- <!--!<name>カラフル</name>-->
<element color="230,0,18"/>
<element color="235,97,0"/>
<element color="245,232,0"/>
@@ -142,7 +110,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-STONES}">
<name>Stone</name>
- <!--!<name>石壁</name>-->
<element color="149,63,55"/>
<element color="129,103,103"/>
<element color="210,167,117"/>
@@ -155,7 +122,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-WOODS}">
<name>Wood</name>
- <!--!<name>木材</name>-->
<element color="207,136,34"/>
<element color="241,190,109"/>
<element color="197,162,144"/>
@@ -168,7 +134,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-METALS}">
<name>Metal</name>
- <!--!<name>金属</name>-->
<element color="142,33,33"/>
<element color="183,131,131"/>
<element color="142,93,33"/>
@@ -185,7 +150,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-BRICKS}">
<name>Brick</name>
- <!--!<name>レンガ</name>-->
<element color="221,99,93"/>
<element color="154,31,11"/>
<element color="191,112,116"/>
@@ -198,7 +162,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-DIRTS}">
<name>Earth / Concrete</name>
- <!--!<name>土・コンクリ</name>-->
<element color="153,108,51"/>
<element color="176,136,80"/>
<element color="175,151,128"/>
@@ -211,7 +174,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-PASTEL}">
<name>Pastel</name>
- <!--!<name>パステル</name>-->
<element color="230,175,198"/>
<element color="225,170,139"/>
<element color="225,222,147"/>
@@ -224,7 +186,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-COLPLATE}">
<name>Painted Iron Roof</name>
- <!--!<name>カラー鉄板屋根</name>-->
<element color="164,0,91"/>
<element color="248,110,158"/>
<element color="188,12,24"/>
@@ -241,7 +202,6 @@
<contribution type="ColorLibrary" id="{COLORLIB-ROOF}">
<name>Tile / Slate</name>
- <!--!<name>瓦・スレート</name>-->
<element color="160,160,160"/>
<element color="84,84,84"/>
<element color="108,51,65"/>
@@ -267,31 +227,23 @@
<contribution type="accountGenre" id="{AC30BB0B-044C-4784-A83D-FCB1F60B3CF2}">
<name>Rail</name>
- <!--!<name>鉄道</name>-->
</contribution>
<contribution type="accountGenre" id="{CC00A6D1-D078-4D3C-AFB2-EDC6CB9F4CB3}">
<name>Bus</name>
- <!--!<name>バス</name>-->
</contribution>
<contribution type="accountGenre" id="{2A666F1A-9F40-4F67-98F4-DEAC1E55296D}">
<name>Subsidiary</name>
- <!--!<name>子会社</name>-->
</contribution>
<contribution type="accountGenre" id="{C0A9ABA5-801F-4AA6-93EA-6FF563C2B407}">
<name>Other</name>
- <!--!<name>その他</name>-->
</contribution>
<!-- TODO: more coming -->
-
-
-<!-- 列車の発車ベル -->
-
<contribution type="contribution" id="{821FC629-4180-48a4-8B47-ECE2817D2106}">
<name>trainDepartureBell</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
@@ -300,99 +252,44 @@
<contribution type="trainDepartureBell" id="{9B087AEA-6E9C-48cd-A1F3-1B774500752E}">
<name>Departure bell</name>
- <!--!<name>プルルル</name>-->
<sound href="station.wav" />
</contribution>
<contribution type="trainDepartureBell" id="{87B1BA1B-C18F-4E39-AD50-245255F34388}">
<name>Silence</name>
- <!--!<name>無音</name>-->
<sound href="otonasi.wav" />
</contribution>
-
-
-
-
-
-<!-- ドッキングウィンドウ -->
-
-
-
-
-<!-- スプライトファクトリ -->
-
- <!--
- ピクチャを描画する方法をカスタマイズできます
- -->
<contribution type="contribution" id="{DC051871-BA74-45ED-B122-247BC7EA0BFA}">
<name>spriteFactory</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.framework.graphics.SpriteFactoryContribution" />
</contribution>
-
- <!-- ディフォルトのスプライトファクトリ。パラメータなし -->
<contribution type="spriteFactory" id="spriteFactory:default">
<class name="freetrain.framework.graphics.SimpleSpriteFactoryContributionImpl"/>
</contribution>
- <!-- 色マップをするスプライトファクトリ。
- <map from="100,50,200" to="30,80,90" />
- ...
-
- のパラメータをとる
- -->
<contribution type="spriteFactory" id="spriteFactory:colorMapped">
<class name="freetrain.framework.graphics.ColorMappedSpriteFactoryContributionImpl"/>
</contribution>
- <!-- 色相による色マップをするスプライトファクトリ
- <map from="100,*,100" to="50,30,20" />
- のパラメータをとる
- -->
<contribution type="spriteFactory" id="spriteFactory:hueTransform">
<class name="freetrain.framework.graphics.HueTransformSpriteFactoryContributionImpl"/>
</contribution>
- <!-- 色相による色マップをするスプライトファクトリ
- <map from="R" to="80,130,220" />
- <map from="G" to="160,130,40" />
- <map from="B" to="250,220,20" />
- の一または複数のパラメータをとる
- <contribution type="spriteFactory" id="spriteFactory:RGBTransform">
- <class name="freetrain.framework.graphics.RGBTransformSpriteFactoryContributionImpl"/>
- </contribution>
- -->
-
-
-<!-- スプライトローダ。画像からどうスプライトを切り出すかを隠蔽する -->
<contribution type="contribution" id="{5733A3EA-7A2D-4602-B702-D63D55A0FAB9}">
<name>spriteLoader</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
<implementation name="freetrain.framework.graphics.SpriteLoaderContribution" />
</contribution>
- <!--
- ディフォルトの実装
-
- 0D: <sprite origin="..." offset="..." size="..." picture="..." />
- 2D: <sprite origin="..." offset="..." picture="..." />
-
- it supports nested <picture> element.
- -->
<contribution type="spriteLoader" id="spriteLoader:default">
<class name="freetrain.framework.graphics.DefaultSpriteLoaderContributionImpl"/>
</contribution>
-
-
-
-
-<!-- 匿名コントリビューション -->
-
<contribution type="contribution" id="{8AD27BD7-FF9E-401b-B309-53BB0DFAD2C4}">
<name>anonymous</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
@@ -400,40 +297,24 @@
<implementation name="freetrain.framework.plugin.Contribution" />
</contribution>
-
-
-
-
-
-<!-- 画像のコントリビューション。IDを使って画像にアクセスできるようになります -->
<contribution type="contribution" id="{A51C49BF-7C30-40B3-B371-ECDE6A7C9C0C}">
<name>picture</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
<implementation name="freetrain.contributions.common.PictureContribution" />
</contribution>
-
- <!-- システム組み込み画像 -->
<contribution type="picture" id="{3FF9F902-6B2A-44A4-9C5F-DE8D82CFD37D}">
- <!-- 駅の画像 -->
<picture src="ThinPlatform.bmp">
<override when="night" src="ThinPlatform.n.bmp" />
</picture>
</contribution>
<contribution type="picture" id="{3197A63A-89DC-4237-8C9B-045F41F31CDB}">
- <!-- 跨線橋 -->
<picture src="renraku02.bmp">
<override when="night" src="renraku02.n.bmp" />
</picture>
- </contribution>
-
-
-
-
-
-
-<!-- 色替え列車用の画像コントリビューション -->
+ </contribution>
+
<contribution type="contribution" id="{669FE39E-0F2B-42C1-B618-49832461448A}">
<name>colorMapTrainPicture</name>
<class name="freetrain.framework.plugin.FixedClassContributionFactory"/>
@@ -442,69 +323,47 @@
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-1">
<name>General-purpose three-color thin stripe</name>
- <!--!<name>汎用三色細帯</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain01.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-2">
<name>General-purpose four-color thick stripe</name>
- <!--!<name>汎用四色太帯</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain02.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-3">
<name>Genral-purpose four-color thin stripe</name>
- <!--!<name>汎用四色細帯</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain03.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-4">
<name>103 series style</name>
- <!--!<name>103系風</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain04.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-5">
<name>205 series style</name>
- <!--!<name>205系風</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain05.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-6">
<name>211 series style</name>
- <!--!<name>211系風</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain06.bmp" />
</contribution>
<contribution type="colorMapTrainPicture" id="{243D9F53-67FB-432E-B985-3B9B696D8CE0}-7">
<name>E231 series style</name>
- <!--!<name>E231系風</name>-->
<author>477</author>
- <!--!<author>477さん</author>-->
<picture src="UncoloredTrain07.bmp" />
</contribution>
-
-
-<!--
- 新規ゲーム
-
- 新規ゲームコントリビューションで定義されたものが「新しいゲーム」
- ダイアログに表示されます
--->
<contribution type="contribution" id="{9AB5DFE3-B13A-485c-956D-996E27FDCD9F}">
<name>newGame</name>
<class name="freetrain.framework.plugin.DynamicContributionFactory"/>
@@ -519,14 +378,11 @@
-<!-- そのほかのシステム定義画像 -->
<contribution type="picture" id="{F4380415-A2F2-41d8-8FCD-ED25A470A84D}">
- <!-- 踏み切り -->
<picture src="crossing.bmp" />
</contribution>
<contribution type="picture" id="{0E7A9F09-4482-4b78-8A8D-F59F02574B1B}">
- <!-- 私有地 -->
<picture src="LandProperty.bmp" />
</contribution>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 22:10:57
|
Revision: 231
http://freetrain.svn.sourceforge.net/freetrain/?rev=231&view=rev
Author: jendave
Date: 2008-03-14 15:11:02 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
Fixed CLS compliant issues
Modified Paths:
--------------
branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/util/Set.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/Time.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
Modified: branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -75,7 +75,7 @@
/// <summary>
///
/// </summary>
- public enum DirectionMode
+ public enum DirectionModes
{
/// <summary>
///
@@ -90,6 +90,6 @@
/// <summary>
/// Available directions
/// </summary>
- public virtual DirectionMode directionMode { get { return DirectionMode.FourWay; } }
+ public virtual DirectionModes DirectionMode { get { return DirectionModes.FourWay; } }
}
}
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -122,11 +122,11 @@
/// <summary>
///
/// </summary>
- public override sealed DirectionMode directionMode
+ public override sealed DirectionModes DirectionMode
{
get
{
- return DirectionMode.FourWay;
+ return DirectionModes.FourWay;
}
}
}
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -198,10 +198,10 @@
{
loc.z = anchor.z;
- if (type.directionMode == SpecialRailContribution.DirectionMode.FourWay)
+ if (type.DirectionMode == SpecialRailContribution.DirectionModes.FourWay)
return loc.align4To(anchor);
- if (type.directionMode == SpecialRailContribution.DirectionMode.EightWay)
+ if (type.DirectionMode == SpecialRailContribution.DirectionModes.EightWay)
return loc.align8To(anchor);
Debug.Assert(false);
Modified: branches/FreeTrainSDL/core/framework/AboutDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/framework/AboutDialog.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -35,17 +35,17 @@
/// </summary>
public class AboutDialog : System.Windows.Forms.Form
{
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public static void show()
+ //{
+ // AboutDialog dlg = new AboutDialog();
+ // dlg.ShowDialog(MainWindow.mainWindow);
+ //}
/// <summary>
///
/// </summary>
- public static void show()
- {
- AboutDialog dlg = new AboutDialog();
- dlg.ShowDialog(MainWindow.mainWindow);
- }
- /// <summary>
- ///
- /// </summary>
public AboutDialog()
{
InitializeComponent();
Modified: branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -39,7 +39,7 @@
/// <param name="owner">can be null.</param>
/// <param name="caption"></param>
/// <param name="e"></param>
- public static void show(IWin32Window owner, string caption, Exception e)
+ public static void ShowDialog(IWin32Window owner, string caption, Exception e)
{
using (Form f = new ErrorMessageBox(caption, e))
{
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -279,7 +279,7 @@
Environment.Exit(-1);
{// convert it to an array by sorting them in the order of dependency
- this.plugins = new Plugin[pluginSet.count];
+ this.plugins = new Plugin[pluginSet.Count];
int ptr = 0;
Plugin p = null;
while (!pluginSet.isEmpty)
Modified: branches/FreeTrainSDL/core/util/Set.cs
===================================================================
--- branches/FreeTrainSDL/core/util/Set.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/util/Set.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -63,10 +63,6 @@
/// <summary>
///
/// </summary>
- public int count { get { return core.Count; } }
- /// <summary>
- ///
- /// </summary>
public int Count { get { return core.Count; } }
/// <summary>
///
@@ -80,7 +76,7 @@
///
///
/// </summary>
- public bool isEmpty { get { return count == 0; } }
+ public bool isEmpty { get { return Count == 0; } }
/// <summary>
///
/// </summary>
@@ -106,7 +102,7 @@
/// <returns></returns>
public Array toArray(Type type)
{
- Array r = Array.CreateInstance(type, count);
+ Array r = Array.CreateInstance(type, Count);
int idx = 0;
foreach (object o in this)
Modified: branches/FreeTrainSDL/core/world/Clock.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Clock.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/Clock.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -220,8 +220,8 @@
currentTime++;
- long m = (currentTime % DAY);
- if (m == 6 * HOUR || m == 18 * HOUR)
+ long m = (currentTime % DAY_INITIAL);
+ if (m == 6 * HOUR_INITIAL || m == 18 * HOUR_INITIAL)
{
PictureManager.reset();
World.world.onAllVoxelUpdated(); // time change
Modified: branches/FreeTrainSDL/core/world/RRCrossing.cs
===================================================================
--- branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/RRCrossing.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -31,7 +31,7 @@
/// Rail-road crossing
/// </summary>
[Serializable]
- class RRCrossing : TrafficVoxel.Accessory, IDeserializationCallback
+ class RRCrossing : TrafficVoxel.IAccessory, IDeserializationCallback
{
/// <summary> This crossing belongs to this voxel. </summary>
private readonly TrafficVoxel owner;
Modified: branches/FreeTrainSDL/core/world/Time.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Time.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/Time.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -44,25 +44,25 @@
/// <summary>
///
/// </summary>
- public const long MINUTE = 1;
+ public const long MINUTE_INITIAL = 1;
/// <summary>
///
/// </summary>
- public const long HOUR = MINUTE * 60;
+ public const long HOUR_INITIAL = MINUTE_INITIAL * 60;
/// <summary>
///
/// </summary>
- public const long DAY = HOUR * 24;
+ public const long DAY_INITIAL = HOUR_INITIAL * 24;
/// <summary>
///
/// </summary>
- public const long YEAR = DAY * 365;
+ public const long YEAR_INITIAL = DAY_INITIAL * 365;
// the initial time when a game starts
/// <summary>
///
///
/// </summary>
- public const long START_TIME = (31 + 28 + 31) * DAY + 8 * HOUR;
+ public const long START_TIME = (31 + 28 + 31) * DAY_INITIAL + 8 * HOUR_INITIAL;
@@ -95,7 +95,7 @@
/// <summary>
/// the current year. from 1.
/// </summary>
- public int year { get { return (int)(currentTime / YEAR) + 1; } }
+ public int year { get { return (int)(currentTime / YEAR_INITIAL) + 1; } }
/// <summary>
/// the current month. from 1.
/// </summary>
@@ -103,7 +103,7 @@
{
get
{
- long days = currentTime / DAY;
+ long days = currentTime / DAY_INITIAL;
days %= 365; // 1 year = 365 days. No leap year.
for (int i = 0; i < 12; i++)
@@ -123,7 +123,7 @@
{
get
{
- long days = currentTime / DAY;
+ long days = currentTime / DAY_INITIAL;
days %= 365; // 1 year = 365 days. No leap year.
for (int i = 0; i < 12; i++)
@@ -143,18 +143,18 @@
{
get
{
- long days = currentTime / DAY;
+ long days = currentTime / DAY_INITIAL;
return (int)days % 7;
}
}
/// <summary>
///
/// </summary>
- public int hour { get { return (int)((currentTime / HOUR) % 24); } }
+ public int hour { get { return (int)((currentTime / HOUR_INITIAL) % 24); } }
/// <summary>
///
/// </summary>
- public int minutes { get { return (int)((currentTime / MINUTE) % 60); } }
+ public int minutes { get { return (int)((currentTime / MINUTE_INITIAL) % 60); } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/world/Traffic.cs
===================================================================
--- branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/Traffic.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -46,7 +46,7 @@
private Road _road;
- private Accessory _accessory;
+ private IAccessory _accessory;
/// <summary>
///
/// </summary>
@@ -69,7 +69,7 @@
/// <summary>
///
/// </summary>
- public interface Accessory
+ public interface IAccessory
{
/// <summary>
///
@@ -146,7 +146,7 @@
/// <summary>
///
/// </summary>
- public Accessory accessory
+ public IAccessory accessory
{
get
{
Modified: branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -203,7 +203,7 @@
/// <summary>
///
/// </summary>
- public override DirectionMode directionMode { get { return DirectionMode.EightWay; } }
+ public override DirectionModes DirectionMode { get { return DirectionModes.EightWay; } }
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -124,7 +124,7 @@
public TrainCar head { get { return cars[0]; } }
/// <summary> Return true if this train is placed on the map </summary>
- public bool isPlaced { get { return state != State.Unplaced; } }
+ public bool isPlaced { get { return State != TrainStates.Unplaced; } }
/// <summary> Place a train to the specified location.</summary>
/// <returns> false if it can't be done. </returns>
@@ -171,7 +171,7 @@
stopCallCount = 0;
registerTimer();
- state = State.Moving;
+ State = TrainStates.Moving;
return true;
}
@@ -188,7 +188,7 @@
// make sure that we don't have any pending event
World.world.clock.unregister(new ClockHandler(clockHandler));
- state = State.Unplaced;
+ State = TrainStates.Unplaced;
}
/// <summary> Sell this train. </summary>
@@ -206,7 +206,7 @@
/// <summary> Possible states of a train. </summary>
- public enum State : byte
+ public enum TrainStates : byte
{
/// <summary>
///
@@ -231,11 +231,11 @@
}
/// <summary> State of this train. Usually updated by the clock handler. </summary>
- private State __state = State.Unplaced;
+ private TrainStates __state = TrainStates.Unplaced;
/// <summary>
///
/// </summary>
- public State state
+ public TrainStates State
{
get
{
@@ -265,13 +265,13 @@
{
get
{
- switch (state)
+ switch (State)
{
- case State.Unplaced: return "Unplaced";
- case State.Moving: return "Moving";
- case State.StoppingAtStation: return "Stopping at station";
- case State.StoppingAtSignal: return "Stopping at signal";
- case State.EmergencyStopping: return "Emergency stop";
+ case TrainStates.Unplaced: return "Unplaced";
+ case TrainStates.Moving: return "Moving";
+ case TrainStates.StoppingAtStation: return "Stopping at station";
+ case TrainStates.StoppingAtSignal: return "Stopping at signal";
+ case TrainStates.EmergencyStopping: return "Emergency stop";
//! case State.Unplaced: return "未配置";
//! case State.Moving: return "進行中";
//! case State.StoppingAtStation: return "発車時間待";
@@ -324,7 +324,7 @@
registerTimer(time); // resume after the specified time
// TODO: see where this train is being stopped. do something if necessary
- state = State.StoppingAtStation;
+ State = TrainStates.StoppingAtStation;
return;
}
@@ -335,7 +335,7 @@
// this car can now move
stopCallCount = 0;
- State s = State.Moving;
+ TrainStates s = TrainStates.Moving;
// determine the next head car state
CarState next = calcNextTrainCarState[head.state];
@@ -345,7 +345,7 @@
move(next);
else
// otherwise we can't move. emergency stop.
- s = State.EmergencyStopping;
+ s = TrainStates.EmergencyStopping;
}
else
{
@@ -356,9 +356,9 @@
if (next != null && !isBlocked[next])
move(next);
else
- s = State.EmergencyStopping;
+ s = TrainStates.EmergencyStopping;
}
- state = s; // update the state
+ State = s; // update the state
registerTimer();
}
Modified: branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
===================================================================
--- branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -123,7 +123,7 @@
/// <summary>
///
/// </summary>
- protected ColorPicker picker;
+ private ColorPicker picker;
/// <summary>
///
/// </summary>
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -28,7 +28,7 @@
/// Accessory implementation.
/// </summary>
[Serializable]
- public class DummyCar : TrafficVoxel.Accessory
+ public class DummyCar : TrafficVoxel.IAccessory
{
private readonly byte index;
private readonly DummyCarContribution contrib;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs 2008-03-14 17:39:38 UTC (rev 230)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs 2008-03-14 22:11:02 UTC (rev 231)
@@ -28,7 +28,7 @@
/// Accessory implementation.
/// </summary>
[Serializable]
- public class RoadAccessory : TrafficVoxel.Accessory
+ public class RoadAccessory : TrafficVoxel.IAccessory
{
private readonly byte index;
private readonly RoadAccessoryContribution contrib;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-14 22:32:54
|
Revision: 232
http://freetrain.svn.sourceforge.net/freetrain/?rev=232&view=rev
Author: jendave
Date: 2008-03-14 15:32:58 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
project file cleanups
Modified Paths:
--------------
branches/FreeTrainSDL/core/FreeTrain.Core.csproj
Removed Paths:
-------------
branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj.user
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj.user
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj.user
Property Changed:
----------------
branches/FreeTrainSDL/core/
Property changes on: branches/FreeTrainSDL/core
___________________________________________________________________
Name: svn:ignore
- obj
Debug
+ obj
Debug
bin
Modified: branches/FreeTrainSDL/core/FreeTrain.Core.csproj
===================================================================
--- branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 22:11:02 UTC (rev 231)
+++ branches/FreeTrainSDL/core/FreeTrain.Core.csproj 2008-03-14 22:32:58 UTC (rev 232)
@@ -24,7 +24,7 @@
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>Debug\</OutputPath>
+ <OutputPath>bin\Debug\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -32,7 +32,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>Debug\FreeTrain.Core.xml</DocumentationFile>
+ <DocumentationFile>bin\Debug\FreeTrain.Core.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -47,7 +47,7 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>Release\</OutputPath>
+ <OutputPath>bin\Release\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
@@ -998,4 +998,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
Deleted: branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj.user
===================================================================
--- branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj.user 2008-03-14 22:11:02 UTC (rev 231)
+++ branches/FreeTrainSDL/lib/Controls/FreeTrain.Controls.csproj.user 2008-03-14 22:32:58 UTC (rev 232)
@@ -1,57 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <LastOpenVersion>7.10.3077</LastOpenVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReferencePath>C:\kohsuke\Visual Studio Projects\FreeTrain\extlib\;C:\Project\FreeTrain\Patch\FreeTrain\extlib\</ReferencePath>
- <CopyProjectDestinationFolder>
- </CopyProjectDestinationFolder>
- <CopyProjectUncPath>
- </CopyProjectUncPath>
- <CopyProjectOption>0</CopyProjectOption>
- <ProjectView>ProjectFiles</ProjectView>
- <ProjectTrust>0</ProjectTrust>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj.user
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj.user 2008-03-14 22:11:02 UTC (rev 231)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/FreeTrain.DummyCars.csproj.user 2008-03-14 22:32:58 UTC (rev 232)
@@ -1,58 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <LastOpenVersion>7.10.3077</LastOpenVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReferencePath>
- </ReferencePath>
- <CopyProjectDestinationFolder>
- </CopyProjectDestinationFolder>
- <CopyProjectUncPath>
- </CopyProjectUncPath>
- <CopyProjectOption>0</CopyProjectOption>
- <ProjectView>ProjectFiles</ProjectView>
- <ProjectTrust>0</ProjectTrust>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>false</StartWithIE>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
-</Project>
\ No newline at end of file
Deleted: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj.user
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj.user 2008-03-14 22:11:02 UTC (rev 231)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/FreeTrain.RoadAccessory.csproj.user 2008-03-14 22:32:58 UTC (rev 232)
@@ -1,58 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <LastOpenVersion>7.10.3077</LastOpenVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ReferencePath>
- </ReferencePath>
- <CopyProjectDestinationFolder>
- </CopyProjectDestinationFolder>
- <CopyProjectUncPath>
- </CopyProjectUncPath>
- <CopyProjectOption>0</CopyProjectOption>
- <ProjectView>ProjectFiles</ProjectView>
- <ProjectTrust>0</ProjectTrust>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>false</StartWithIE>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <EnableASPDebugging>false</EnableASPDebugging>
- <EnableASPXDebugging>false</EnableASPXDebugging>
- <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
- <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
- <RemoteDebugEnabled>false</RemoteDebugEnabled>
- <RemoteDebugMachine>
- </RemoteDebugMachine>
- <StartAction>Project</StartAction>
- <StartArguments>
- </StartArguments>
- <StartPage>
- </StartPage>
- <StartProgram>
- </StartProgram>
- <StartURL>
- </StartURL>
- <StartWorkingDirectory>
- </StartWorkingDirectory>
- <StartWithIE>true</StartWithIE>
- </PropertyGroup>
-</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-03-18 07:23:34
|
Revision: 233
http://freetrain.svn.sourceforge.net/freetrain/?rev=233&view=rev
Author: jendave
Date: 2008-03-18 00:23:40 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
starting to fix namespaces
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs
branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
branches/FreeTrainSDL/core/contributions/common/StructureGroup.cs
branches/FreeTrainSDL/core/contributions/common/SubDividedStructureContribution.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs
branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs
branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs
branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
branches/FreeTrainSDL/core/contributions/population/Population.cs
branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs
branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs
branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerForm.cs
branches/FreeTrainSDL/core/controllers/AbstractControllerImpl.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/ControllerHostForm.cs
branches/FreeTrainSDL/core/controllers/CubeSelectorController.cs
branches/FreeTrainSDL/core/controllers/Disambiguators.cs
branches/FreeTrainSDL/core/controllers/IControllerSite.cs
branches/FreeTrainSDL/core/controllers/LocationDisambiguator.cs
branches/FreeTrainSDL/core/controllers/LocationStore.cs
branches/FreeTrainSDL/core/controllers/ModalController.cs
branches/FreeTrainSDL/core/controllers/PointSelectorController.cs
branches/FreeTrainSDL/core/controllers/RectSelectorController.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/land/LandPropertyController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs
branches/FreeTrainSDL/core/controllers/rail/RailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SlopeRailRoadController.cs
branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPassagewayController.cs
branches/FreeTrainSDL/core/controllers/rail/StationPropertyDialog.cs
branches/FreeTrainSDL/core/controllers/rail/StationaryStructPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTrackingWindow.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/CommercialStructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/FixedSizeStructController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/controllers/structs/VarHeightBuildingController.cs
branches/FreeTrainSDL/core/controllers/terrain/MountainController.cs
branches/FreeTrainSDL/core/framework/AboutDialog.cs
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/BGMPlaylist.Designer.cs
branches/FreeTrainSDL/core/framework/BGMPlaylist.cs
branches/FreeTrainSDL/core/framework/ConfigDialog.cs
branches/FreeTrainSDL/core/framework/Core.cs
branches/FreeTrainSDL/core/framework/ErrorMessageBox.cs
branches/FreeTrainSDL/core/framework/ExternToolsHelper.cs
branches/FreeTrainSDL/core/framework/GlobalOptions.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/MenuItemConstants.cs
branches/FreeTrainSDL/core/framework/NewWorldDialog.cs
branches/FreeTrainSDL/core/framework/PersistentOptions.cs
branches/FreeTrainSDL/core/framework/ResourceUtil.cs
branches/FreeTrainSDL/core/framework/Splash.cs
branches/FreeTrainSDL/core/framework/graphics/AlphaBlendSpriteSet.cs
branches/FreeTrainSDL/core/framework/graphics/ColorLibrary.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMap.cs
branches/FreeTrainSDL/core/framework/graphics/ColorMappedSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DefaultSpriteLoaderContributionImpl.cs
branches/FreeTrainSDL/core/framework/graphics/DirectSprite.cs
branches/FreeTrainSDL/core/framework/graphics/DirtyRect.cs
branches/FreeTrainSDL/core/framework/graphics/GraphicsException.cs
branches/FreeTrainSDL/core/framework/graphics/HueTransformSprite.cs
branches/FreeTrainSDL/core/framework/graphics/NullSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Picture.cs
branches/FreeTrainSDL/core/framework/graphics/PictureManager.cs
branches/FreeTrainSDL/core/framework/graphics/PreviewDrawer.cs
branches/FreeTrainSDL/core/framework/graphics/SimpleSprite.cs
branches/FreeTrainSDL/core/framework/graphics/Sprite.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactory.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteFactoryContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SpriteLoaderContribution.cs
branches/FreeTrainSDL/core/framework/graphics/SurfaceLoaders.cs
branches/FreeTrainSDL/core/framework/plugin/Contribution.cs
branches/FreeTrainSDL/core/framework/plugin/ContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/DynamicContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/FixedClassContributionFactory.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/plugin/PluginListDialog.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/framework/plugin/PluginSerializationBinder.cs
branches/FreeTrainSDL/core/framework/plugin/PluginUtil.cs
branches/FreeTrainSDL/core/framework/plugin/XmlUtil.cs
branches/FreeTrainSDL/core/framework/sound/RepeatableSoundEffectImpl.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffectManager.cs
branches/FreeTrainSDL/core/util/ArrayEnumerator.cs
branches/FreeTrainSDL/core/util/CurrencyUtil.cs
branches/FreeTrainSDL/core/util/FontInfo.cs
branches/FreeTrainSDL/core/util/Keyboard.cs
branches/FreeTrainSDL/core/util/LongTask.cs
branches/FreeTrainSDL/core/util/PriorityQueue.cs
branches/FreeTrainSDL/core/util/Set.cs
branches/FreeTrainSDL/core/util/UrlInvoker.cs
branches/FreeTrainSDL/core/util/WindowState.cs
branches/FreeTrainSDL/core/util/command/Command.cs
branches/FreeTrainSDL/core/util/command/CommandExecutor.cs
branches/FreeTrainSDL/core/util/command/CommandManager.cs
branches/FreeTrainSDL/core/util/controls/DDTreeView.cs
branches/FreeTrainSDL/core/util/controls/ToolBarCustomizerUI.cs
branches/FreeTrainSDL/core/views/AbstractView.cs
branches/FreeTrainSDL/core/views/GlobalViewOptions.cs
branches/FreeTrainSDL/core/views/MapOverlay.cs
branches/FreeTrainSDL/core/views/NullWeatherOverlay.cs
branches/FreeTrainSDL/core/views/QuarterViewDrawer.cs
branches/FreeTrainSDL/core/views/WeatherOverlay.cs
branches/FreeTrainSDL/core/views/WeatherOverlayImpl.cs
branches/FreeTrainSDL/core/views/WeatherOverlaySpriteSet.cs
branches/FreeTrainSDL/core/views/map/HeightCutWindow.cs
branches/FreeTrainSDL/core/views/map/MapView.cs
branches/FreeTrainSDL/core/views/map/PreviewForm.cs
branches/FreeTrainSDL/core/world/Car.cs
branches/FreeTrainSDL/core/world/CarState.cs
branches/FreeTrainSDL/core/world/Clock.cs
branches/FreeTrainSDL/core/world/Cube.cs
branches/FreeTrainSDL/core/world/Direction.cs
branches/FreeTrainSDL/core/world/DrawContext.cs
branches/FreeTrainSDL/core/world/EmptyVoxel.cs
branches/FreeTrainSDL/core/world/Entity.cs
branches/FreeTrainSDL/core/world/Location.cs
branches/FreeTrainSDL/core/world/Matrix.cs
branches/FreeTrainSDL/core/world/RRCrossing.cs
branches/FreeTrainSDL/core/world/SIZE.cs
branches/FreeTrainSDL/core/world/SparseVoxelArray.cs
branches/FreeTrainSDL/core/world/Time.cs
branches/FreeTrainSDL/core/world/TimeLength.cs
branches/FreeTrainSDL/core/world/Traffic.cs
branches/FreeTrainSDL/core/world/Voxel.cs
branches/FreeTrainSDL/core/world/VoxelOutlookListener.cs
branches/FreeTrainSDL/core/world/World.cs
branches/FreeTrainSDL/core/world/accounting/AccountGenre.cs
branches/FreeTrainSDL/core/world/accounting/AccountManager.cs
branches/FreeTrainSDL/core/world/accounting/AccountSummaryWindow.cs
branches/FreeTrainSDL/core/world/accounting/BalanceSheetForm.cs
branches/FreeTrainSDL/core/world/accounting/Debt.cs
branches/FreeTrainSDL/core/world/accounting/GenreSelectorDialog.cs
branches/FreeTrainSDL/core/world/accounting/TransactionHistory.cs
branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs
branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
branches/FreeTrainSDL/core/world/development/LandPlan.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs
branches/FreeTrainSDL/core/world/development/Plan.cs
branches/FreeTrainSDL/core/world/development/ULV.cs
branches/FreeTrainSDL/core/world/development/ULVFactory.cs
branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs
branches/FreeTrainSDL/core/world/land/LandPropertyVoxel.cs
branches/FreeTrainSDL/core/world/land/LandVoxel.cs
branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgePierVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/FatPlatform.cs
branches/FreeTrainSDL/core/world/rail/GlobalTrafficMonitor.cs
branches/FreeTrainSDL/core/world/rail/JunctionRailRoad.cs
branches/FreeTrainSDL/core/world/rail/PassagewayRail.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/PlatformHost.cs
branches/FreeTrainSDL/core/world/rail/RailPattern.cs
branches/FreeTrainSDL/core/world/rail/RailRoad.cs
branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs
branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/SingleRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SlopeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/SpecialPurposeRailRoad.cs
branches/FreeTrainSDL/core/world/rail/Station.cs
branches/FreeTrainSDL/core/world/rail/StationListener.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/ThinPlatform.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TrainController.cs
branches/FreeTrainSDL/core/world/rail/TrainGroup.cs
branches/FreeTrainSDL/core/world/rail/TrainHarbor.cs
branches/FreeTrainSDL/core/world/rail/TrainItem.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/rail/YardRailRoad.cs
branches/FreeTrainSDL/core/world/road/Bus.cs
branches/FreeTrainSDL/core/world/road/Road.cs
branches/FreeTrainSDL/core/world/road/RoadPattern.cs
branches/FreeTrainSDL/core/world/road/RoadStyle.cs
branches/FreeTrainSDL/core/world/structs/Commercial.cs
branches/FreeTrainSDL/core/world/structs/ConstructionSite.cs
branches/FreeTrainSDL/core/world/structs/PThreeDimStructure.cs
branches/FreeTrainSDL/core/world/structs/PopulatedStructure.cs
branches/FreeTrainSDL/core/world/structs/StationListenerImpl.cs
branches/FreeTrainSDL/core/world/structs/Structure.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs
branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs
branches/FreeTrainSDL/core/world/terrain/MountainVoxel.cs
branches/FreeTrainSDL/lib/Controls/ColorPickButton.cs
branches/FreeTrainSDL/lib/Controls/ColorPicker.cs
branches/FreeTrainSDL/lib/Controls/CostBox.cs
branches/FreeTrainSDL/lib/Controls/FileDropHandler.cs
branches/FreeTrainSDL/lib/Controls/IndexSelector.cs
branches/FreeTrainSDL/lib/Controls/MruMenu.cs
branches/FreeTrainSDL/lib/Controls/SubListSelector.cs
branches/FreeTrainSDL/lib/Controls/TrackBarEx.cs
branches/FreeTrainSDL/lib/Controls/UrlLinkLabel.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCar.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/ControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/CategoryTreeWnd.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericLandContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/GenericStructureContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/StructCategory.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/ControllerForm.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVControllerImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HalfVoxelContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HueShiftSprite.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/MenuContributionImpl.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/plugin.xml
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.structure.hv.oldhouse/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/FreeTrain.VinylHouse.csproj
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseVoxel.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.structure.c477/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigCommand.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/plugin.xml
branches/FreeTrainSDL/plugins/system/plugin.xml
Property Changed:
----------------
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -30,21 +30,21 @@
//using SdlDotNet.Graphics;
using SDL.net;
-using freetrain.world;
-using freetrain.world.rail;
-using freetrain.world.terrain;
-using freetrain.controllers.land;
-using freetrain.framework.plugin;
-using freetrain.framework.sound;
-using freetrain.util;
-using freetrain.util.command;
-using freetrain.controllers;
-using freetrain.controllers.rail;
-using freetrain.controllers.terrain;
-using freetrain.controllers.structs;
-using freetrain.framework;
-using freetrain.views;
-using freetrain.framework.graphics;
+using FreeTrain.world;
+using FreeTrain.world.Rail;
+using FreeTrain.world.Terrain;
+using FreeTrain.Controllers.Land;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.sound;
+using FreeTrain.Util;
+using FreeTrain.Util.Command;
+using FreeTrain.Controllers;
+using FreeTrain.Controllers.Rail;
+using FreeTrain.Controllers.Terrain;
+using FreeTrain.Controllers.Structs;
+using FreeTrain.Framework;
+using FreeTrain.Views;
+using FreeTrain.Framework.graphics;
namespace FreeTrainSDL
{
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,16 +22,16 @@
using System.Collections;
using System.Drawing;
using System.Xml;
-using freetrain.util;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.controllers;
-using freetrain.world;
-using freetrain.world.structs;
-using freetrain.contributions.common;
+using FreeTrain.Util;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Controllers;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
+using FreeTrain.Contributions.Common;
using SDL.net;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// StructureContribution for structures of a fixed size.
Modified: branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/FixedSizeStructureController.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,14 +21,14 @@
using System;
using System.Drawing;
using System.Windows.Forms;
-using freetrain.controllers;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.views;
-using freetrain.world;
-using freetrain.world.structs;
+using FreeTrain.Controllers;
+using FreeTrain.Framework;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Views;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// FixedSizeStructureController
Modified: branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/IEntityBuilder.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,11 +20,11 @@
using System;
using System.Drawing;
-using freetrain.framework.graphics;
-using freetrain.controllers;
-using freetrain.contributions.population;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Controllers;
+using FreeTrain.Contributions.population;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// IEntityBuilder の概要の説明です。
Modified: branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/IPreviewWorldBuilder.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,9 +21,9 @@
using System;
using System.Drawing;
using System.Collections;
-using freetrain.world;
+using FreeTrain.world;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// IPreviewWorldBuilder
Modified: branches/FreeTrainSDL/core/contributions/common/LineContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/LineContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Drawing;
-using freetrain.world;
-using freetrain.framework.plugin;
+using FreeTrain.world;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// Base class for SpecialRailContribution and RoadContritbuion
Modified: branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/PictureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
-using freetrain.framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.graphics;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// Picture can be contributed.
Modified: branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/StructureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,16 +22,16 @@
using System.Drawing;
using System.Runtime.Serialization;
using System.Xml;
-using freetrain.util;
-using freetrain.contributions.population;
-using freetrain.controllers;
-using freetrain.framework.plugin;
-using freetrain.framework.graphics;
-using freetrain.world;
-using freetrain.world.structs;
+using FreeTrain.Util;
+using FreeTrain.Contributions.population;
+using FreeTrain.Controllers;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.graphics;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
using SDL.net;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
///
@@ -232,7 +232,7 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public virtual freetrain.framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
+ public virtual FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize)
{
throw new NotImplementedException();
}
@@ -241,7 +241,7 @@
/// </summary>
/// <param name="site"></param>
/// <returns></returns>
- public virtual freetrain.controllers.ModalController createBuilder(freetrain.controllers.IControllerSite site)
+ public virtual FreeTrain.Controllers.ModalController createBuilder(FreeTrain.Controllers.IControllerSite site)
{
throw new NotImplementedException();
}
@@ -250,7 +250,7 @@
/// </summary>
/// <param name="site"></param>
/// <returns></returns>
- public virtual freetrain.controllers.ModalController createRemover(freetrain.controllers.IControllerSite site)
+ public virtual FreeTrain.Controllers.ModalController createRemover(FreeTrain.Controllers.IControllerSite site)
{
throw new NotImplementedException();
}
Modified: branches/FreeTrainSDL/core/contributions/common/StructureGroup.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/StructureGroup.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/StructureGroup.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,7 +22,7 @@
using System.Collections;
using System.ComponentModel;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// Group of StructureContributions.
Modified: branches/FreeTrainSDL/core/contributions/common/SubDividedStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/common/SubDividedStructureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/common/SubDividedStructureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,7 +20,7 @@
using System;
-namespace freetrain.contributions.common
+namespace FreeTrain.Contributions.Common
{
/// <summary>
/// SubDividedStructureContribution の概要の説明です。
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,17 +23,17 @@
using System.Runtime.Serialization;
using System.Xml;
using SDL.net;
-using freetrain.controllers;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.framework;
-using freetrain.views;
-using freetrain.world;
-using freetrain.world.rail;
-using freetrain.world.terrain;
-using freetrain.world.land;
+using FreeTrain.Controllers;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework;
+using FreeTrain.Views;
+using FreeTrain.world;
+using FreeTrain.world.Rail;
+using FreeTrain.world.Terrain;
+using FreeTrain.world.Land;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// Removes any land voxel in the region.
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,12 +21,12 @@
using System;
using System.Drawing;
using System.Windows.Forms;
-using freetrain.framework.graphics;
-using freetrain.views;
-using freetrain.controllers;
-using freetrain.world;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Views;
+using FreeTrain.Controllers;
+using FreeTrain.world;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// ModalController implementation typical for most of the land builder contribution.
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,15 +23,15 @@
using System.Drawing;
using System.Xml;
using SDL.net;
-using freetrain.world;
-using freetrain.world.terrain;
-using freetrain.contributions.common;
-using freetrain.controllers;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Terrain;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Controllers;
+using FreeTrain.Framework;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// Plug-in that places land voxels.
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,9 +21,9 @@
using System;
using System.Collections;
using System.ComponentModel;
-using freetrain.contributions.common;
+using FreeTrain.Contributions.Common;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// Group of LandContribution.
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,14 +23,14 @@
using System.Drawing;
using System.Xml;
using SDL.net;
-using freetrain.controllers;
-using freetrain.framework.plugin;
-using freetrain.framework.graphics;
-using freetrain.views;
-using freetrain.world;
-using freetrain.world.land;
+using FreeTrain.Controllers;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Views;
+using FreeTrain.world;
+using FreeTrain.world.Land;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// RandomLandBuilder の概要の説明です。
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,15 +23,15 @@
using System.Runtime.Serialization;
using System.Xml;
using SDL.net;
-using freetrain.controllers;
-using freetrain.contributions.population;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.views;
-using freetrain.world;
-using freetrain.world.land;
+using FreeTrain.Controllers;
+using FreeTrain.Contributions.population;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Views;
+using FreeTrain.world;
+using FreeTrain.world.Land;
-namespace freetrain.contributions.land
+namespace FreeTrain.Contributions.land
{
/// <summary>
/// Places static chip as the land.
Modified: branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/others/EmptyNewGameContributionImpl.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,10 +21,10 @@
using System;
using System.Xml;
using System.Windows.Forms;
-using freetrain.framework;
-using freetrain.world;
+using FreeTrain.Framework;
+using FreeTrain.world;
-namespace freetrain.contributions.others
+namespace FreeTrain.Contributions.Others
{
/// <summary>
/// Creates a new empty game by allowing the user to specify the size of the world.
Modified: branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/others/MenuContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,9 +22,9 @@
using System.Reflection;
using System.Windows.Forms;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.others
+namespace FreeTrain.Contributions.Others
{
/// <summary>
/// Plug-in that exposes menu item.
Modified: branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/others/NewGameContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
-using freetrain.world;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
-namespace freetrain.contributions.others
+namespace FreeTrain.Contributions.Others
{
/// <summary>
/// Plug-in that creates a new game.
Modified: branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/others/NewWorldDialog.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,9 +23,9 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using freetrain.world;
+using FreeTrain.world;
-namespace freetrain.contributions.others
+namespace FreeTrain.Contributions.Others
{
/// <summary>
/// Dialog box to create a new World object.
Modified: branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/AgriculturalPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/CombinationPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.world;
+using FreeTrain.world;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Populaion that additively combines other populations.
Modified: branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/ConstantPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,11 +20,11 @@
using System;
using System.Xml;
-using freetrain.world;
-using freetrain.world.structs;
-using freetrain.framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Always the same population
Modified: branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/HourlyPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,11 +20,11 @@
using System;
using System.Diagnostics;
-using freetrain.world;
-using freetrain.world.structs;
-using freetrain.framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Population depends on hour of the day
Modified: branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/MultiplierPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Runtime.Serialization;
-using freetrain.world;
-using freetrain.framework.plugin;
+using FreeTrain.world;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Multiplies another population by a constant factor.
Modified: branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/OfficePopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/PersistentPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Runtime.Serialization;
-using freetrain.world;
+using FreeTrain.world;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Population implementation that wraps another Population and
Modified: branches/FreeTrainSDL/core/contributions/population/Population.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/Population.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/Population.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,11 +21,11 @@
using System;
using System.Runtime.Serialization;
using System.Xml;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.structs;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// Computes the population from the base population.
Modified: branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/ResidentialPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/RestaurantPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/population/ShopperPopulation.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.population
+namespace FreeTrain.Contributions.population
{
/// <summary>
/// HourlyPopulation with a typical distribution for
Modified: branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,13 +20,13 @@
using System;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.framework;
-using freetrain.framework.plugin;
-using freetrain.framework.sound;
-using freetrain.world;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.sound;
+using FreeTrain.world;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// Departure bell for trains.
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,13 +21,13 @@
using System;
using System.Xml;
using System.Drawing;
-using freetrain.contributions.common;
-using freetrain.framework.plugin;
-using freetrain.framework.graphics;
-using freetrain.controllers;
-using freetrain.contributions.population;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.plugin;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Controllers;
+using FreeTrain.Contributions.population;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// Contribution that adds <c>TrafficVoxel.Accessory</c>
@@ -80,19 +80,19 @@
/// </summary>
/// <param name="pixelSize"></param>
/// <returns></returns>
- public abstract freetrain.framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
+ public abstract FreeTrain.Framework.graphics.PreviewDrawer createPreview(System.Drawing.Size pixelSize);
/// <summary>
///
/// </summary>
/// <param name="site"></param>
/// <returns></returns>
- public abstract freetrain.controllers.ModalController createBuilder(freetrain.controllers.IControllerSite site);
+ public abstract FreeTrain.Controllers.ModalController createBuilder(FreeTrain.Controllers.IControllerSite site);
/// <summary>
///
/// </summary>
/// <param name="site"></param>
/// <returns></returns>
- public abstract freetrain.controllers.ModalController createRemover(freetrain.controllers.IControllerSite site);
+ public abstract FreeTrain.Controllers.ModalController createRemover(FreeTrain.Controllers.IControllerSite site);
#endregion
}
Modified: branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,13 +20,13 @@
using System;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.rail;
-using freetrain.world.structs;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Rail;
+using FreeTrain.world.Structs;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// Stationary objects related to rail road.
Modified: branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,10 +21,10 @@
using System;
using System.Drawing;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.world;
+using FreeTrain.Contributions.Common;
+using FreeTrain.world;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// Contribution that adds a special kind of railroads, like tunnels or bridges.
Modified: branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,13 +20,13 @@
using System;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.rail;
-using freetrain.world.structs;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Rail;
+using FreeTrain.world.Structs;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// Station.
Modified: branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
-using freetrain.world.rail;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world.Rail;
-namespace freetrain.contributions.rail
+namespace FreeTrain.Contributions.rail
{
/// <summary>
/// plug-in that provides TrainController implementations
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,10 +21,10 @@
using System;
using System.Drawing;
using System.Xml;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.road
+namespace FreeTrain.Contributions.road
{
/// <summary>
/// RoadContribution for "org.kohsuke.freetrain.road.pc-9801fa" plug-in
Modified: branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/road/AbstractRoadContributionImpl.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,13 +22,13 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.road;
+using FreeTrain.Framework;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.road;
-namespace freetrain.contributions.road
+namespace FreeTrain.Contributions.road
{
/// <summary>
/// Usual implementation of RoadContribution.
Modified: branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/road/RoadContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,12 +22,12 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.framework.graphics;
-using freetrain.world;
-using freetrain.world.road;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.graphics;
+using FreeTrain.world;
+using FreeTrain.world.road;
-namespace freetrain.contributions.road
+namespace FreeTrain.Contributions.road
{
/// <summary>
/// Road for cars/buses
Modified: branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/road/StandardRoadContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -22,13 +22,13 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using freetrain.framework;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.road;
+using FreeTrain.Framework;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.road;
-namespace freetrain.contributions.road
+namespace FreeTrain.Contributions.road
{
/// <summary>
/// RoadContribution implemented by 15 sprites.
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.sound
+namespace FreeTrain.Contributions.sound
{
/// <summary>
/// Background music.
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -21,9 +21,9 @@
using System;
using System.Net;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.sound
+namespace FreeTrain.Contributions.sound
{
/// <summary>
/// Code that lists up BGMContribution programatically.
Modified: branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/structs/CommercialStructureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,12 +20,12 @@
using System;
using System.Xml;
-using freetrain.contributions.common;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.structs;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
-namespace freetrain.contributions.structs
+namespace FreeTrain.Contributions.Structs
{
/// <summary>
/// commercial structure.
Modified: branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/structs/SpecialStructureContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,9 +20,9 @@
using System;
using System.Xml;
-using freetrain.framework.plugin;
+using FreeTrain.Framework.plugin;
-namespace freetrain.contributions.structs
+namespace FreeTrain.Contributions.Structs
{
/// <summary>
/// Contribution that adds a special kind of structures, like airports.
Modified: branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/structs/VarHeightBuildingContribution.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -23,16 +23,16 @@
using System.Diagnostics;
using System.Drawing;
using System.Xml;
-using freetrain.util;
-using freetrain.controllers;
-using freetrain.contributions.common;
-using freetrain.framework.graphics;
-using freetrain.framework.plugin;
-using freetrain.world;
-using freetrain.world.structs;
+using FreeTrain.Util;
+using FreeTrain.Controllers;
+using FreeTrain.Contributions.Common;
+using FreeTrain.Framework.graphics;
+using FreeTrain.Framework.plugin;
+using FreeTrain.world;
+using FreeTrain.world.Structs;
using SDL.net;
-namespace freetrain.contributions.structs
+namespace FreeTrain.Contributions.Structs
{
/// <summary>
/// Building of a variable height.
Modified: branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-14 22:32:58 UTC (rev 232)
+++ branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-18 07:23:40 UTC (rev 233)
@@ -20,10 +20,10 @@
using System;
using System.Xml;
-using freetrain.framework;
-using freetrain.framework.plugin;
+using FreeTrain.Framework;
+using FreeTrain.Framework.plugin;
-namespace freetrain.con...
[truncated message content] |
|
From: <je...@us...> - 2008-03-18 08:20:55
|
Revision: 235
http://freetrain.svn.sourceforge.net/freetrain/?rev=235&view=rev
Author: jendave
Date: 2008-03-18 01:20:58 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
fix more namespaces
Modified Paths:
--------------
branches/FreeTrainSDL/Program.cs
branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs
branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs
branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs
branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
branches/FreeTrainSDL/core/controllers/land/LandController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs
branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
branches/FreeTrainSDL/core/controllers/road/RoadController.cs
branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
branches/FreeTrainSDL/core/framework/BGMManager.cs
branches/FreeTrainSDL/core/framework/BGMPlaylist.cs
branches/FreeTrainSDL/core/framework/MainWindow.cs
branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
branches/FreeTrainSDL/core/util/controls/DDTreeView.cs
branches/FreeTrainSDL/core/util/controls/ToolBarCustomizerUI.cs
branches/FreeTrainSDL/core/world/World.cs
branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs
branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs
branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
branches/FreeTrainSDL/core/world/development/LandPlan.cs
branches/FreeTrainSDL/core/world/development/LandValue.cs
branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs
branches/FreeTrainSDL/core/world/development/Plan.cs
branches/FreeTrainSDL/core/world/development/ULV.cs
branches/FreeTrainSDL/core/world/development/ULVFactory.cs
branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs
branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs
branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/Platform.cs
branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs
branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs
branches/FreeTrainSDL/core/world/rail/Station.cs
branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
branches/FreeTrainSDL/core/world/rail/Train.cs
branches/FreeTrainSDL/core/world/rail/TrainController.cs
branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
branches/FreeTrainSDL/core/world/structs/Commercial.cs
branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs
branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs
branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/plugin.xml
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorConfigDialog.cs
branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains.colorTest/ColorTestTrainCar.cs
branches/FreeTrainSDL/plugins/system/plugin.xml
Modified: branches/FreeTrainSDL/Program.cs
===================================================================
--- branches/FreeTrainSDL/Program.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/Program.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -35,7 +35,7 @@
using FreeTrain.world.Terrain;
using FreeTrain.Controllers.Land;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Util;
using FreeTrain.Util.Command;
using FreeTrain.Controllers;
Modified: branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/Bulldozer.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -33,7 +33,7 @@
using FreeTrain.world.Terrain;
using FreeTrain.world.Land;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// Removes any land voxel in the region.
Modified: branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/DefaultControllerImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,7 +26,7 @@
using FreeTrain.Controllers;
using FreeTrain.world;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// ModalController implementation typical for most of the land builder contribution.
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -31,7 +31,7 @@
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// Plug-in that places land voxels.
Modified: branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/LandBuilderGroup.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.ComponentModel;
using FreeTrain.Contributions.Common;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// Group of LandContribution.
Modified: branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/RandomLandBuilder.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -30,7 +30,7 @@
using FreeTrain.world;
using FreeTrain.world.Land;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// RandomLandBuilder の概要の説明です。
Modified: branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/land/StaticLandBuilder.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -31,7 +31,7 @@
using FreeTrain.world;
using FreeTrain.world.Land;
-namespace FreeTrain.Contributions.land
+namespace FreeTrain.Contributions.Land
{
/// <summary>
/// Places static chip as the land.
Modified: branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/DepartureBellContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,10 +23,10 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.world;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// Departure bell for trains.
Modified: branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/RailAccessoryContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -27,7 +27,7 @@
using FreeTrain.Controllers;
using FreeTrain.Contributions.population;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// Contribution that adds <c>TrafficVoxel.Accessory</c>
Modified: branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/RailStationaryContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,7 +26,7 @@
using FreeTrain.world.Rail;
using FreeTrain.world.Structs;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// Stationary objects related to rail road.
Modified: branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/SpecialRailContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.world;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// Contribution that adds a special kind of railroads, like tunnels or bridges.
Modified: branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/StationContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,7 +26,7 @@
using FreeTrain.world.Rail;
using FreeTrain.world.Structs;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// Station.
Modified: branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/rail/TrainControllerContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.world.Rail;
-namespace FreeTrain.Contributions.rail
+namespace FreeTrain.Contributions.Rail
{
/// <summary>
/// plug-in that provides TrainController implementations
Modified: branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/road/A3RoadContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.road
+namespace FreeTrain.Contributions.Road
{
/// <summary>
/// RoadContribution for "org.kohsuke.freetrain.road.pc-9801fa" plug-in
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.sound
+namespace FreeTrain.Contributions.Sound
{
/// <summary>
/// Background music.
Modified: branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/sound/BGMFactoryContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.sound
+namespace FreeTrain.Contributions.Sound
{
/// <summary>
/// Code that lists up BGMContribution programatically.
Modified: branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/AbstractTrainContributionImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Common base implementation of TrainContribution
Modified: branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/AsymTrainCarImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -27,7 +27,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Assymetric train car.
Modified: branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/ColoredTrainCarImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -28,7 +28,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
// TODO: this code needs to be re-written by using ColorMapSprite
Modified: branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/ParamTrainImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Parameterized train contribution implementation
Modified: branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/PatternTrainImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Parameterized train contribution implementation
Modified: branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/ReverseTrainCarImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,7 +26,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// TrainCarContribution that draws cars from another TrainCarContribution
Modified: branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/SymTrainCarImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -27,7 +27,7 @@
using FreeTrain.world;
using SDL.net;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Symmetric train car.
Modified: branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/TrainCarContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.world;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Train car type.
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,7 +26,7 @@
using FreeTrain.world;
using FreeTrain.world.Rail;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// Train type
Modified: branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs
===================================================================
--- branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/contributions/train/TrainContributionFactory.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Xml;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.Contributions.train
+namespace FreeTrain.Contributions.Train
{
/// <summary>
/// LoadsTrainContributionFactory.
Modified: branches/FreeTrainSDL/core/controllers/AbstractLineController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/AbstractLineController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using System.ComponentModel;
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/land/BulldozeController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,9 +24,9 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.sound;
+using FreeTrain.Contributions.Sound;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/land/LandController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/land/LandController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,9 +24,9 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.sound;
+using FreeTrain.Contributions.Sound;
using FreeTrain.Views;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Drawing;
using System.Windows.Forms;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/PlatformPropertyDialog.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/SpecialPurposeRailController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainControllerDialog.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainPlacementController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -30,7 +30,7 @@
using FreeTrain.world.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.sound;
-using FreeTrain.Util.controls;
+using FreeTrain.Util.Controls;
using FreeTrain.Util.Command;
using SDL.net;
@@ -180,7 +180,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TrainPlacementController));
this.buttonRemove = new System.Windows.Forms.RadioButton();
this.buttonPlace = new System.Windows.Forms.RadioButton();
- this.tree = new FreeTrain.Util.controls.DDTreeView();
+ this.tree = new FreeTrain.Util.Controls.DDTreeView();
this.treeMenu = new System.Windows.Forms.ContextMenu();
this.miAddGroup = new System.Windows.Forms.MenuItem();
this.miSell = new System.Windows.Forms.MenuItem();
Modified: branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/rail/TrainTradingDialog.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.train;
+using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
@@ -618,7 +618,7 @@
new Train(World.world.rootTrainGroup,
(int)length.Value, selectedTrain);
- FreeTrain.Framework.sound.SoundEffectManager
+ FreeTrain.Framework.Sound.SoundEffectManager
.PlaySynchronousSound(ResourceUtil.findSystemResource("vehiclePurchase.wav"));
AccountManager.theInstance.spend(getTotalPrice(), AccountGenre.RAIL_SERVICE);
Modified: branches/FreeTrainSDL/core/controllers/road/RoadController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/road/RoadController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
-using FreeTrain.Contributions.road;
+using FreeTrain.Contributions.Road;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.Views.Map;
@@ -32,7 +32,7 @@
using FreeTrain.world.road;
using FreeTrain.Contributions.Common;
-namespace FreeTrain.Controllers.road
+namespace FreeTrain.Controllers.Road
{
/// <summary>
/// Controller to place/remove roads
Modified: branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs
===================================================================
--- branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/controllers/structs/StructPlacementController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -29,7 +29,7 @@
using FreeTrain.Views.Map;
using FreeTrain.world;
using FreeTrain.world.Structs;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/framework/BGMManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/BGMManager.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Runtime.Serialization;
using System.Collections;
using System.Windows.Forms;
-using FreeTrain.Contributions.sound;
+using FreeTrain.Contributions.Sound;
using FreeTrain.Framework.plugin;
//using SDL.net;
using SdlDotNet.Audio;
Modified: branches/FreeTrainSDL/core/framework/BGMPlaylist.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/BGMPlaylist.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/BGMPlaylist.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using System.Drawing;
using System.Text;
using System.Windows.Forms;
-using FreeTrain.Contributions.sound;
+using FreeTrain.Contributions.Sound;
namespace FreeTrain.Framework
Modified: branches/FreeTrainSDL/core/framework/MainWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/MainWindow.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -31,7 +31,7 @@
//using Microsoft.Win32;
//using freetrain.contributions.dock;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Contributions.road;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.Others;
@@ -39,11 +39,11 @@
using FreeTrain.Controllers;
using FreeTrain.Controllers.Land;
using FreeTrain.Controllers.Rail;
-using FreeTrain.Controllers.road;
+using FreeTrain.Controllers.Road;
using FreeTrain.Controllers.Terrain;
using FreeTrain.Controllers.Structs;
using FreeTrain.Framework.plugin;
-using FreeTrain.Framework.sound;
+using FreeTrain.Framework.Sound;
using FreeTrain.Framework.graphics;
using FreeTrain.Views;
using FreeTrain.Views.Map;
Modified: branches/FreeTrainSDL/core/framework/plugin/Plugin.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/plugin/Plugin.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,8 +26,8 @@
using System.Text;
using System.Xml;
using FreeTrain.Util;
-using FreeTrain.Contributions.train;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Train;
+using FreeTrain.Contributions.Land;
using FreeTrain.Framework.graphics;
namespace FreeTrain.Framework.plugin
Modified: branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/plugin/PluginManager.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,11 +25,11 @@
using System.Reflection;
using System.Windows.Forms;
using FreeTrain.Util;
-using FreeTrain.Contributions.sound;
+using FreeTrain.Contributions.Sound;
using FreeTrain.Contributions.Others;
-using FreeTrain.Contributions.rail;
-using FreeTrain.Contributions.land;
-using FreeTrain.Contributions.train;
+using FreeTrain.Contributions.Rail;
+using FreeTrain.Contributions.Land;
+using FreeTrain.Contributions.Train;
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.Structs;
using FreeTrain.Contributions.road;
Modified: branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs
===================================================================
--- branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/framework/sound/SoundEffect.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -21,7 +21,7 @@
using System;
using FreeTrain.world;
-namespace FreeTrain.Framework.sound
+namespace FreeTrain.Framework.Sound
{
/// <summary>
/// Sound Effect
Modified: branches/FreeTrainSDL/core/util/controls/DDTreeView.cs
===================================================================
--- branches/FreeTrainSDL/core/util/controls/DDTreeView.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/util/controls/DDTreeView.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace FreeTrain.Util.controls
+namespace FreeTrain.Util.Controls
{
/// <summary>
/// TreeView control with drag-n-drop functionality
Modified: branches/FreeTrainSDL/core/util/controls/ToolBarCustomizerUI.cs
===================================================================
--- branches/FreeTrainSDL/core/util/controls/ToolBarCustomizerUI.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/util/controls/ToolBarCustomizerUI.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace FreeTrain.Util.controls
+namespace FreeTrain.Util.Controls
{
/// <summary>
/// Implements a context menu for toolbar and allows the player
Modified: branches/FreeTrainSDL/core/world/World.cs
===================================================================
--- branches/FreeTrainSDL/core/world/World.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/World.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -26,15 +26,15 @@
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Runtime.Serialization.Formatters.Soap;
-using FreeTrain.Contributions.sound;
-using FreeTrain.Contributions.train;
+using FreeTrain.Contributions.Sound;
+using FreeTrain.Contributions.Train;
using FreeTrain.Controllers;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.world;
using FreeTrain.world.Rail;
using FreeTrain.Views;
-using FreeTrain.world.development;
+using FreeTrain.world.Development;
using SDL.net;
namespace FreeTrain.world
@@ -140,7 +140,7 @@
// when a voxel is changed, it should be notified to OutlookListeners automatically
onVoxelChanged += new VoxelChangeListener(onVoxelUpdated);
- landValue = new development.LandValue(this);
+ landValue = new Development.LandValue(this);
}
}
/// <summary>
@@ -196,7 +196,7 @@
/// <summary>
/// Responsible for computing/maintaining land values for this world.
/// </summary>
- public readonly development.LandValue landValue;
+ public readonly Development.LandValue landValue;
/// <summary>
/// Other objects associated to this world.
Modified: branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/CommercialStructurePlan.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using FreeTrain.Contributions.Structs;
using FreeTrain.world.Structs;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// CommercialStructurePlan の概要の説明です。
Modified: branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/DevelopConfigure.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using FreeTrain.Framework;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/DevelopConfigurePlugin.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using FreeTrain.Contributions.Others;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/DevelopmentAlgorithm.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Collections;
using System.Diagnostics;
using FreeTrain.Contributions.Common;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Contributions.Structs;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
@@ -30,9 +30,9 @@
using FreeTrain.world.Rail;
using FreeTrain.world.Land;
using FreeTrain.world.Structs;
-using FreeTrain.world.subsidiaries;
+using FreeTrain.world.Subsidiaries;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// Receives clock event and build a new structure if appropriate
Modified: branches/FreeTrainSDL/core/world/development/LandPlan.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandPlan.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/LandPlan.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -19,9 +19,9 @@
#endregion LICENSE
using System;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// Plan of land surfaces such as crop fields.
Modified: branches/FreeTrainSDL/core/world/development/LandValue.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/LandValue.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -21,7 +21,7 @@
using System;
using FreeTrain.world.road;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// Computes and maintains land value.
Modified: branches/FreeTrainSDL/core/world/development/LandValueInspector.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValueInspector.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/LandValueInspector.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -27,7 +27,7 @@
using FreeTrain.world.Rail;
using SDL.net;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// Controller that checks the land value.
Modified: branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/LandValueInspectorPlugin.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using FreeTrain.Contributions.Others;
using FreeTrain.Framework.plugin;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/world/development/Plan.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/Plan.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/Plan.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
// TODO: allow a contribution to implement PlanFactory
Modified: branches/FreeTrainSDL/core/world/development/ULV.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/ULV.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/ULV.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using FreeTrain.Util;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// ULV stands for "Unused Land Value."
Modified: branches/FreeTrainSDL/core/world/development/ULVFactory.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/ULVFactory.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/ULVFactory.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// Factory of ULV.
Modified: branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs
===================================================================
--- branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/development/VarHeightBuildingPlan.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using FreeTrain.Contributions.Structs;
using FreeTrain.world.Structs;
-namespace FreeTrain.world.development
+namespace FreeTrain.world.Development
{
/// <summary>
/// VarHeightBuildingPlan の概要の説明です。
Modified: branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs
===================================================================
--- branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/land/StaticLandVoxel.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Framework.plugin;
using FreeTrain.world.Rail;
using FreeTrain.world.Structs;
Modified: branches/FreeTrainSDL/core/world/rail/BridgeRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/BridgeRail.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.IO;
using System.Xml;
using SDL.net;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/DelegationTrainControllerImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Collections;
using System.Runtime.Serialization;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/Platform.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Platform.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/Platform.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Diagnostics;
using System.Drawing;
using SDL.net;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.world.Accounting;
using FreeTrain.Util;
Modified: branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/RailStationaryStructure.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
using System.Drawing;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.world.Structs;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/SimpleTrainControllerImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.Runtime.Serialization;
using System.Windows.Forms;
using FreeTrain.Framework.plugin;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/Station.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Station.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/Station.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,13 +22,13 @@
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using FreeTrain.world.Accounting;
using FreeTrain.world.Structs;
-using FreeTrain.world.development;
+using FreeTrain.world.Development;
namespace FreeTrain.world.Rail
{
Modified: branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/StealSupportedRailContributionImpl.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.IO;
using System.Xml;
using SDL.net;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/world/rail/Train.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/Train.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.Drawing;
using System.Windows.Forms;
using SDL.net;
-using FreeTrain.Contributions.train;
+using FreeTrain.Contributions.Train;
using FreeTrain.Framework;
using FreeTrain.Framework.sound;
using FreeTrain.Framework.graphics;
Modified: branches/FreeTrainSDL/core/world/rail/TrainController.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/TrainController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/TrainController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
using System.Windows.Forms;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
namespace FreeTrain.world.Rail
Modified: branches/FreeTrainSDL/core/world/rail/TunnelRail.cs
===================================================================
--- branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/rail/TunnelRail.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.IO;
using System.Xml;
using SDL.net;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/core/world/structs/Commercial.cs
===================================================================
--- branches/FreeTrainSDL/core/world/structs/Commercial.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/structs/Commercial.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -27,7 +27,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using FreeTrain.world;
-using FreeTrain.world.subsidiaries;
+using FreeTrain.world.Subsidiaries;
namespace FreeTrain.world.Structs
{
Modified: branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs
===================================================================
--- branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/structs/VarHeightBuilding.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
-using FreeTrain.world.subsidiaries;
+using FreeTrain.world.Subsidiaries;
namespace FreeTrain.world.Structs
{
Modified: branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/subsidiaries/MarketWindow.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -28,7 +28,7 @@
//using freetrain.util.docking;
using FreeTrain.Util.Command;
-namespace FreeTrain.world.subsidiaries
+namespace FreeTrain.world.Subsidiaries
{
/// <summary>
/// Controller of SubsidiaryMarket.
@@ -59,7 +59,7 @@
reset(null,null);
- FreeTrain.Util.controls.ToolBarCustomizerUI.attach(toolBar);
+ FreeTrain.Util.Controls.ToolBarCustomizerUI.attach(toolBar);
tbModeSell.Pushed = true;
// associate UI with code
Modified: branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/subsidiaries/Parameters.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.world.subsidiaries
+namespace FreeTrain.world.Subsidiaries
{
internal sealed class Parameters
{
Modified: branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryCompany.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using FreeTrain.world.Structs;
using FreeTrain.world.Accounting;
-namespace FreeTrain.world.subsidiaries
+namespace FreeTrain.world.Subsidiaries
{
/// <summary>
/// Tradable subsidiary company.
Modified: branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryEntity.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -20,7 +20,7 @@
using System;
-namespace FreeTrain.world.subsidiaries
+namespace FreeTrain.world.Subsidiaries
{
/// <summary>
///
Modified: branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs
===================================================================
--- branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/core/world/subsidiaries/SubsidiaryMarket.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -22,7 +22,7 @@
using System.Runtime.Serialization;
using FreeTrain.Util;
-namespace FreeTrain.world.subsidiaries
+namespace FreeTrain.world.Subsidiaries
{
/// <summary>
///
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/DummyCars/DummyCarContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -25,7 +25,7 @@
using System.Windows.Forms;
using System.Xml;
using FreeTrain.Controllers;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib/src/RoadAccessory/RoadAccessoryContribution.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -24,7 +24,7 @@
using System.Windows.Forms;
using System.Xml;
using FreeTrain.Controllers;
-using FreeTrain.Contributions.rail;
+using FreeTrain.Contributions.Rail;
using FreeTrain.Framework.plugin;
using FreeTrain.Framework.graphics;
using FreeTrain.world;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.generic/MultiSelectorController.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -30,7 +30,7 @@
using FreeTrain.Contributions.Common;
using FreeTrain.Contributions.population;
using FreeTrain.Contributions.Structs;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Framework;
using FreeTrain.Framework.graphics;
using FreeTrain.Framework.plugin;
Modified: branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs
===================================================================
--- branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/jp.co.tripod.chiname.lib.halfvoxel/HVStructure.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -30,7 +30,7 @@
using FreeTrain.Framework.plugin;
using FreeTrain.Util;
using FreeTrain.world;
-using FreeTrain.world.subsidiaries;
+using FreeTrain.world.Subsidiaries;
namespace FreeTrain.world.Structs.hv
{
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.land.477/VinylHouseBuilder.cs 2008-03-18 08:20:58 UTC (rev 235)
@@ -23,7 +23,7 @@
using System.Runtime.Serialization;
using System.Xml;
using SDL.net;
-using FreeTrain.Contributions.land;
+using FreeTrain.Contributions.Land;
using FreeTrain.Contributions.population;
using FreeTrain.Controllers;
using FreeTrain.Framework.graphics;
Modified: branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/plugin.xml
===================================================================
--- branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/plugin.xml 2008-03-18 07:58:18 UTC (rev 234)
+++ branches/FreeTrainSDL/plugins/org.kohsuke.freetrain.trains/plugin.xml 2008-03-18 08:20:58 UTC (rev 235)
@@ -9,7 +9,7 @@
<!-- Default Body for FT Series -->
<contribution type="trainCar" id="{9EE438DE-B766-4b37-A474-9CE6EE73FE75}">
- <class name="FreeTrain.Contributions.train.SymTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.SymTrainCarImpl" />
<sprite origin="0,0">
<picture src="train.bmp" />
</sprite>
@@ -64,7 +64,7 @@
<!-- 485 Series Head -->
<contribution type="trainCar" id="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-h">
- <class name="FreeTrain.Contributions.train.AsymTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.AsymTrainCarImpl" />
<sprite origin="0,0">
<picture src="train485a.bmp" />
</sprite>
@@ -73,7 +73,7 @@
<!-- 485 Series Body -->
<contribution type="trainCar" id="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-m">
- <class name="FreeTrain.Contributions.train.SymTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.SymTrainCarImpl" />
<sprite origin="0,0">
<picture src="train485b.bmp" />
</sprite>
@@ -82,7 +82,7 @@
<!-- 485 Series Tail -->
<contribution type="trainCar" id="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-t">
- <class name="FreeTrain.Contributions.train.ReverseTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.ReverseTrainCarImpl" />
<base carRef="{3983B298-ADB1-4905-94E5-03B7AAE5A221}-h"/>
</contribution>
@@ -115,7 +115,7 @@
<!-- E3 Series Head -->
<contribution type="trainCar" id="{F4D54B1E-534E-47b0-9EA7-76CE075423E4}-h">
- <class name="FreeTrain.Contributions.train.AsymTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.AsymTrainCarImpl" />
<sprite origin="0,0">
<picture src="trainE3a.bmp" />
</sprite>
@@ -124,7 +124,7 @@
<!-- E3 Series Body -->
<contribution type="trainCar" id="{F4D54B1E-534E-47b0-9EA7-76CE075423E4}-m">
- <class name="FreeTrain.Contributions.train.SymTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.SymTrainCarImpl" />
<sprite origin="0,0">
<picture src="trainE3b.bmp" />
</sprite>
@@ -133,7 +133,7 @@
<!-- E3 Series Tail -->
<contribution type="trainCar" id="{F4D54B1E-534E-47b0-9EA7-76CE075423E4}-t">
- <class name="FreeTrain.Contributions.train.ReverseTrainCarImpl" />
+ <class name="FreeTrain.Contributions.Train.ReverseTrainCarImpl" />
<base c...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X