[Csp-commits] svn:csp r2060 - in trunk/csp: base bin csplib csplib/data csplib/net csplib/numeric csplib/spatial csplib/thread csplib/util csplib/xml cspsim cspsim/ai cspsim/battlefield cspsim/f16 cspsim/hud cspsim/sky cspsim/sound cspsim/stores cspsim/swig cspsim/systems cspsim/theater cspsim/views cspsim/wf cspsim/windows data data/fonts data/ui data/ui/localization data/ui/themes data/ui/themes/default data/ui/themes/experimental data/ui/themes/red modules/chunklod modules/demeter tools tools/build tools/data tools/trc

[<sv...@ww...>]

Author: nsmoooose
Date: 2007-03-10 13:48:20 -0800 (Sat, 10 Mar 2007)
New Revision: 2060

Added:
   trunk/csp/csplib/util/Optional.h
   trunk/csp/cspsim/wf/ResourceLocator.cpp
   trunk/csp/cspsim/wf/ResourceLocator.h
   trunk/csp/cspsim/wf/Style.h
   trunk/csp/cspsim/wf/StyleBuilder.cpp
   trunk/csp/cspsim/wf/StyleBuilder.h
   trunk/csp/cspsim/windows/MainMenu.cpp
   trunk/csp/cspsim/windows/MainMenu.h
   trunk/csp/cspsim/windows/MenuScreen.cpp
   trunk/csp/cspsim/windows/MenuScreen.h
   trunk/csp/cspsim/windows/MessageBox.cpp
   trunk/csp/cspsim/windows/MessageBox.h
   trunk/csp/data/fonts/prima_sans_bt.ttf
   trunk/csp/data/ui/localization/english/
   trunk/csp/data/ui/localization/swedish/
   trunk/csp/data/ui/themes/default/desktop.xml
   trunk/csp/data/ui/themes/default/main_menu.xml
   trunk/csp/data/ui/themes/default/messagebox.xml
   trunk/csp/data/ui/themes/default/styles.xml
   trunk/csp/data/ui/themes/experimental/
   trunk/csp/data/ui/themes/experimental/desktop.xml
   trunk/csp/data/ui/themes/experimental/main_menu.xml
   trunk/csp/data/ui/themes/experimental/messagebox.xml
   trunk/csp/data/ui/themes/experimental/options.xml
   trunk/csp/data/ui/themes/experimental/quit_resume.xml
   trunk/csp/data/ui/themes/experimental/styles.xml
   trunk/csp/data/ui/themes/red/
   trunk/csp/data/ui/themes/red/desktop.xml
   trunk/csp/data/ui/themes/red/main_menu.xml
   trunk/csp/data/ui/themes/red/messagebox.xml
   trunk/csp/data/ui/themes/red/options.xml
   trunk/csp/data/ui/themes/red/quit_resume.xml
   trunk/csp/data/ui/themes/red/styles.xml
Removed:
   trunk/csp/cspsim/wf/MessageBox.cpp
   trunk/csp/cspsim/wf/MessageBox.h
   trunk/csp/data/ui/localization/en/
   trunk/csp/data/ui/themes/experimental/desktop.xml
   trunk/csp/data/ui/themes/experimental/main_menu.xml
   trunk/csp/data/ui/themes/experimental/messagebox.xml
   trunk/csp/data/ui/themes/experimental/options.xml
   trunk/csp/data/ui/themes/experimental/quit_resume.xml
   trunk/csp/data/ui/themes/experimental/styles.xml
   trunk/csp/data/ui/themes/red/desktop.xml
   trunk/csp/data/ui/themes/red/main_menu.xml
   trunk/csp/data/ui/themes/red/messagebox.xml
   trunk/csp/data/ui/themes/red/options.xml
   trunk/csp/data/ui/themes/red/quit_resume.xml
   trunk/csp/data/ui/themes/red/styles.xml
