aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 04:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renames.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-05-19 02:08:03 +02:00
parent 0974142bcc
commit eeb4e48d38
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/studio/CMakeLists.txt
View file

@ -27,7 +27,7 @@ ELSE(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
IF(UNIX AND WITH_STATIC) IF(UNIX AND WITH_STATIC)
MESSAGE(FATAL_ERROR "OVQT does not work with static NeL builds on Unix atm.") MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.")
ENDIF() ENDIF()
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)

4
code/studio/ovqt_config.h.cmake
View file

@ -1,7 +1,7 @@
#ifndef OVQT_CONFIG_H #ifndef OVQT_CONFIG_H
#define OVQT_CONFIG_H #define OVQT_CONFIG_H
#define DATA_DIR "${NL_SHARE_ABSOLUTE_PREFIX}/object_viewer_qt" #define DATA_DIR "${NL_SHARE_ABSOLUTE_PREFIX}/studio"
#define PLUGINS_DIR "${NL_LIB_ABSOLUTE_PREFIX}/object_viewer_qt" #define PLUGINS_DIR "${NL_LIB_ABSOLUTE_PREFIX}/studio"
#endif #endif

6
code/studio/src/main.cpp
View file

@ -164,7 +164,7 @@ int main(int argc, char **argv)
pluginManager.setSettings(settings); pluginManager.setSettings(settings);
QStringList pluginPaths; QStringList pluginPaths;
#if defined(NL_OS_MAC) #if defined(NL_OS_MAC)
pluginPaths << settings->value("PluginPath", qApp->applicationDirPath() + QString("/../PlugIns/ovqt")).toString(); pluginPaths << settings->value("PluginPath", qApp->applicationDirPath() + QString("/../PlugIns/studio")).toString();
#else #else
pluginPaths << settings->value("PluginPath", QString("%1/plugins").arg(DATA_DIR)).toString(); pluginPaths << settings->value("PluginPath", QString("%1/plugins").arg(DATA_DIR)).toString();
#endif #endif
@ -180,7 +180,7 @@ int main(int argc, char **argv)
{ {
QDir absolutePluginPaths(pluginPaths.join(QLatin1String(","))); QDir absolutePluginPaths(pluginPaths.join(QLatin1String(",")));
QString absolutePaths = absolutePluginPaths.absolutePath(); QString absolutePaths = absolutePluginPaths.absolutePath();
const QString reason = QCoreApplication::translate("Application", "Could not find ovqt_plugin_core in %1").arg(absolutePaths); const QString reason = QCoreApplication::translate("Application", "Could not find studio_plugin_core in %1").arg(absolutePaths);
displayError(msgCoreLoadFailure(reason)); displayError(msgCoreLoadFailure(reason));
QString newPath = QFileDialog::getExistingDirectory(0, QCoreApplication::translate("Application", "Change the plugins path"), QDir::homePath()); QString newPath = QFileDialog::getExistingDirectory(0, QCoreApplication::translate("Application", "Change the plugins path"), QDir::homePath());
@ -205,7 +205,7 @@ int main(int argc, char **argv)
errors.append(spec->fileName() + " : " + spec->errorString()); errors.append(spec->fileName() + " : " + spec->errorString());
if (!errors.isEmpty()) if (!errors.isEmpty())
QMessageBox::warning(0, QCoreApplication::translate("Application", "Object Viewer Qt - Plugin loader messages"), QMessageBox::warning(0, QCoreApplication::translate("Application", "Studio - Plugin loader messages"),
errors.join(QString::fromLatin1("\n\n"))); errors.join(QString::fromLatin1("\n\n")));
int result = app.exec(); int result = app.exec();

8
code/studio/src/plugins/core/main_window.cpp
View file

@ -46,13 +46,13 @@ MainWindow::MainWindow(ExtensionSystem::IPluginManager *pluginManager, QWidget *
m_undoGroup(0), m_undoGroup(0),
m_settings(0) m_settings(0)
{ {
QCoreApplication::setApplicationName(QLatin1String("ObjectViewerQt")); QCoreApplication::setApplicationName(QLatin1String("Studio"));
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::OVQT_VERSION_LONG)); QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::OVQT_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String("RyzomCore")); QCoreApplication::setOrganizationName(QLatin1String("RyzomCore"));
setObjectName(Constants::MAIN_WINDOW); setObjectName(Constants::MAIN_WINDOW);
setWindowIcon(QIcon(Constants::ICON_PILL)); setWindowIcon(QIcon(Constants::ICON_PILL));
setWindowTitle(tr("Object Viewer Qt")); setWindowTitle(tr("Ryzom Core Studio"));
m_pluginManager = pluginManager; m_pluginManager = pluginManager;
m_settings = m_pluginManager->settings(); m_settings = m_pluginManager->settings();
@ -232,8 +232,8 @@ bool MainWindow::showOptionsDialog(const QString &group,
void MainWindow::about() void MainWindow::about()
{ {
QMessageBox::about(this, tr("About Object Viewer Qt"), QMessageBox::about(this, tr("About Ryzom Core Studio"),
tr("<h2>Object Viewer Qt</h2>" tr("<h2>Ryzom Core Studio</h2>"
"<p> Ryzom Core team <p>Compiled on %1 %2").arg(__DATE__).arg(__TIME__)); "<p> Ryzom Core team <p>Compiled on %1 %2").arg(__DATE__).arg(__TIME__));
} }