Author: mordante
Date: Sun Mar 6 09:28:23 2011
New Revision: 48778
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48778&view=rev
Log:
Revert the entire new messages stuff.
The main reason for reverting are:
The stuff has hampered my development for almost a month now, including
forcing me to delay things I need to/want to work on.
The recruit dialog looks very ugly on 1024x768 since it doesn't fit entirely
on the screen. It's still usable, but lowering the height of the main window
makes the dialog unusable.
The code includes several new wml errors:
"Invalid WML found: Window builder: parsing resolution tip with empty 'id'
field. Will become mandatory in 1.9.7. (4)"
The unit tests are broken, and instead of being fixed properly their code is
being `fixed' by disabling tests. r48769 indicates it should fix the unit
tests, but it doesn't so the code seems untested. Which means I still can't
use the tests for other code I want to commit.
In r48739 fendrin commits not working code with the goal to force me to help
him, which I consider bad practice, show the code in a pastebin if you want
help. I want to work on things when _I_ choose to, and not being coerced to
by committing bad code.
Commit r48751 throws private _GUI* macros in a global header, which might
break other code in unexpected ways. The file modified even contains the
documentation regarding how to use GUI* and _GUI* macros. And another remark
that I should look at fixing the issue.
So I had enough of this stuff; it's incomplete, buggy and hampers the work
of at least one other developer for several weeks now.
Reverts fendrin's commits:
48465, 48471, 48485, 48492, 48493, 48494, 48495, 48503, 48504, 48528, 48529,
48708, 48730, 48731, 48732, 48733, 48735, 48736, 48739, 48741, 48742, 48743,
48745, 48746, 48747, 48748, 48749, 48750, 48751, 48752, 48753, 48754, 48759,
48760, 48761, 48763, 48769, 48771, 48772.
Also reverts a build system change that is no longer needed:
48762
Added:
trunk/data/gui/default/window/wml_message.cfg
- copied, changed from r48751,
trunk/data/gui/default/window/wml_message.cfg
trunk/src/gui/dialogs/wml_message.cpp
- copied, changed from r48747, trunk/src/gui/dialogs/wml_message.cpp
trunk/src/gui/dialogs/wml_message.hpp
- copied, changed from r48747, trunk/src/gui/dialogs/wml_message.hpp
Removed:
trunk/data/gui/default/widget/image_scaled.cfg
trunk/data/gui/default/window/image_message.cfg
trunk/data/gui/default/window/recruit.cfg
trunk/src/gui/dialogs/image_message/
Modified:
trunk/data/gui/default/macros/_initial.cfg
trunk/projectfiles/CodeBlocks/wesnoth.cbp
trunk/projectfiles/VC9/wesnoth.vcproj
trunk/src/CMakeLists.txt
trunk/src/SConscript
trunk/src/game_events.cpp
trunk/src/menu_events.cpp
trunk/src/tests/gui/test_gui2.cpp
trunk/src/unit.cpp
trunk/src/unit.hpp
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/data/gui/default/macros/_initial.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/macros/_initial.cfg?rev=48778&r1=48777&r2=48778&view=diff
Removed: trunk/data/gui/default/widget/image_scaled.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/image_scaled.cfg?rev=48777&view=auto
Removed: trunk/data/gui/default/window/image_message.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/image_message.cfg?rev=48777&view=auto
Removed: trunk/data/gui/default/window/recruit.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/recruit.cfg?rev=48777&view=auto
Copied: trunk/data/gui/default/window/wml_message.cfg (from r48751,
trunk/data/gui/default/window/wml_message.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/wml_message.cfg?p2=trunk/data/gui/default/window/wml_message.cfg&p1=trunk/data/gui/default/window/wml_message.cfg&r1=48751&r2=48778&rev=48778&view=diff
Modified: trunk/projectfiles/CodeBlocks/wesnoth.cbp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/wesnoth.cbp?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/projectfiles/VC9/wesnoth.vcproj
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/VC9/wesnoth.vcproj?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/SConscript
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/SConscript?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=48778&r1=48777&r2=48778&view=diff
Copied: trunk/src/gui/dialogs/wml_message.cpp (from r48747,
trunk/src/gui/dialogs/wml_message.cpp)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/wml_message.cpp?p2=trunk/src/gui/dialogs/wml_message.cpp&p1=trunk/src/gui/dialogs/wml_message.cpp&r1=48747&r2=48778&rev=48778&view=diff
Copied: trunk/src/gui/dialogs/wml_message.hpp (from r48747,
trunk/src/gui/dialogs/wml_message.hpp)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/wml_message.hpp?p2=trunk/src/gui/dialogs/wml_message.hpp&p1=trunk/src/gui/dialogs/wml_message.hpp&r1=48747&r2=48778&rev=48778&view=diff
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/tests/gui/test_gui2.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/gui/test_gui2.cpp?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/unit.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.cpp?rev=48778&r1=48777&r2=48778&view=diff
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=48778&r1=48777&r2=48778&view=diff
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
