Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
kervala
commit
ce576954e0
21 changed files with 115 additions and 91 deletions
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -1767,7 +1767,7 @@
|
|||
name="uiOpen"
|
||||
handler="item_text_display"
|
||||
params="ui:interface:edit_custom" />
|
||||
<separator />
|
||||
<separator />
|
||||
<!-- Move to an Animal -->
|
||||
<action id="move"
|
||||
name="uimMoveTo">
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 4 MiB After Width: | Height: | Size: 4 MiB |
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
<message>
|
||||
<location filename="../src/downloader.cpp" line="192"/>
|
||||
<source>Unable to write file</source>
|
||||
<translation>Kann Datei nicht schreiben</translation>
|
||||
<translation>Datei kann nicht geschrieben werden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/downloader.cpp" line="227"/>
|
||||
<source>Timeout</source>
|
||||
<translation>Timeout</translation>
|
||||
<translation>Zeitüberschreitung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/downloader.cpp" line="264"/>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<message>
|
||||
<location filename="../src/downloader.cpp" line="329"/>
|
||||
<source>Incorrect status code: %1</source>
|
||||
<translation>Falscher Status Code: %1</translation>
|
||||
<translation>Falscher Status-Code: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/downloader.cpp" line="381"/>
|
||||
|
|
@ -107,12 +107,12 @@
|
|||
<message>
|
||||
<location filename="../src/mainwindow.cpp" line="266"/>
|
||||
<source>Program to install, download and manage Ryzom profiles.</source>
|
||||
<translation>Programm um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten.</translation>
|
||||
<translation>Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwindow.cpp" line="268"/>
|
||||
<source>Author: %1</source>
|
||||
<translation>Author: %1</translation>
|
||||
<translation>Autor: %1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/mainwindow.cpp" line="269"/>
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
<location filename="../src/operationdialog.cpp" line="407"/>
|
||||
<source>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?</source>
|
||||
<translation>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?</translation>
|
||||
<translation>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?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="432"/>
|
||||
|
|
@ -208,7 +208,7 @@ Are you sure to abort download?</source>
|
|||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="553"/>
|
||||
<source>Extract client files required by server %1</source>
|
||||
<translation>Entpacke Client Dateien, die vom Server %1 benötigt werden</translation>
|
||||
<translation>Entpacke Client-Dateien, die vom Server %1 benötigt werden</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="577"/>
|
||||
|
|
@ -245,7 +245,7 @@ Are you sure to abort download?</source>
|
|||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="792"/>
|
||||
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
|
||||
<translation>Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren um Festplattenspeicher zu sparen?</translation>
|
||||
<translation>Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="827"/>
|
||||
|
|
@ -273,7 +273,7 @@ Are you sure to abort download?</source>
|
|||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="1006"/>
|
||||
<source>Delete client files</source>
|
||||
<translation>Lösche Client Dateien</translation>
|
||||
<translation>Lösche Client-Dateien</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/operationdialog.cpp" line="1037"/>
|
||||
|
|
@ -653,7 +653,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
|
|||
<message>
|
||||
<location filename="../ui/profilesdialog.ui" line="79"/>
|
||||
<source>0</source>
|
||||
<translation type="unfinished">0</translation>
|
||||
<translation>0</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../ui/profilesdialog.ui" line="86"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue