[Csp-commits] svn:csp r2177 - in trunk/csp: cspsim cspsim/swig cspsim/wf data/ui data/ui/help data/ui/library data/ui/localization/english data/ui/localization/german data/ui/localization/svenska data/ui/scripts data/ui/scripts/windows data/ui/themes/default data/ui/themes/default/images data/ui/tutorials data/ui/tutorials/takeoff tools/hid/maps

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

Author: nsmoooose
Date: 2007-09-02 02:51:22 -0700 (Sun, 02 Sep 2007)
New Revision: 2177

Added:
   trunk/csp/cspsim/wf/Style.cpp
   trunk/csp/data/ui/scripts/windows/tutorials.py
   trunk/csp/data/ui/themes/default/css_help.xml
   trunk/csp/data/ui/themes/default/css_top.xml
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-a.png
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.png
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-arrowup.svg
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-equals.png
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-g.png
   trunk/csp/data/ui/themes/default/images/input-keyboard-button-minus.png
   trunk/csp/data/ui/themes/default/images/input-keyboard-button.svg
   trunk/csp/data/ui/tutorials/
   trunk/csp/data/ui/tutorials/__init__.py
   trunk/csp/data/ui/tutorials/index.xml
   trunk/csp/data/ui/tutorials/takeoff/
   trunk/csp/data/ui/tutorials/takeoff/__init__.py
   trunk/csp/data/ui/tutorials/takeoff/help.xml
   trunk/csp/data/ui/tutorials/takeoff/mission.xml
   trunk/csp/data/ui/tutorials/takeoff/takeoff.py
   trunk/csp/data/ui/tutorials/takeoff/takeoff_speed.png
Removed:
   trunk/csp/data/ui/themes/default/images/Thumbs.db
   trunk/csp/data/ui/tutorials/__init__.py
   trunk/csp/data/ui/tutorials/index.xml
   trunk/csp/data/ui/tutorials/takeoff/
   trunk/csp/data/ui/tutorials/takeoff/__init__.py
   trunk/csp/data/ui/tutorials/takeoff/help.xml
   trunk/csp/data/ui/tutorials/takeoff/mission.xml
   trunk/csp/data/ui/tutorials/takeoff/takeoff.py
   trunk/csp/data/ui/tutorials/takeoff/takeoff_speed.png
Modified:
   trunk/csp/cspsim/CSPSim.cpp
   trunk/csp/cspsim/CSPSim.h
   trunk/csp/cspsim/GameScreen.cpp
   trunk/csp/cspsim/SConscript
   trunk/csp/cspsim/swig/CSPSim.i
   trunk/csp/cspsim/wf/CheckBox.cpp
   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/Image.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/ResourceLocator.h
   trunk/csp/cspsim/wf/Serialization.cpp
   trunk/csp/cspsim/wf/SingleControlContainer.cpp
   trunk/csp/cspsim/wf/Style.h
   trunk/csp/cspsim/wf/StyleBuilder.cpp
   trunk/csp/cspsim/wf/StyleBuilder.h
   trunk/csp/cspsim/wf/Tab.cpp
   trunk/csp/cspsim/wf/TableControlContainer.cpp
   trunk/csp/cspsim/wf/Window.cpp
   trunk/csp/cspsim/wf/Window.h
   trunk/csp/cspsim/wf/WindowManager.cpp
   trunk/csp/data/ui/help/aircraft_controls.xml
   trunk/csp/data/ui/help/f16_first_steps.xml
   trunk/csp/data/ui/help/index.xml
   trunk/csp/data/ui/help/joystick.xml
   trunk/csp/data/ui/help/mouse.xml
   trunk/csp/data/ui/help/view_controls.xml
   trunk/csp/data/ui/library/index.xml
   trunk/csp/data/ui/localization/english/global.xml
   trunk/csp/data/ui/localization/german/global.xml
   trunk/csp/data/ui/localization/svenska/global.xml
   trunk/csp/data/ui/scripts/gamescreenmanager.py
   trunk/csp/data/ui/scripts/windows/mainmenu.py
   trunk/csp/data/ui/themes/default/main_menu.xml
   trunk/csp/data/ui/themes/default/messagebox.xml
   trunk/csp/data/ui/themes/default/options.xml
   trunk/csp/data/ui/themes/default/pause.xml
   trunk/csp/data/ui/themes/default/quit_resume.xml
   trunk/csp/data/ui/themes/default/styles.xml
   trunk/csp/data/ui/themes/default/topmenu.xml
   trunk/csp/data/ui/window_document.xsd
   trunk/csp/tools/hid/maps/aircraft-core.map
Log:
Merged first_tutorial branch into the trunk. The following changes is included:
 * A very simple tutorial where you are required to take off. This tutorial
   is starting in the middle of the day and you have a help page docked to
   the right of the screen with needed information to complete it.
 * General and object statistics isn't displayed as default. They are still 
   available using F12 key.

Changes to the csp::wf::Style object:
 * Converted to a class from a struct. 
 * Now inherits from the csp::Referenced
 * All style members are now accessed with set and get methods.
 * Added width and height. Height, width, top and left
   can be set with percentage. For example 30% width.
 * Uses the serialize method when comparing style objects.

These changes makes it possible for the Style object to send 
signals when something change (not implemented yet). The
Control that owns the style object can listen to these signals
and rebuild the geometry when width, background color etc
changes.

Other changes:
 * Removed some common width, height and position from window xml files
   and placed them in css document.
 * The StyleBuilder class is also using the serialize method to build the new style object.



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

Diff omitted (188190 bytes).