From bb0257f9318c099a3ed5c061710e448e68517a96 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 30 May 2009 20:34:18 +0200 Subject: Application name should not be translated --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 4fcd41dd..a2db380c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -415,7 +415,8 @@ static void initEngine(const Options &options) SDL_EnableUNICODE(1); SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); - SDL_WM_SetCaption(branding.getValue("appName", "The Mana World").c_str(), NULL); + SDL_WM_SetCaption(branding.getValue("appName", "The Mana World").c_str(), + NULL); ResourceManager *resman = ResourceManager::getInstance(); @@ -595,7 +596,7 @@ static void printHelp() static void printVersion() { - std::cout << strprintf(_("The Mana World %s"), FULL_VERSION) << std::endl; + std::cout << strprintf("The Mana World %s", FULL_VERSION) << std::endl; } static void parseOptions(int argc, char *argv[], Options &options) -- cgit v1.2.3-70-g09d2 From ea19cc001837b5ab4625d0c7f100b445e396eaad Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 30 May 2009 20:34:58 +0200 Subject: Fixed the --home-dir command line option on MacOS X --- src/main.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index a2db380c..16cbbdfe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -313,25 +313,24 @@ static void setUpdatesDir() static void initHomeDir(const Options &options) { homeDir = options.homeDir; - + if (homeDir.empty()) { - homeDir = std::string(PHYSFS_getUserDir()) + - "/." + - branding.getValue("appShort", "tmw"); +#ifdef __APPLE__ + // Use Application Directory instead of .tmw + homeDir = std::string(PHYSFS_getUserDir()) + + "/Library/Application Support/" + + branding.getValue("appName", "The Mana World"); +#else + homeDir = std::string(PHYSFS_getUserDir()) + + "/." + branding.getValue("appShort", "tmw"); +#endif } #if defined WIN32 if (!CreateDirectory(homeDir.c_str(), 0) && GetLastError() != ERROR_ALREADY_EXISTS) -#elif defined __APPLE__ - // Use Application Directory instead of .tmw - homeDir = std::string(PHYSFS_getUserDir()) + - "/Library/Application Support/" + - branding.getValue("appName", "The Mana World"); - if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && - (errno != EEXIST)) #else - // Checking if /home/user/.tmw folder exists. + // Create home directory if it doesn't exist already if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) && (errno != EEXIST)) #endif -- cgit v1.2.3-70-g09d2 From a5bd2cc819fe36a05d5f8de0bb4a7e368706b1c4 Mon Sep 17 00:00:00 2001 From: Dennis Friis Date: Sat, 30 May 2009 20:28:04 +0200 Subject: Fix offsets on party window status indicator buttons. Patch by QOAL (cherry picked from commit 914a7703371a69e6d68b2a8a768f82f62fe11476) --- src/gui/widgets/avatar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp index f7273c75..cf6df0b6 100644 --- a/src/gui/widgets/avatar.cpp +++ b/src/gui/widgets/avatar.cpp @@ -59,9 +59,9 @@ Avatar::Avatar(): mLabel->adjustSize(); mStatus = new Icon(avatarStatusOffline); - mStatus->setSize(12, 12); + mStatus->setSize(10, 10); - add(mStatus, 1, (mLabel->getHeight() - 12) / 2); + add(mStatus, 4, (mLabel->getHeight() - 10) / 2); add(mLabel, 16, 0); setSize(250, mLabel->getHeight()); -- cgit v1.2.3-70-g09d2 From a37130214eb8698a1f8f55d2b7b0bd2b0aac4ad3 Mon Sep 17 00:00:00 2001 From: Dennis Friis Date: Sat, 30 May 2009 20:33:35 +0200 Subject: Move the name label a few pixels. (cherry picked from commit dd68dea5b808070546433b06f17597fb46db33b7) --- src/gui/widgets/avatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp index cf6df0b6..faaf22ab 100644 --- a/src/gui/widgets/avatar.cpp +++ b/src/gui/widgets/avatar.cpp @@ -62,7 +62,7 @@ Avatar::Avatar(): mStatus->setSize(10, 10); add(mStatus, 4, (mLabel->getHeight() - 10) / 2); - add(mLabel, 16, 0); + add(mLabel, 18, 0); setSize(250, mLabel->getHeight()); -- cgit v1.2.3-70-g09d2