diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index 04213d34b..c56934662 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -263,10 +263,12 @@ int main(int argc, char **argv) pBtmp = new NLMISC::CBitmap; NLMISC::CIFile inFile; - if (!inFile.open(AllMapNames[i])) throw NLMISC::Exception("Unable to open " + AllMapNames[i]); + if (!inFile.open(AllMapNames[i])) throw NLMISC::Exception(toString("Unable to open %s", AllMapNames[i].c_str())); uint8 colors = pBtmp->load(inFile); + if (!colors) throw NLMISC::Exception(toString("%s is not a bitmap", AllMapNames[i].c_str())); + if (pBtmp->getPixelFormat() != CBitmap::RGBA) { outString(toString("Converting %s to RGBA (32 bits), originally using %u bits...", AllMapNames[i].c_str(), (uint)colors)); diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index b8bf5277c..5f2b5da8c 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -1767,7 +1767,7 @@ name="uiOpen" handler="item_text_display" params="ui:interface:edit_custom" /> - + diff --git a/code/ryzom/client/data/gamedev/syui_v3/interaction.lua b/code/ryzom/client/data/mods/syui_v3/interaction.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/interaction.lua rename to code/ryzom/client/data/mods/syui_v3/interaction.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml b/code/ryzom/client/data/mods/syui_v3/syui/compass.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/compass.xml rename to code/ryzom/client/data/mods/syui_v3/syui/compass.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/config.xml b/code/ryzom/client/data/mods/syui_v3/syui/config.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/config.xml rename to code/ryzom/client/data/mods/syui_v3/syui/config.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml b/code/ryzom/client/data/mods/syui_v3/syui/game_config.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/game_config.xml rename to code/ryzom/client/data/mods/syui_v3/syui/game_config.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml b/code/ryzom/client/data/mods/syui_v3/syui/guild.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/guild.xml rename to code/ryzom/client/data/mods/syui_v3/syui/guild.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml b/code/ryzom/client/data/mods/syui_v3/syui/interaction.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/interaction.xml rename to code/ryzom/client/data/mods/syui_v3/syui/interaction.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.lua b/code/ryzom/client/data/mods/syui_v3/syui/player.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/player.lua rename to code/ryzom/client/data/mods/syui_v3/syui/player.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/player.xml b/code/ryzom/client/data/mods/syui_v3/syui/player.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/player.xml rename to code/ryzom/client/data/mods/syui_v3/syui/player.xml diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/syui.lua b/code/ryzom/client/data/mods/syui_v3/syui/syui.lua similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/syui.lua rename to code/ryzom/client/data/mods/syui_v3/syui/syui.lua diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.tga b/code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.tga similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.tga rename to code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.tga diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.txt b/code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.txt similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/texture_interfaces_v3.txt rename to code/ryzom/client/data/mods/syui_v3/syui/texture_interfaces_v3.txt diff --git a/code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml b/code/ryzom/client/data/mods/syui_v3/syui/widgets.xml similarity index 100% rename from code/ryzom/client/data/gamedev/syui_v3/syui/widgets.xml rename to code/ryzom/client/data/mods/syui_v3/syui/widgets.xml diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini index 75aa58e09..04400fbce 100644 --- a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini +++ b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini @@ -1,4 +1,4 @@ -version=1 +version=2 [common] installation_directory= @@ -17,11 +17,12 @@ size=1 id=ryzom_live name=Atys display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" -data_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_data.7z?r=&ts=$TIMESTAMP" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer" +data_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_data.7z?r=&ts=$TIMESTAMP" data_download_filename=ryzom_live_data.7z data_compressed_size=1500000000 data_uncompressed_size=7000000000 -client_download_url="http://downloads.sourceforge.net/project/ryzom/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" +client_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" client_download_filename=ryzom_live_client_$ARCH.7z client_filename_windows=ryzom_client_r.exe client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom diff --git a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp index 38c945ade..8ee369b5c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/configfile.cpp @@ -109,34 +109,7 @@ bool CConfigFile::load(const QString &filename) CServer &server = m_servers[i]; settings.beginGroup(QString("server_%1").arg(i)); - - server.id = settings.value("id").toString(); - server.name = settings.value("name").toString(); - server.displayUrl = settings.value("display_url").toString(); - server.dataDownloadUrl = settings.value("data_download_url").toString(); - server.dataDownloadFilename = settings.value("data_download_filename").toString(); - server.dataCompressedSize = settings.value("data_compressed_size").toULongLong(); - server.dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong(); - server.clientDownloadUrl = settings.value("client_download_url").toString(); - server.clientDownloadFilename = settings.value("client_download_filename").toString(); -#if defined(Q_OS_WIN) - server.clientFilename = settings.value("client_filename_windows").toString(); - server.clientFilenameOld = settings.value("client_filename_old_windows").toString(); - server.configurationFilename = settings.value("configuration_filename_windows").toString(); - server.installerFilename = settings.value("installer_filename_windows").toString(); -#elif defined(Q_OS_MAC) - server.clientFilename = settings.value("client_filename_osx").toString(); - server.clientFilenameOld = settings.value("client_filename_old_osx").toString(); - server.configurationFilename = settings.value("configuration_filename_osx").toString(); - server.installerFilename = settings.value("installer_filename_osx").toString(); -#else - server.clientFilename = settings.value("client_filename_linux").toString(); - server.clientFilenameOld = settings.value("client_filename_old_linux").toString(); - server.configurationFilename = settings.value("configuration_filename_linux").toString(); - server.installerFilename = settings.value("installer_filename_linux").toString(); -#endif - server.comments = settings.value("comments").toString(); - + server.loadFromSettings(settings); settings.endGroup(); } } @@ -154,16 +127,7 @@ bool CConfigFile::load(const QString &filename) CProfile &profile = m_profiles[i]; settings.beginGroup(QString("profile_%1").arg(i)); - - profile.id = settings.value("id").toString(); - profile.name = settings.value("name").toString(); - profile.server = settings.value("server").toString(); - profile.executable = settings.value("executable").toString(); - profile.arguments = settings.value("arguments").toString(); - profile.comments = settings.value("comments").toString(); - profile.desktopShortcut = settings.value("desktop_shortcut").toBool(); - profile.menuShortcut = settings.value("menu_shortcut").toBool(); - + profile.loadFromSettings(settings); settings.endGroup(); } @@ -203,34 +167,7 @@ bool CConfigFile::save() const const CServer &server = m_servers[i]; settings.beginGroup(QString("server_%1").arg(i)); - - settings.setValue("id", server.id); - settings.setValue("name", server.name); - settings.setValue("display_url", server.displayUrl); - settings.setValue("data_download_url", server.dataDownloadUrl); - settings.setValue("data_download_filename", server.dataDownloadFilename); - settings.setValue("data_compressed_size", server.dataCompressedSize); - settings.setValue("data_uncompressed_size", server.dataUncompressedSize); - settings.setValue("client_download_url", server.clientDownloadUrl); - settings.setValue("client_download_filename", server.clientDownloadFilename); -#if defined(Q_OS_WIN) - settings.setValue("client_filename_windows", server.clientFilename); - settings.setValue("client_filename_old_windows", server.clientFilenameOld); - settings.setValue("configuration_filename_windows", server.configurationFilename); - settings.setValue("installer_filename_windows", server.installerFilename); -#elif defined(Q_OS_MAC) - settings.setValue("client_filename_osx", server.clientFilename); - settings.setValue("client_filename_old_osx", server.clientFilenameOld); - settings.setValue("configuration_filename_osx", server.configurationFilename); - settings.setValue("installer_filename_osx", server.installerFilename); -#else - settings.setValue("client_filename_linux", server.clientFilename); - settings.setValue("client_filename_old_linux", server.clientFilenameOld); - settings.setValue("configuration_filename_linux", server.configurationFilename); - settings.setValue("installer_filename_linux", server.installerFilename); -#endif - settings.setValue("comments", server.comments); - + server.saveToSettings(settings); settings.endGroup(); } @@ -244,16 +181,7 @@ bool CConfigFile::save() const const CProfile &profile = m_profiles[i]; settings.beginGroup(QString("profile_%1").arg(i)); - - settings.setValue("id", profile.id); - settings.setValue("name", profile.name); - settings.setValue("server", profile.server); - settings.setValue("executable", profile.executable); - settings.setValue("arguments", profile.arguments); - settings.setValue("comments", profile.comments); - settings.setValue("desktop_shortcut", profile.desktopShortcut); - settings.setValue("menu_shortcut", profile.menuShortcut); - + profile.saveToSettings(settings); settings.endGroup(); } diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp index b80c368df..83cbe4205 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp @@ -25,6 +25,30 @@ const CProfile NoProfile; +void CProfile::loadFromSettings(const QSettings &settings) +{ + id = settings.value("id").toString(); + name = settings.value("name").toString(); + server = settings.value("server").toString(); + executable = settings.value("executable").toString(); + arguments = settings.value("arguments").toString(); + comments = settings.value("comments").toString(); + desktopShortcut = settings.value("desktop_shortcut").toBool(); + menuShortcut = settings.value("menu_shortcut").toBool(); +} + +void CProfile::saveToSettings(QSettings &settings) const +{ + settings.setValue("id", id); + settings.setValue("name", name); + settings.setValue("server", server); + settings.setValue("executable", executable); + settings.setValue("arguments", arguments); + settings.setValue("comments", comments); + settings.setValue("desktop_shortcut", desktopShortcut); + settings.setValue("menu_shortcut", menuShortcut); +} + QString CProfile::getDirectory() const { return CConfigFile::getInstance()->getProfileDirectory() + "/" + id; diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.h b/code/ryzom/tools/client/ryzom_installer/src/profile.h index 1fa901c64..774d55193 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.h +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.h @@ -37,6 +37,9 @@ public: bool desktopShortcut; bool menuShortcut; + void loadFromSettings(const QSettings &settings); + void saveToSettings(QSettings &settings) const; + // helpers QString getDirectory() const; QString getClientFullPath() const; diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.cpp b/code/ryzom/tools/client/ryzom_installer/src/server.cpp index 0a415d0fb..6ce9bf6b8 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/server.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/server.cpp @@ -24,6 +24,68 @@ const CServer NoServer; +void CServer::loadFromSettings(const QSettings &settings) +{ + id = settings.value("id").toString(); + name = settings.value("name").toString(); + displayUrl = settings.value("display_url").toString(); + filesListUrl = settings.value("files_list_url").toString(); + dataDownloadUrl = settings.value("data_download_url").toString(); + dataDownloadFilename = settings.value("data_download_filename").toString(); + dataCompressedSize = settings.value("data_compressed_size").toULongLong(); + dataUncompressedSize = settings.value("data_uncompressed_size").toULongLong(); + clientDownloadUrl = settings.value("client_download_url").toString(); + clientDownloadFilename = settings.value("client_download_filename").toString(); +#if defined(Q_OS_WIN) + clientFilename = settings.value("client_filename_windows").toString(); + clientFilenameOld = settings.value("client_filename_old_windows").toString(); + configurationFilename = settings.value("configuration_filename_windows").toString(); + installerFilename = settings.value("installer_filename_windows").toString(); +#elif defined(Q_OS_MAC) + clientFilename = settings.value("client_filename_osx").toString(); + clientFilenameOld = settings.value("client_filename_old_osx").toString(); + configurationFilename = settings.value("configuration_filename_osx").toString(); + installerFilename = settings.value("installer_filename_osx").toString(); +#else + clientFilename = settings.value("client_filename_linux").toString(); + clientFilenameOld = settings.value("client_filename_old_linux").toString(); + configurationFilename = settings.value("configuration_filename_linux").toString(); + installerFilename = settings.value("installer_filename_linux").toString(); +#endif + comments = settings.value("comments").toString(); +} + +void CServer::saveToSettings(QSettings &settings) const +{ + settings.setValue("id", id); + settings.setValue("name", name); + settings.setValue("display_url", displayUrl); + settings.setValue("files_list_url", filesListUrl); + settings.setValue("data_download_url", dataDownloadUrl); + settings.setValue("data_download_filename", dataDownloadFilename); + settings.setValue("data_compressed_size", dataCompressedSize); + settings.setValue("data_uncompressed_size", dataUncompressedSize); + settings.setValue("client_download_url", clientDownloadUrl); + settings.setValue("client_download_filename", clientDownloadFilename); +#if defined(Q_OS_WIN) + settings.setValue("client_filename_windows", clientFilename); + settings.setValue("client_filename_old_windows", clientFilenameOld); + settings.setValue("configuration_filename_windows", configurationFilename); + settings.setValue("installer_filename_windows", installerFilename); +#elif defined(Q_OS_MAC) + settings.setValue("client_filename_osx", clientFilename); + settings.setValue("client_filename_old_osx", clientFilenameOld); + settings.setValue("configuration_filename_osx", configurationFilename); + settings.setValue("installer_filename_osx", installerFilename); +#else + settings.setValue("client_filename_linux", clientFilename); + settings.setValue("client_filename_old_linux", clientFilenameOld); + settings.setValue("configuration_filename_linux", configurationFilename); + settings.setValue("installer_filename_linux", installerFilename); +#endif + settings.setValue("comments", comments); +} + QString CServer::getDirectory() const { return CConfigFile::getInstance()->getInstallationDirectory() + "/" + id; diff --git a/code/ryzom/tools/client/ryzom_installer/src/server.h b/code/ryzom/tools/client/ryzom_installer/src/server.h index ee6da9f57..61c788c4d 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/server.h +++ b/code/ryzom/tools/client/ryzom_installer/src/server.h @@ -31,6 +31,7 @@ public: QString id; QString name; QString displayUrl; + QString filesListUrl; QString dataDownloadUrl; QString dataDownloadFilename; qint64 dataCompressedSize; @@ -43,6 +44,9 @@ public: QString installerFilename; QString comments; + void loadFromSettings(const QSettings &settings); + void saveToSettings(QSettings &settings) const; + // helpers QString getDirectory() const; QString getClientFullPath() const; diff --git a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts index 73b8d51bf..b3d2668ba 100644 --- a/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts +++ b/code/ryzom/tools/client/ryzom_installer/translations/ryzom_installer_de.ts @@ -16,12 +16,12 @@ Unable to write file - Kann Datei nicht schreiben + Datei kann nicht geschrieben werden Timeout - Timeout + Zeitüberschreitung @@ -31,7 +31,7 @@ Incorrect status code: %1 - Falscher Status Code: %1 + Falscher Status-Code: %1 @@ -107,12 +107,12 @@ Program to install, download and manage Ryzom profiles. - Programm um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten. + Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten. Author: %1 - Author: %1 + Autor: %1 @@ -164,7 +164,7 @@ Warning, this server doesn't support resume! If you stop download now, you won't be able to resume it later. Are you sure to abort download? - Warnung, dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst. wirst du nicht in der Lage sein ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen? + Warnung: dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst, wirst du nicht in der Lage sein, ihn später wieder fortzusetzen. Willst du den Download wirklich abbrechen? @@ -208,7 +208,7 @@ Are you sure to abort download? Extract client files required by server %1 - Entpacke Client Dateien, die vom Server %1 benötigt werden + Entpacke Client-Dateien, die vom Server %1 benötigt werden @@ -245,7 +245,7 @@ Are you sure to abort download? An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk? - Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren um Festplattenspeicher zu sparen? + Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen? @@ -273,7 +273,7 @@ Are you sure to abort download? Delete client files - Lösche Client Dateien + Lösche Client-Dateien @@ -653,7 +653,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende. 0 - 0 + 0