diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-07 19:07:04 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-07 19:07:04 +0100 |
| commit | a3157908d23fd711ea96797dffce064953cb8fb6 (patch) | |
| tree | 2f237b21118461a9948f3ccb829f62038564dedf /src/main.cpp | |
| parent | 1208d5383a9bfd03f338ccf71fb9764790b2e1a9 (diff) | |
| download | mana-a3157908d23fd711ea96797dffce064953cb8fb6.tar.gz mana-a3157908d23fd711ea96797dffce064953cb8fb6.tar.bz2 mana-a3157908d23fd711ea96797dffce064953cb8fb6.tar.xz mana-a3157908d23fd711ea96797dffce064953cb8fb6.zip | |
Nicer way of indicating that we're waiting on the server
No longer a dialog with an annoying progress bar (due to going back and
forth), but rather a progress indicator that integrates better with the
background.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/main.cpp b/src/main.cpp index aec59ce5..b886545b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -572,7 +572,6 @@ static void parseOptions(int argc, char *argv[], Options &options) while (optind < argc) { - int result = getopt_long(argc, argv, optstring, long_options, NULL); if (result == -1) @@ -925,7 +924,8 @@ int main(int argc, char *argv[]) case STATE_CONNECT_SERVER: logger->log("State: CONNECT SERVER"); - currentDialog = new ConnectionDialog(STATE_SWITCH_SERVER); + currentDialog = new ConnectionDialog( + _("Connecting to server"), STATE_SWITCH_SERVER); break; case STATE_LOGIN: @@ -951,7 +951,8 @@ int main(int argc, char *argv[]) case STATE_LOGIN_ATTEMPT: logger->log("State: LOGIN ATTEMPT"); accountLogin(&loginData); - currentDialog = new ConnectionDialog(STATE_SWITCH_SERVER); + currentDialog = new ConnectionDialog( + _("Logging in"), STATE_SWITCH_SERVER); break; case STATE_WORLD_SELECT: @@ -983,7 +984,8 @@ int main(int argc, char *argv[]) case STATE_WORLD_SELECT_ATTEMPT: logger->log("State: WORLD SELECT ATTEMPT"); - currentDialog = new ConnectionDialog(STATE_WORLD_SELECT); + currentDialog = new ConnectionDialog( + _("Entering game world"), STATE_WORLD_SELECT); break; case STATE_UPDATE: @@ -1039,7 +1041,9 @@ int main(int argc, char *argv[]) case STATE_GET_CHARACTERS: logger->log("State: GET CHARACTERS"); Net::getCharHandler()->getCharacters(); - currentDialog = new ConnectionDialog(STATE_SWITCH_SERVER); + currentDialog = new ConnectionDialog( + _("Requesting characters"), + STATE_SWITCH_SERVER); break; case STATE_CHAR_SELECT: @@ -1072,7 +1076,9 @@ int main(int argc, char *argv[]) logger->log("State: CONNECT GAME"); Net::getGameHandler()->connect(); - currentDialog = new ConnectionDialog(STATE_SWITCH_CHARACTER); + currentDialog = new ConnectionDialog( + _("Connecting to the game server"), + STATE_SWITCH_CHARACTER); break; case STATE_GAME: @@ -1124,7 +1130,8 @@ int main(int argc, char *argv[]) case STATE_REGISTER_PREP: logger->log("State: REGISTER_PREP"); Net::getLoginHandler()->getRegistrationDetails(); - currentDialog = new ConnectionDialog(STATE_LOGIN); + currentDialog = new ConnectionDialog( + _("Requesting registration details"), STATE_LOGIN); break; case STATE_REGISTER: |