[Widelands-dev] [Merge] lp:~widelands-dev/widelands/handle_tab into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/handle_tab into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1232392 in widelands: "Allow tabbing in forms"
https://bugs.launchpad.net/widelands/+bug/1232392
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/handle_tab/+merge/209406
1) Do not put a control char on tab press into input boxes
2) Allow tabbing between input fields (e.g. metaserver login)
3) some code style fixes
4) Small fix in CMakelist.txt to avoid redundant appending of linker flag on
each generate
--
https://code.launchpad.net/~widelands-dev/widelands/handle_tab/+merge/209406
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/handle_tab into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-01-19 11:47:38 +
+++ CMakeLists.txt 2014-03-05 09:28:15 +
@@ -309,7 +309,7 @@
endif (DEFINED MSVC)
IF (MINGW)
- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+ set (CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
message (STATUS "Enabled large address awareness on mingw32")
endif (MINGW)
=== modified file 'src/logic/playercommand.h'
--- src/logic/playercommand.h 2014-02-22 18:04:02 +
+++ src/logic/playercommand.h 2014-03-05 09:28:15 +
@@ -132,7 +132,8 @@
};
struct Cmd_BuildRoad:public PlayerCommand {
- Cmd_BuildRoad() : PlayerCommand(), path(nullptr), start(), nsteps(0), steps(nullptr) {} // For savegame loading
+ Cmd_BuildRoad() :
+ PlayerCommand(), path(nullptr), start(), nsteps(0), steps(nullptr) {} // For savegame loading
Cmd_BuildRoad (int32_t, int32_t, Path &);
Cmd_BuildRoad (StreamRead &);
=== modified file 'src/map_io/widelands_map_scripting_data_packet.cc'
--- src/map_io/widelands_map_scripting_data_packet.cc 2014-02-22 14:33:44 +
+++ src/map_io/widelands_map_scripting_data_packet.cc 2014-03-05 09:28:15 +
@@ -31,7 +31,7 @@
namespace Widelands {
namespace {
-const int SCRIPTING_DATA_PACKET_VERSION=1;
+const int SCRIPTING_DATA_PACKET_VERSION = 1;
} // namespace
/*
*
@@ -53,9 +53,10 @@
// wise this makes no sense.
upcast(Game, g, &egbase);
Widelands::FileRead fr;
- if (g and fr.TryOpen(fs, "scripting/globals.dump")) {
- const uint32_t sentinel = fr.Unsigned32();
- const uint32_t packet_version = fr.Unsigned32();
+ if (g and fr.TryOpen(fs, "scripting/globals.dump"))
+ {
+ const uint32_t sentinel = fr.Unsigned32();
+ const uint32_t packet_version = fr.Unsigned32();
if (sentinel != 0xDEADBEEF && packet_version != SCRIPTING_DATA_PACKET_VERSION) {
throw game_data_error(
"This savegame is from an older version of Widelands and can not be loaded any more.");
=== modified file 'src/network/netclient.h'
--- src/network/netclient.h 2014-02-22 18:04:02 +
+++ src/network/netclient.h 2014-03-05 09:28:15 +
@@ -79,9 +79,11 @@
uint32_t maxplayers,
bool savegame = false) override;
virtual void setPlayerState(uint8_t number, PlayerSettings::State state) override;
- virtual void setPlayerAI (uint8_t number, const std::string & ai, bool const random_ai = false) override;
+ virtual void setPlayerAI
+ (uint8_t number, const std::string & ai, bool const random_ai = false) override;
virtual void nextPlayerState (uint8_t number) override;
- virtual void setPlayerTribe (uint8_t number, const std::string & tribe, bool const random_tribe = false) override;
+ virtual void setPlayerTribe
+ (uint8_t number, const std::string & tribe, bool const random_tribe = false) override;
virtual void setPlayerInit (uint8_t number, uint8_t index) override;
virtual void setPlayerName (uint8_t number, const std::string & name) override;
virtual void setPlayer (uint8_t number, PlayerSettings ps) override;
=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc 2014-02-22 18:04:02 +
+++ src/network/nethost.cc 2014-03-05 09:28:15 +
@@ -211,7 +211,8 @@
h->setPlayerState(number, newstate, true);
}
- virtual void setPlayerTribe(uint8_t const number, const std::string & tribe, bool const random_tribe) override
+ virtual void setPlayerTribe
+ (uint8_t const number, const std::string & tribe, bool const random_tribe) override
{
if (number >= h->settings().players.size())
return;
=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc 2013-07-26 20:19:36 +
+++ src/ui_basic/editbox.cc 2014-03-05 09:28:15 +
@@ -226,9 +226,12 @@
switch (code.sym) {
case SDLK_ESCAPE:
cancel();
- return true;
+ return true;
+
+ case SDLK_TAB:
+ //let the panel handle the tab key
+ return false;
- case SDLK_KP_ENTER:
case SDLK_RETURN:
// Save history if active and text
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/handle_tab into lp:widelands
Review: Needs Fixing I just noticed a little misinterpretation: case SDLK_KP_ENTER is actually not an empty switch case. It just falls through to case SDLK_RETURN to handle the Enter key on the keypad the same way as the Return key. A case is only redundant if it falls through to the default case. Even a case foo: break; might be useful as it prevents the default case from execution. -- https://code.launchpad.net/~widelands-dev/widelands/handle_tab/+merge/209406 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/handle_tab. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/handle_tab into lp:widelands
You are right, i've put back that case distinction. -- https://code.launchpad.net/~widelands-dev/widelands/handle_tab/+merge/209406 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/handle_tab. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/i18n into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/i18n into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/i18n/+merge/209212 -- https://code.launchpad.net/~widelands-dev/widelands/i18n/+merge/209212 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/i18n. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
We merged the i18n branch - so this merge request is superseeded by this merge and therefore rejected. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/gci18nfixes into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/handle_tab into lp:widelands
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/handle_tab/+merge/209406 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/handle_tab. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [recipe build #666256] of ~widelands-dev widelands-daily-precise in precise: Failed to build
* State: Failed to build * Recipe: widelands-dev/widelands-daily-precise * Archive: widelands-dev/widelands-daily-precise * Distroseries: precise * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+recipebuild/666256/+files/buildlog.txt.gz * Upload Log: * Builder: https://launchpad.net/builders/rhenium -- https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+recipebuild/666256 Your team Widelands Developers is the requester of the build. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
