[Widelands-cvs] SF.net SVN: widelands:[3296] trunk
Status: Beta
Brought to you by:
sirver
Menu
▾
▴
[Widelands-cvs] SF.net SVN: widelands:[3296] trunk
|
From: <nas...@us...> - 2008-09-03 18:54:44
|
Revision: 3296
http://widelands.svn.sourceforge.net/widelands/?rev=3296&view=rev
Author: nasenbaer_peter
Date: 2008-09-03 18:54:36 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
* Commit two patches by velo - one fixing a crash and one fixing behaviour of mouse in editor
* Fix some texts in editor-info-tool
Modified Paths:
--------------
trunk/po/de_DE/widelands.po
trunk/src/editor/editorinteractive.cc
trunk/src/editor/tools/editor_info_tool.cc
trunk/src/mapview.cc
Modified: trunk/po/de_DE/widelands.po
===================================================================
--- trunk/po/de_DE/widelands.po 2008-09-03 17:26:41 UTC (rev 3295)
+++ trunk/po/de_DE/widelands.po 2008-09-03 18:54:36 UTC (rev 3296)
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Widelands svn3287\n"
+"Project-Id-Version: Widelands svn3295\n"
"Report-Msgid-Bugs-To: wid...@li...\n"
-"POT-Creation-Date: 2008-08-30 22:17+0200\n"
-"PO-Revision-Date: 2008-08-30 22:01+0100\n"
+"POT-Creation-Date: 2008-09-03 20:50+0200\n"
+"PO-Revision-Date: 2008-09-03 20:50+0100\n"
"Last-Translator: Peter Schwanemann <nas...@so...>\n"
"Language-Team: German <wid...@li...>\n"
"MIME-Version: 1.0\n"
@@ -244,7 +244,7 @@
msgstr "Spieler"
#: ../../src/wlapplication.cc:1413 ../../src/nethost.cc:300
-#: ../../src/netclient.cc:136
+#: ../../src/netclient.cc:137
msgid "Preparing game"
msgstr "Bereite Spiel vor"
@@ -350,49 +350,49 @@
msgid "Client sent unknown command number %u"
msgstr "Der Client hat einen unbekannten Befehl Nummer %u gesendet."
-#: ../../src/netclient.cc:101
+#: ../../src/netclient.cc:102
msgid "Client has left the game."
msgstr "Der Client hat das Spiel verlassen."
-#: ../../src/netclient.cc:164
+#: ../../src/netclient.cc:165
msgid "Client crashed and performed an emergency save."
msgstr "Der Client ist abgestürzt und hat eine Notfallspeicherung durchgeführt."
-#: ../../src/netclient.cc:312
+#: ../../src/netclient.cc:313
msgid "Server sent a player update for a player that does not exist."
msgstr "Der Server hat ein Spieler-Update für einen nicht existenten Spieler gesendet."
-#: ../../src/netclient.cc:382
+#: ../../src/netclient.cc:383
#, c-format
msgid "Expected a HELLO packet from server, but received command number %u. Maybe the server is running a different version of Widelands?"
msgstr "Habe ein HELLO Paket vom Server erwartet, aber die Anweisung Nummer %u erhalten. Vielleicht verwendet der Server eine andere Widelands-Version?"
-#: ../../src/netclient.cc:388
+#: ../../src/netclient.cc:389
msgid "Server uses a different protocol version"
msgstr "Der Server benutzt eine andere Protokollversion"
-#: ../../src/netclient.cc:431
+#: ../../src/netclient.cc:432
msgid "Unexpectedly received LAUNCH command from server."
msgstr "Ich habe unerwartet ein LAUNCH Befehl vom Server erhalten."
-#: ../../src/netclient.cc:448
+#: ../../src/netclient.cc:449
msgid "Server sent a PLAYERCOMMAND even though no game is running."
msgstr "Der Server hat ein PLAYERCOMMAND gesendet, obwohl noch kein Spiel läuft."
-#: ../../src/netclient.cc:459
+#: ../../src/netclient.cc:460
msgid "Server sent a SYNCREQUEST even though no game is running."
msgstr "Der Server hat ein SYNCREQUEST gesendet, obwohl noch kein Spiel läuft."
-#: ../../src/netclient.cc:480
+#: ../../src/netclient.cc:481
#, c-format
msgid "Server sent an unknown command (command number %u)"
msgstr "Der Server eine unbekannte Anweisungen (Anweisung Nummer: %u) gesendet"
-#: ../../src/netclient.cc:509
+#: ../../src/netclient.cc:510
msgid "Server sent malformed commands: "
msgstr "Der Server hat unverständliche Anweisungen gesendet:"
-#: ../../src/netclient.cc:539
+#: ../../src/netclient.cc:540
msgid " An automatic savegame will be created."
msgstr " Eine automatische Spielsicherung wird durchgeführt."
@@ -1753,10 +1753,12 @@
#: ../../src/editor/tools/editor_info_tool.cc:96
#, c-format
msgid ""
-"Size: %ix%i\n"
+"\n"
+" Size: %ix%i\n"
" Author: "
msgstr ""
-"Größe: %ix%i\n"
+"\n"
+" Größe: %ix%i\n"
" Autor: "
#: ../../src/editor/tools/editor_info_tool.cc:99
@@ -1766,7 +1768,7 @@
" Descr: "
msgstr ""
"\n"
-"Beschr: "
+" Beschr: "
#: ../../src/editor/tools/editor_info_tool.cc:103
#, c-format
@@ -1791,7 +1793,7 @@
" Author: "
msgstr ""
"\n"
-"Autor: "
+" Autor: "
#: ../../src/editor/ui_menus/trigger_null_option_menu.cc:47
msgid "Null Trigger Options"
Modified: trunk/src/editor/editorinteractive.cc
===================================================================
--- trunk/src/editor/editorinteractive.cc 2008-09-03 17:26:41 UTC (rev 3295)
+++ trunk/src/editor/editorinteractive.cc 2008-09-03 18:54:36 UTC (rev 3296)
@@ -253,7 +253,12 @@
const bool target_changed = tools.current().operates_on_triangles() ?
sel.triangle != get_sel_pos().triangle : sel.node != get_sel_pos().node;
Interactive_Base::set_sel_pos(sel);
- if (target_changed and SDL_GetMouseState(0, 0) & SDL_BUTTON(SDL_BUTTON_LEFT))
+ int32_t mask = SDL_BUTTON_LMASK;
+#ifdef __APPLE__
+ // workaround for SDLs middle button emulation
+ mask |= SDL_BUTTON_MMASK;
+#endif
+ if (target_changed and SDL_GetMouseState(0, 0) & mask)
map_clicked();
}
Modified: trunk/src/editor/tools/editor_info_tool.cc
===================================================================
--- trunk/src/editor/tools/editor_info_tool.cc 2008-09-03 17:26:41 UTC (rev 3295)
+++ trunk/src/editor/tools/editor_info_tool.cc 2008-09-03 18:54:36 UTC (rev 3296)
@@ -44,7 +44,7 @@
(&parent, 30, 30, 400, 200, _("Field Information"));
UI::Multiline_Textarea * const multiline_textarea =
new UI::Multiline_Textarea
- (w, 0, 0, w->get_inner_w(), w->get_inner_h(), 0);
+ (w, 0, 0, w->get_inner_w(), w->get_inner_h());
Widelands::Field & f = map[center.node];
@@ -93,7 +93,7 @@
buf += map.get_name();
snprintf
(buf1, sizeof(buf1),
- _("Size: %ix%i\n Author: "), map.get_width(), map.get_height());
+ _("\n Size: %ix%i\n Author: "), map.get_width(), map.get_height());
buf += buf1;
buf += map.get_author ();
buf += _("\n Descr: ");
Modified: trunk/src/mapview.cc
===================================================================
--- trunk/src/mapview.cc 2008-09-03 17:26:41 UTC (rev 3295)
+++ trunk/src/mapview.cc 2008-09-03 18:54:36 UTC (rev 3296)
@@ -137,7 +137,14 @@
* Right-release: disable dragging
* Left-press: field action window
*/
-bool Map_View::handle_mousepress(const Uint8 btn, int32_t x, int32_t y) {
+bool Map_View::handle_mousepress( Uint8 btn, int32_t x, int32_t y) {
+#ifdef __APPLE__
+ // SDL does on Mac hardcoded middle mouse button emulation (alt+left).
+ // This interferes with the editor, which is using alt+left click for third
+ // tool. So just handle middle mouse button like left one.
+ if (btn == SDL_BUTTON_MIDDLE)
+ btn = SDL_BUTTON_LEFT;
+#endif
if (btn == SDL_BUTTON_LEFT) {
track_sel(Point(x, y));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|