Modified:
   trunk/csp/base/
   trunk/csp/bin/
   trunk/csp/bin/sim.py
   trunk/csp/csplib/
   trunk/csp/csplib/data/
   trunk/csp/csplib/net/
   trunk/csp/csplib/numeric/
   trunk/csp/csplib/spatial/
   trunk/csp/csplib/thread/
   trunk/csp/csplib/util/
   trunk/csp/csplib/xml/
   trunk/csp/cspsim/
   trunk/csp/cspsim/BaseScreen.h
   trunk/csp/cspsim/CSPSim.cpp
   trunk/csp/cspsim/CSPSim.h
   trunk/csp/cspsim/Config.cpp
   trunk/csp/cspsim/Config.h
   trunk/csp/cspsim/GameScreen.cpp
   trunk/csp/cspsim/SConscript
   trunk/csp/cspsim/VirtualScene.cpp
   trunk/csp/cspsim/ai/
   trunk/csp/cspsim/battlefield/
   trunk/csp/cspsim/f16/
   trunk/csp/cspsim/hud/
   trunk/csp/cspsim/sky/
   trunk/csp/cspsim/sound/
   trunk/csp/cspsim/sound/SoundEngine.cpp
   trunk/csp/cspsim/sound/SoundEngine.h
   trunk/csp/cspsim/stores/
   trunk/csp/cspsim/swig/CSPSim.i
   trunk/csp/cspsim/systems/
   trunk/csp/cspsim/theater/
   trunk/csp/cspsim/views/
   trunk/csp/cspsim/wf/
   trunk/csp/cspsim/wf/Button.cpp
   trunk/csp/cspsim/wf/Button.h
   trunk/csp/cspsim/wf/CheckBox.cpp
   trunk/csp/cspsim/wf/CheckBox.h
   trunk/csp/cspsim/wf/Container.cpp
   trunk/csp/cspsim/wf/Container.h
   trunk/csp/cspsim/wf/Control.cpp
   trunk/csp/cspsim/wf/Control.h
   trunk/csp/cspsim/wf/ControlGeometryBuilder.cpp
   trunk/csp/cspsim/wf/ControlGeometryBuilder.h
   trunk/csp/cspsim/wf/Label.cpp
   trunk/csp/cspsim/wf/Label.h
   trunk/csp/cspsim/wf/ListBox.cpp
   trunk/csp/cspsim/wf/ListBox.h
   trunk/csp/cspsim/wf/ListBoxItem.cpp
   trunk/csp/cspsim/wf/ListBoxItem.h
   trunk/csp/cspsim/wf/MultiControlContainer.cpp
   trunk/csp/cspsim/wf/MultiControlContainer.h
   trunk/csp/cspsim/wf/Serialization.cpp
   trunk/csp/cspsim/wf/SingleControlContainer.cpp
   trunk/csp/cspsim/wf/SingleControlContainer.h
   trunk/csp/cspsim/wf/Tab.cpp
   trunk/csp/cspsim/wf/Tab.h
   trunk/csp/cspsim/wf/TabPage.cpp
   trunk/csp/cspsim/wf/TabPage.h
   trunk/csp/cspsim/wf/TableControlContainer.cpp
   trunk/csp/cspsim/wf/TableControlContainer.h
   trunk/csp/cspsim/wf/Window.cpp
   trunk/csp/cspsim/wf/Window.h
   trunk/csp/cspsim/wf/WindowManager.cpp
   trunk/csp/cspsim/wf/WindowManager.h
   trunk/csp/cspsim/windows/
   trunk/csp/cspsim/windows/Options.cpp
   trunk/csp/cspsim/windows/QuitResume.cpp
   trunk/csp/data/
   trunk/csp/data/ui/themes/default/options.xml
   trunk/csp/data/ui/themes/default/quit_resume.xml
   trunk/csp/data/ui/window_document.xsd
   trunk/csp/modules/chunklod/
   trunk/csp/modules/demeter/
   trunk/csp/tools/
   trunk/csp/tools/build/
   trunk/csp/tools/data/
   trunk/csp/tools/trc/
Log:
Merged r2047:2059 from the mainmenu_and_style2 branch. The following features has been added:
 * A main menu that is displayed after loading of the game.
 * Color, background, borders and font is style able on all controls. (width, height and position is still lacking support)
 * Full support for several ui themes.
 * Class for optional values. This class is imitating the equivalent boost version.
 * Added svn:ignore on files that shouldn't be version controlled.
 * Several themes.
 * A new free true type font to use.
...and some more things that i have forgotten to mention...

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2060

Diff omitted (157063 bytes).