diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg index 394a31e6f..eece51360 100644 --- a/code/ryzom/client/client_default.cfg +++ b/code/ryzom/client/client_default.cfg @@ -5,7 +5,7 @@ ////////////////////////// -// If you set this variable to 1, your client.cfg will be overwritten when you quit the client. +// If you set this variable to 1, your client.cfg will be overwritten when you quit the client. // You will loose all the comments and identation in this file. SaveConfig = 1; @@ -59,21 +59,21 @@ LanguageCode = "en"; // english XMLInputFile = "input_config_v3.xml"; -XMLLoginInterfaceFiles = { - "login_config.xml", - "login_widgets.xml", +XMLLoginInterfaceFiles = { + "login_config.xml", + "login_widgets.xml", "login_main.xml", "login_keys.xml", }; -XMLOutGameInterfaceFiles = { - "out_v2_config.xml", - "out_v2_widgets.xml", +XMLOutGameInterfaceFiles = { + "out_v2_config.xml", + "out_v2_widgets.xml", "out_v2_connect.xml", "out_v2_intro.xml", "out_v2_select.xml", "out_v2_appear.xml", - "out_v2_location.xml", + "out_v2_location.xml", "out_v2_crash.xml", "out_v2_hierarchy.xml", "out_v2_keys.xml", @@ -345,7 +345,7 @@ ScreenShotHeight = 0; ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) // Read : "ID", "R G B A MODE [FX]" -SystemInfoColors = +SystemInfoColors = { // OLD STUFF Here for compatibility "RG", "0 0 0 255 normal", // Black to see when there is an error @@ -391,22 +391,22 @@ SystemInfoColors = }; PrintfCommands = { - "52", "15", "55 55 0 255", "28", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", + "52", "15", "55 55 0 255", "28", "uiChapterV", "624", + "428", "0 0 0 255", "18", "", "624", "378", + "0 0 0 255", "14", "", "644", "278", "0 0 0 255", + "18", "", "52", "17", "255 255 255 255", "28", + "uiChapterV", "622", "430", "255 255 255 255", "18", "", + "622", "380", "255 255 255 255", "14", "", "642", "280", "255 255 255 255", "18", "" }; PrintfCommandsFreeTrial = { - "52", "15", "55 55 0 255", "28", "uiChapterV", "624", - "428", "0 0 0 255", "18", "", "624", "378", - "0 0 0 255", "14", "", "644", "278", "0 0 0 255", - "18", "", "52", "17", "255 255 255 255", "28", - "uiChapterV", "622", "430", "255 255 255 255", "18", "", - "622", "380", "255 255 255 255", "14", "", "642", + "52", "15", "55 55 0 255", "28", "uiChapterV", "624", + "428", "0 0 0 255", "18", "", "624", "378", + "0 0 0 255", "14", "", "644", "278", "0 0 0 255", + "18", "", "52", "17", "255 255 255 255", "28", + "uiChapterV", "622", "430", "255 255 255 255", "18", "", + "622", "380", "255 255 255 255", "14", "", "642", "280", "255 255 255 255", "18", "" }; @@ -436,11 +436,11 @@ R2EDReloadFiles = { "r2_components.lua", "r2_core.lua", "r2_features_default.lua", - "r2_features_fauna.lua", + "r2_features_fauna.lua", "r2_features_npc_groups.lua", "r2_palette.lua", "r2_scenario.lua", - "r2_ui.lua" + "r2_ui.lua" }; XMLInterfaceFiles = { @@ -477,21 +477,21 @@ XMLInterfaceFiles = { }; XMLR2EDInterfaceFiles = -{ +{ "r2ed.xml", "r2_triggers.xml", "r2_logic_entities.xml", "r2ed_acts.xml", "r2ed_scenario.xml", "r2ed_connect.xml" -}; +}; FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth -// Hardware cursor textures +// Hardware cursor textures // These will be extracted from the corresponding packed ui .tga files when they are loaded -// * +// * // * individual .tga files for hardware cursor bitmap not looked for, and not supported yet HardwareCursors = { @@ -556,7 +556,7 @@ ScenarioTypes = {"so_newbie_training","so_story_telling","so_mistery","so_hack_s ScenarioLanguages = {"fr","de","en","other_lang"}; // Map each language to a forum help page -HelpPages = +HelpPages = { "fr=http://forums.ryzom.com/forum/showthread.php?t=29130", "en=http://forums.ryzom.com/forum/showthread.php?t=29129", @@ -568,7 +568,7 @@ HelpPages = WebIgMainDomain = "app.ryzom.com"; WebIgTrustedDomains = { - "api.ryzom.com", "app.ryzom.com" + "api.ryzom.com", "app.ryzom.com" }; PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload"; diff --git a/code/ryzom/tools/client/ryzom_installer/res/background.png b/code/ryzom/tools/client/ryzom_installer/res/background.png index 26548eaa6..c883dfca2 100644 Binary files a/code/ryzom/tools/client/ryzom_installer/res/background.png and b/code/ryzom/tools/client/ryzom_installer/res/background.png differ diff --git a/code/ryzom/tools/client/ryzom_installer/res/modern-header.bmp b/code/ryzom/tools/client/ryzom_installer/res/modern-header.bmp deleted file mode 100644 index dcb0c3c65..000000000 Binary files a/code/ryzom/tools/client/ryzom_installer/res/modern-header.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/ryzom_installer/res/modern-wizard.bmp b/code/ryzom/tools/client/ryzom_installer/res/modern-wizard.bmp deleted file mode 100644 index 9bc88799e..000000000 Binary files a/code/ryzom/tools/client/ryzom_installer/res/modern-wizard.bmp and /dev/null differ diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 1e1f067e6..5c04fd790 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -384,7 +384,7 @@ void COperationDialog::extractBnpClient() QProcess process; QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("RYZOM_CLIENT", QDir::toNativeSeparators(destinationDirectory + "/ryzom_client_r.exe")); + env.insert("RYZOM_CLIENT", QDir::toNativeSeparators(destinationDirectory + "/" + server.clientFilename)); env.insert("UNPACKPATH", QDir::toNativeSeparators(destinationDirectory + "/unpack")); env.insert("ROOTPATH", QDir::toNativeSeparators(destinationDirectory)); env.insert("STARTUPPATH", ""); diff --git a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui index 8ed606d37..c123a62f4 100644 --- a/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui +++ b/code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 627 - 479 + 579 + 406 @@ -97,7 +97,7 @@ p, li { white-space: pre-wrap; } 0 0 - 627 + 579 21