Commit f019e6f3 authored by Jan Möbius's avatar Jan Möbius

Make all strings translateable in Core

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6733 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 7f54146d
......@@ -213,7 +213,7 @@ Core::init() {
splash_ = new QSplashScreen(splashPixmap);
splash_->show();
splash_->showMessage("Initializing mainwindow" ,
splash_->showMessage(tr("Initializing mainwindow") ,
Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
}
......@@ -434,9 +434,9 @@ Core::init() {
);
scriptEngine_.globalObject().setProperty("core", scriptInstance);
emit log(LOGOUT,"Core Scripting initialized with Name : core ");
emit log(LOGOUT,tr("Core Scripting initialized with Name : core "));
emit log(LOGOUT,"Available scripting functions :");
emit log(LOGOUT,tr("Available scripting functions :"));
QScriptValueIterator it(scriptInstance);
while (it.hasNext()) {
......@@ -490,7 +490,7 @@ Core::init() {
for ( int i = 0 ; i < (int)optionFiles.size(); ++i) {
if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
splash_->showMessage("Loading Configuration File " + QString::number(i) + "/" + QString::number(optionFiles.size()) ,
splash_->showMessage(tr("Loading Configuration File ") + QString::number(i) + "/" + QString::number(optionFiles.size()) ,
Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
}
......@@ -509,7 +509,7 @@ Core::init() {
// ===============================================================================================
if ( OpenFlipper::Options::lang().contains("UTF") || OpenFlipper::Options::lang().contains("utf") ) {
emit log(LOGWARN,"UTF8-Locale used!");
emit log(LOGWARN,tr("UTF8-Locale used!"));
// emit log(LOGWARN,"Only OFF files are fully supported with UTF8. Others might fail.");
// emit log(LOGWARN,"You can change your locale by :");
// emit log(LOGWARN,"export LANG=C");
......@@ -595,7 +595,7 @@ Core::slotMouseEventIdentify( QMouseEvent* _event )
if ( senderPointer == coreWidget_->examiner_widgets_[i] ) {
examinerId = i;
if ( OpenFlipper::Options::doSlotDebugging() )
emit log(LOGINFO,"slotMouseEventIdentify from examiner " + QString::number(i) );
emit log(LOGINFO,tr("slotMouseEventIdentify from examiner ") + QString::number(i) );
break;
}
}
......@@ -629,7 +629,7 @@ Core::slotMouseEvent( QMouseEvent* _event )
if ( senderPointer == coreWidget_->examiner_widgets_[i] ) {
examinerId = i;
if ( OpenFlipper::Options::doSlotDebugging() ) {
QString message = "slotMouseEvent from examiner " + QString::number(i) + " with ";
QString message = tr("slotMouseEvent from examiner ") + QString::number(i) + " with ";
if ( _event->type() == QEvent::MouseButtonRelease )
message += " MouseButtonRelease";
......@@ -640,7 +640,7 @@ Core::slotMouseEvent( QMouseEvent* _event )
else if ( _event->type() == QEvent::MouseMove )
message += " MouseMove";
else
message += "unknown event type";
message += tr("unknown event type");
emit log(LOGINFO,message );
}
......@@ -710,7 +710,7 @@ void Core::updateView() {
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"updateView() called by " + QString( sender()->metaObject()->className() ) );
emit log(LOGINFO,tr("updateView() called by ") + QString( sender()->metaObject()->className() ) );
}
}
}
......@@ -727,7 +727,7 @@ void Core::updateView() {
// redraw time not reached ... waiting for timer event for next redraw
if ( redrawTimer_->isActive() ) {
if ( OpenFlipper::Options::doSlotDebugging() )
emit log(LOGINFO,"Too early for redraw! Delaying request from " +
emit log(LOGINFO,tr("Too early for redraw! Delaying request from ") +
QString( sender()->metaObject()->className() ) );
return;
}
......@@ -850,7 +850,7 @@ void Core::multiViewMode( int _mode ) {
break;
default:
emit log(LOGERR,"Requested illegal multiview mode!");
emit log(LOGERR,tr("Requested illegal multiview mode!"));
}
}
......@@ -885,10 +885,10 @@ Core::writeOnExit() {
INIFile ini;
if ( ! ini.connect( inifile ,false) ) {
emit log(LOGERR,"Failed to connect to users ini file");
emit log(LOGERR,tr("Failed to connect to users ini file"));
if ( ! ini.connect( inifile,true) ) {
emit log(LOGERR,"Can not create user ini file");
emit log(LOGERR,tr("Can not create user ini file"));
} else {
writeApplicationOptions(ini);
ini.disconnect();
......@@ -955,7 +955,7 @@ void Core::slotLogToFile(Logtype _type, QString _message){
if ( logFile_->open(QFile::WriteOnly) ) {
logStream_ = new QTextStream (logFile_);
}else{
emit log(LOGERR, "Unable to open logfile!");
emit log(LOGERR, tr("Unable to open logfile!"));
return;
}
}
......@@ -1001,7 +1001,7 @@ void Core::slotSetSlotDescription(QString _slotName, QString _slotDescrip
pluginInfo = &plugins[i];
if (pluginInfo == 0){
emit log(LOGERR, "Unable to set slot-description. Plugin not found!");
emit log(LOGERR, tr("Unable to set slot-description. Plugin not found!"));
return;
}
......@@ -1048,7 +1048,7 @@ void Core::slotGetDescription(QString _function, QString& _fnDescript
pluginInfo = &plugins[i];
if (pluginInfo == 0){
emit log(LOGERR, "Unable to get slot-description. Plugin not found!");
emit log(LOGERR, tr("Unable to get slot-description. Plugin not found!"));
return;
}
......@@ -1070,7 +1070,7 @@ void Core::snapshotBaseFileName(const QString& _fname, unsigned int _viewerId ){
if ( OpenFlipper::Options::gui() ) {
if ( _viewerId >= OpenFlipper::Options::examinerWidgets() ) {
emit log(LOGERR,"Unable to snapshotBaseFileName for viewer " + QString::number(_viewerId) );
emit log(LOGERR,tr("Unable to snapshotBaseFileName for viewer ") + QString::number(_viewerId) );
return;
}
......@@ -1084,7 +1084,7 @@ void Core::snapshot( unsigned int _viewerId ){
if ( OpenFlipper::Options::gui() ) {
if ( _viewerId >= OpenFlipper::Options::examinerWidgets() ) {
emit log(LOGERR,"Unable to create snapshot for viewer " + QString::number(_viewerId) );
emit log(LOGERR,tr("Unable to create snapshot for viewer ") + QString::number(_viewerId) );
return;
}
coreWidget_->examiner_widgets_[_viewerId]->snapshot();
......@@ -1137,7 +1137,7 @@ void Core::writeVersionNumbers(QString _filename){
INIFile ini;
if ( ! ini.connect(_filename,true) ) {
emit log(LOGERR,"Failed to connect to _ini file" + _filename);
emit log(LOGERR,tr("Failed to connect to _ini file") + _filename);
return;
}
......@@ -1187,67 +1187,67 @@ void Core::setDescriptions(){
connect(this, SIGNAL(setSlotDescription(QString,QString,QStringList,QStringList)),
this, SLOT(slotSetSlotDescription(QString,QString,QStringList,QStringList)) );
emit setSlotDescription("updateView()", "Redraw the contents of the viewer.", QStringList(), QStringList());
emit setSlotDescription("clearAll()", "Clear all data objects.", QStringList(), QStringList());
emit setSlotDescription("exitApplication()", "Quit OpenFlipper", QStringList(), QStringList());
emit setSlotDescription("fullscreen(bool)", "Enable or disable fullscreen mode",
QStringList("enabled") ,
QStringList("Enable or disable fullscreen mode"));
emit setSlotDescription("loggerState(int)", "Change the logger window state", QStringList("Change the logger window state"), QStringList());
emit setSlotDescription("showToolbox(bool)", "Show or hide toolbox", QStringList("Show or hide the toolbox"), QStringList());
emit setSlotDescription("multiViewMode(int)", "Switch MultiView Mode",
QStringList("Mode"), QStringList("0: One Viewer\n 1: Grid \n 2: Horizontal split"));
emit setSlotDescription("restrictFrameRate(bool)", "Restrict FrameRate to MaxFrameRate",
QStringList("enabled"), QStringList("restriction switch"));
emit setSlotDescription("setMaxFrameRate(int)", "set the maximal framerate (automatically enables framerate restriction)",
QStringList("frameRate"), QStringList("Maximum frameRate"));
emit setSlotDescription("snapshotBaseFileName(QString&)", "Set a filename for storing snapshots."
emit setSlotDescription("updateView()", tr("Redraw the contents of the viewer."), QStringList(), QStringList());
emit setSlotDescription("clearAll()", tr("Clear all data objects."), QStringList(), QStringList());
emit setSlotDescription("exitApplication()", tr("Quit OpenFlipper"), QStringList(), QStringList());
emit setSlotDescription("fullscreen(bool)", tr("Enable or disable fullscreen mode"),
QStringList(tr("enabled")) ,
QStringList(tr("Enable or disable fullscreen mode")));
emit setSlotDescription("loggerState(int)", tr("Change the logger window state"), QStringList(tr("Change the logger window state")), QStringList());
emit setSlotDescription("showToolbox(bool)", tr("Show or hide toolbox"), QStringList(tr("Show or hide the toolbox")), QStringList());
emit setSlotDescription("multiViewMode(int)", tr("Switch MultiView Mode"),
QStringList(tr("Mode")), QStringList(tr("0: One Viewer\n 1: Grid \n 2: Horizontal split")));
emit setSlotDescription("restrictFrameRate(bool)", tr("Restrict FrameRate to MaxFrameRate"),
QStringList(tr("enabled")), QStringList(tr("restriction switch")));
emit setSlotDescription("setMaxFrameRate(int)", tr("set the maximal framerate (automatically enables framerate restriction)"),
QStringList(tr("frameRate")), QStringList(tr("Maximum frameRate")));
emit setSlotDescription("snapshotBaseFileName(QString&)", tr("Set a filename for storing snapshots.")
, QStringList(), QStringList());
emit setSlotDescription("snapshot()", "Make a snapshot of the viewer. If no filename"
emit setSlotDescription("snapshot()", tr("Make a snapshot of the viewer. If no filename"
" was set using snapshotBaseFileName() the snapshot is stored"
" in snap.png in the current directory. For every snapshot"
" a counter is added to the filename.", QStringList(), QStringList());
emit setSlotDescription("resizeViewer(int,int)", "Resize the viewer",
QString("width,height").split(","),
QString("new width for the viewer,new height for the viewer").split(","));
emit setSlotDescription("writeVersionNumbers(QString)", "write the current versions of all plugins to INI file",
QStringList("filename"),
QStringList("fullpath to a file where the versions should be written to."));
" a counter is added to the filename."), QStringList(), QStringList());
emit setSlotDescription("resizeViewer(int,int)", tr("Resize the viewer"),
QString(tr("width,height")).split(","),
QString(tr("new width for the viewer,new height for the viewer")).split(","));
emit setSlotDescription("writeVersionNumbers(QString)", tr("write the current versions of all plugins to INI file"),
QStringList(tr("filename")),
QStringList(tr("fullpath to a file where the versions should be written to.")));
//save slots
emit setSlotDescription("saveObject(int,QString)", "Save object to file. If the file exists it will be overwritten.",
QString("object-id,filename").split(","),
QString("id of the object, complete path and filename").split(","));
emit setSlotDescription("saveObjectTo(int,QString)", "Save object to file. The location can be chosen in a dialog. "
"(only works if GUI is available)",
QString("object-id,filename").split(","),
QString("id of the object, initial filename for the dialog").split(","));
emit setSlotDescription("saveAllObjects()", "Saves all target objects. "
"If no filename is available a dialog is shown. (only works if GUI is available)",QStringList(), QStringList());
emit setSlotDescription("saveAllObjectsTo()", "Saves all target objects. The locations can be chosen in dialogs. "
"(only works if GUI is available)",QStringList(), QStringList());
emit setSlotDescription("saveSettings()", "Show the dialog to save the current setting. (only works if GUI is available)",QStringList(), QStringList());
emit setSlotDescription("saveObject(int,QString)", tr("Save object to file. If the file exists it will be overwritten."),
QString(tr("object-id,filename")).split(","),
QString(tr("id of the object, complete path and filename")).split(","));
emit setSlotDescription("saveObjectTo(int,QString)", tr("Save object to file. The location can be chosen in a dialog. "
"(only works if GUI is available)"),
QString(tr("object-id,filename")).split(","),
QString(tr("id of the object, initial filename for the dialog")).split(","));
emit setSlotDescription("saveAllObjects()", tr("Saves all target objects. "
"If no filename is available a dialog is shown. (only works if GUI is available)"),QStringList(), QStringList());
emit setSlotDescription("saveAllObjectsTo()", tr("Saves all target objects. The locations can be chosen in dialogs. "
"(only works if GUI is available)"),QStringList(), QStringList());
emit setSlotDescription("saveSettings()", tr("Show the dialog to save the current setting. (only works if GUI is available)"),QStringList(), QStringList());
//load slots
emit setSlotDescription("loadObject()", "Show the dialog to load an object. (only works if GUI is available)",QStringList(), QStringList());
emit setSlotDescription("getObjectId(QString)", "Return identifier of object with specified name. Returns -1 if object was not found.",QStringList(), QStringList());
emit setSlotDescription("loadSettings()", "Show the dialog to load settings. (only works if GUI is available)",QStringList(), QStringList());
emit setSlotDescription("loadSettings(QString)", "load settings from file.",QStringList(), QStringList());
emit setSlotDescription("createWidget(QString,QString)", "Create a widget from an ui file",
QString("Object name,ui file").split(","),
QString("Name of the new widget in script,ui file to load").split(","));
emit setSlotDescription("addToolbox(QString,QWidget*)", "Add a widget as a toolbox",
QString("Toolbox Entry name,Widget").split(","),
QString("Name of the new widget in the toolbox,Pointer to the new widget").split(","));
emit setSlotDescription("addViewMode(QString,QString)", "Add a new viewmode",
QString("Name,Toolbox List").split(","),
QString("Name of the new Viewmode, ; seperated list of toolboxes visible in this viewmode").split(","));
emit setSlotDescription("objectList(QString,QStringList)", "Returns object list",
QString("Selection type,Object types").split(","),
QString("Type of object selection (all,source,target),Object type (All,PolyMesh,TriangleMesh,...)").split(";"));
emit setSlotDescription("loadObject()", tr("Show the dialog to load an object. (only works if GUI is available)"),QStringList(), QStringList());
emit setSlotDescription("getObjectId(QString)", tr("Return identifier of object with specified name. Returns -1 if object was not found."),QStringList(), QStringList());
emit setSlotDescription("loadSettings()", tr("Show the dialog to load settings. (only works if GUI is available)"),QStringList(), QStringList());
emit setSlotDescription("loadSettings(QString)", tr("load settings from file."),QStringList(), QStringList());
emit setSlotDescription("createWidget(QString,QString)", tr("Create a widget from an ui file"),
QString(tr("Object name,ui file")).split(","),
QString(tr("Name of the new widget in script,ui file to load")).split(","));
emit setSlotDescription("addToolbox(QString,QWidget*)", tr("Add a widget as a toolbox"),
QString(tr("Toolbox Entry name,Widget")).split(","),
QString(tr("Name of the new widget in the toolbox,Pointer to the new widget")).split(","));
emit setSlotDescription("addViewMode(QString,QString)", tr("Add a new viewmode"),
QString(tr("Name,Toolbox List")).split(","),
QString(tr("Name of the new Viewmode, ; seperated list of toolboxes visible in this viewmode")).split(","));
emit setSlotDescription("objectList(QString,QStringList)", tr("Returns object list"),
QString(tr("Selection type,Object types")).split(","),
QString(tr("Type of object selection (all,source,target),Object type (All,PolyMesh,TriangleMesh,...)")).split(";"));
}
void Core::slotDeleteObject( int _id ){
......
......@@ -614,12 +614,12 @@ void Core::openIniFile( QString _filename,
INIFile ini;
if ( ! ini.connect(_filename,false) ) {
emit log(LOGERR,"Failed to connect to ini file" + _filename);
emit log(LOGERR,tr("Failed to connect to ini file") + _filename);
return;
}
if ( OpenFlipper::Options::gui() ) {
coreWidget_->statusMessage( "Loading ini File " + _filename + " ...");
coreWidget_->statusMessage( tr("Loading ini File ") + _filename + " ...");
coreWidget_->setStatus(ApplicationStatus::BLOCKED );
}
......@@ -663,8 +663,8 @@ void Core::openIniFile( QString _filename,
if ( ini.get_entry( tmpType, sectionName , "type" )) {
type = DataType(tmpType);
emit log(LOGWARN, "This ini file uses old int style ObjectType fields!" );
emit log(LOGWARN, "Please convert it to new format! ( ... just save it )" );
emit log(LOGWARN, tr("This ini file uses old int style ObjectType fields!") );
emit log(LOGWARN, tr("Please convert it to new format! ( ... just save it )") );
} else {
QString typeName="";
......@@ -672,14 +672,14 @@ void Core::openIniFile( QString _filename,
if ( ini.get_entry( typeName, sectionName , "type" )) {
type = typeId(typeName);
} else
emit log(LOGWARN, "Unable to get DataType for object " + sectionName + " assuming Triangle Mesh" );
emit log(LOGWARN, tr("Unable to get DataType for object ") + sectionName + tr(" assuming Triangle Mesh") );
}
int newObjectId = loadObject(type, path);
BaseObject* object = objectRoot_->childExists( newObjectId );
if ( object == 0 ) {
emit log(LOGERR,"Unable to open Object " + path);
emit log(LOGERR,tr("Unable to open Object ") + path);
continue;
}
......@@ -714,7 +714,7 @@ void Core::openIniFile( QString _filename,
coreWidget_->examiner_widgets_[i]->viewAll();
}
coreWidget_->statusMessage( "Loading ini File " + _filename + " ... Done", 4000);
coreWidget_->statusMessage( tr("Loading ini File ") + _filename + tr(" ... Done"), 4000);
coreWidget_->setStatus(ApplicationStatus::READY );
}
......@@ -730,12 +730,12 @@ void Core::writeIniFile(QString _filename,
INIFile ini;
if ( ! ini.connect(_filename,true) ) {
emit log(LOGERR,"Failed to connect to _ini file" + _filename);
emit log(LOGERR,tr("Failed to connect to _ini file") + _filename);
return;
}
if ( OpenFlipper::Options::gui() ) {
coreWidget_->statusMessage( "Saving ini File " + _filename + " ...");
coreWidget_->statusMessage( tr("Saving ini File ") + _filename + " ...");
coreWidget_->setStatus(ApplicationStatus::BLOCKED );
}
......@@ -796,7 +796,7 @@ void Core::writeIniFile(QString _filename,
ini.disconnect();
if ( OpenFlipper::Options::gui() ) {
coreWidget_->statusMessage( "Saving ini File " + _filename + " ... Done", 4000);
coreWidget_->statusMessage( tr("Saving ini File ") + _filename + tr(" ... Done"), 4000);
coreWidget_->setStatus(ApplicationStatus::READY );
}
}
......
......@@ -76,13 +76,13 @@ void Core::openObjFile(QString _filename)
if (!in)
{
emit log(LOGERR,"Cannot open to obj file" + _filename);
emit log(LOGERR,tr("Cannot open to obj file") + _filename);
return;
}
if ( OpenFlipper::Options::gui() )
{
coreWidget_->statusMessage( "Loading obj File " + _filename + " ...");
coreWidget_->statusMessage( tr("Loading obj File ") + _filename + " ...");
coreWidget_->setStatus(ApplicationStatus::BLOCKED );
}
......@@ -129,7 +129,7 @@ void Core::openObjFile(QString _filename)
if ( OpenFlipper::Options::gui() )
{
coreWidget_->statusMessage( "Loading obj File " + _filename + " ... done", 4000);
coreWidget_->statusMessage( tr("Loading obj File ") + _filename + tr(" ... done"), 4000);
coreWidget_->setStatus(ApplicationStatus::READY );
}
......@@ -168,7 +168,7 @@ void Core::preprocessObjFile(QString _filename)
std::fstream in(fname.c_str(), std::ios_base::in);
if (!in)
{
emit log(LOGERR,"Cannot open to obj file" + _filename);
emit log(LOGERR,tr("Cannot open to obj file") + _filename);
return;
}
......@@ -249,7 +249,7 @@ void Core::preprocessObjFile(QString _filename)
if (!typeFound)
{
dataType = DATA_TRIANGLE_MESH;
emit log(LOGWARN, "Unable to get DataType for object " + _filename + " - assuming Triangle Mesh" );
emit log(LOGWARN, tr("Unable to get DataType for object ") + _filename + tr(" - assuming Triangle Mesh") );
}
......@@ -269,7 +269,7 @@ void Core::preprocessObjFile(QString _filename)
BaseObject* object = objectRoot_->childExists( newObjectId );
if ( object == 0 )
emit log(LOGERR,"Unable to open Object " + path);
emit log(LOGERR,tr("Unable to open Object ") + path);
if ( newActiveObject )
emit objectSelectionChanged(-1);
......@@ -285,14 +285,14 @@ void Core::writeObjFile(QString _filename, bool _relativePaths, bool _targetOnly
std::fstream out(fname.c_str(), std::ios_base::out);
if (!out)
{
emit log(LOGERR,"Cannot open to obj file" + _filename);
emit log(LOGERR,tr("Cannot open to obj file") + _filename);
return;
}
if ( OpenFlipper::Options::gui() )
{
coreWidget_->statusMessage( "Saving obj File " + _filename + " ...");
coreWidget_->statusMessage( tr("Saving obj File ") + _filename + " ...");
coreWidget_->setStatus(ApplicationStatus::BLOCKED );
}
......@@ -327,7 +327,7 @@ void Core::writeObjFile(QString _filename, bool _relativePaths, bool _targetOnly
if ( OpenFlipper::Options::gui() )
{
coreWidget_->statusMessage( "Saving obj File " + _filename + " ... done", 4000);
coreWidget_->statusMessage( tr("Saving obj File ") + _filename + tr(" ... done"), 4000);
coreWidget_->setStatus(ApplicationStatus::READY );
}
......
......@@ -75,11 +75,11 @@ void Core::slotObjectUpdated(int _identifier) {
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"updatedObject( " + QString::number(_identifier) + " ) called by " +
emit log(LOGINFO,"updatedObject( " + QString::number(_identifier) + tr(" ) called by ") +
QString( sender()->metaObject()->className() ) );
}
} else {
emit log(LOGINFO,"updatedObject( " + QString::number(_identifier) + " ) called by Core" );
emit log(LOGINFO,"updatedObject( " + QString::number(_identifier) + tr(" ) called by Core") );
}
}
......@@ -90,7 +90,7 @@ void Core::slotObjectUpdated(int _identifier) {
BaseObject* object = 0;
if ( _identifier != -1 ) {
if ( !PluginFunctions::getObject(_identifier,object) ) {
emit log(LOGERR,"updated_objects called for non existing object with id : " + QString::number(_identifier) );
emit log(LOGERR,tr("updated_objects called for non existing object with id : ") + QString::number(_identifier) );
return;
}
}
......@@ -189,7 +189,7 @@ void Core::slotUpdateTexture( QString _name , int _identifier){
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"slotUpdateTexture( " + _name + " , " + QString::number(_identifier) + " ) called by " +
emit log(LOGINFO,"slotUpdateTexture( " + _name + " , " + QString::number(_identifier) + tr(" ) called by ") +
QString( sender()->metaObject()->className() ) );
}
}
......@@ -218,7 +218,7 @@ void Core::slotSetTextureMode(QString _textureName, QString _mode, int _id) {
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"slotSetTextureMode( " + _textureName + " , " + _mode + " , " + QString::number(_id) + " ) called by " +
emit log(LOGINFO,"slotSetTextureMode( " + _textureName + " , " + _mode + " , " + QString::number(_id) + tr(" ) called by ") +
QString( sender()->metaObject()->className() ) );
}
}
......@@ -235,7 +235,7 @@ void Core::slotSetTextureMode(QString _textureName ,QString _mode) {
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"slotSetTextureMode( " + _textureName + " , " + _mode + " ) called by " +
emit log(LOGINFO,"slotSetTextureMode( " + _textureName + " , " + _mode + tr(" ) called by ") +
QString( sender()->metaObject()->className() ) );
}
}
......@@ -251,7 +251,7 @@ void Core::slotTextureUpdated( QString _textureName , int _identifier ) {
if ( OpenFlipper::Options::doSlotDebugging() ) {
if ( sender() != 0 ) {
if ( sender()->metaObject() != 0 ) {
emit log(LOGINFO,"slotTextureUpdated( " + _textureName + " , " + QString::number(_identifier) + " ) called by " +
emit log(LOGINFO,"slotTextureUpdated( " + _textureName + " , " + QString::number(_identifier) + tr(" ) called by ") +
QString( sender()->metaObject()->className() ) );
}
}
......
......@@ -161,7 +161,7 @@ void Core::loadPlugins()
if (ini.get_entry( additionalPlugins,"Plugins",loadKeys[keyit] ) ) {
for ( uint i = 0 ; i < additionalPlugins.size(); ++i) {
iniPlugins << additionalPlugins[i];
emit log(LOGOUT,"Additional Plugin from ini file : " + additionalPlugins[i] );
emit log(LOGOUT,tr("Additional Plugin from ini file : ") + additionalPlugins[i] );
}
}
}
......@@ -169,7 +169,7 @@ void Core::loadPlugins()
ini.disconnect();
} else
emit log(LOGWARN,"Failed to connect to ProgramOptions.ini file: " + configFiles[fileCount]);
emit log(LOGWARN,tr("Failed to connect to ProgramOptions.ini file: ") + configFiles[fileCount]);
}
pluginlist = iniPlugins << pluginlist;
......@@ -196,7 +196,7 @@ void Core::loadPlugins()
dontLoadPlugins_[i] = dontLoadPlugins_[i].trimmed();
for ( int i = 0 ; i < dontLoadPlugins_.size(); ++i )
emit log(LOGWARN,"Skipping Plugins :\t " + dontLoadPlugins_[i] );
emit log(LOGWARN,tr("Skipping Plugins :\t ") + dontLoadPlugins_[i] );
emit log(LOGOUT,"=============================================================================================");
......@@ -205,7 +205,7 @@ void Core::loadPlugins()
for ( int i = 0 ; i < pluginlist.size() ; ++i) {
if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
splashMessage_ = "Loading Plugin " + QString::number(i) + "/" + QString::number(pluginlist.size());
splashMessage_ = tr("Loading Plugin ") + QString::number(i) + "/" + QString::number(pluginlist.size());
splash_->showMessage( splashMessage_ , Qt::AlignBottom | Qt::AlignLeft , Qt::white);
QApplication::processEvents();
}
......@@ -217,7 +217,7 @@ void Core::loadPlugins()
emit pluginsInitialized();
emit log(LOGOUT,"Loaded " + QString::number(plugins.size()) + " Plugin(s)" );
emit log(LOGOUT,tr("Loaded ") + QString::number(plugins.size()) + tr(" Plugin(s)") );
}
/** @brief slot for loading Plugins
......@@ -321,12 +321,12 @@ void Core::unloadPlugin(QString name){
plugins.erase(plugins.begin() + i);
emit log(LOGOUT,"Unloaded Plugin :\t\t " + name);
emit log(LOGOUT,tr("Unloaded Plugin :\t\t ") + name);
return;
}
log(LOGERR, "Unable to unload plugin '" + name + "' (plugin wasn't found)");
log(LOGERR, tr("Unable to unload plugin '") + name + tr("' (plugin wasn't found)"));
}
/** @brief prevent OpenFlipper from loading plugins on the next start (slot)
......@@ -369,7 +369,7 @@ void Core::loadPlugin(QString filename, bool silent){
// Check if it is a BasePlugin
BaseInterface* basePlugin = qobject_cast< BaseInterface * >(plugin);
if ( basePlugin ) {
emit log(LOGOUT,"Found Plugin :\t\t " + basePlugin->name() + " at " + filename);
emit log(LOGOUT,tr("Found Plugin :\t\t ") + basePlugin->name() + tr(" at ") + filename);
if ( OpenFlipper::Options::gui() && OpenFlipper::Options::splash() ) {
splashMessage_ = splashMessage_ + " " + basePlugin->name() ;
......@@ -385,21 +385,21 @@ void Core::loadPlugin(QString filename, bool silent){
if (plugins[k].name == name_nospace){
if (silent || OpenFlipper::Options::nogui() ){ //dont load the plugin
emit log(LOGWARN, "\t\t\t Already loaded from " + plugins[k].path);
emit log(LOGWARN, tr("\t\t\t Already loaded from ") + plugins[k].path);
emit log(LOGOUT,"=============================================================================================");
return;
}else{ //ask the user
int ret = QMessageBox::question(coreWidget_,
tr("Plugin already loaded"),
"A Plugin with the same name was already loaded from " +
plugins[k].path + ".\n"
"You can only load the new plugin if you unload the existing one first.\n\n"
"Do you want to unload the existing plugin first?",
tr("A Plugin with the same name was already loaded from ") +
plugins[k].path + tr(".\n"
"You can only load the new plugin if you unload the existing one first.\n\n"
"Do you want to unload the existing plugin first?"),
QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
if (ret == QMessageBox::Yes)
unloadPlugin(plugins[k].name);
else{
emit log(LOGWARN, "\t\t\t Already loaded from " + plugins[k].path);
emit log(LOGWARN, tr("\t\t\t Already loaded from ") + plugins[k].path);
emit log(LOGOUT,"=============================================================================================");
return;
}
......@@ -408,7 +408,7 @@ void Core::loadPlugin(QString filename, bool silent){
}
if ( dontLoadPlugins_.contains(basePlugin->name(), Qt::CaseInsensitive) ) {
emit log(LOGWARN,"OpenFlipper.ini prevented Plugin " + basePlugin->name() + " from being loaded! ");
emit log(LOGWARN,tr("OpenFlipper.ini prevented Plugin ") + basePlugin->name() + tr(" from being loaded! "));
emit log(LOGOUT,"=============================================================================================");
return;
}
......@@ -416,22 +416,22 @@ void Core::loadPlugin(QString filename, bool silent){
//Check if it is a BasePlugin
SecurityInterface * securePlugin = qobject_cast< SecurityInterface * >(plugin);
if ( securePlugin ) {
emit log(LOGINFO,"Plugin uses security interface. Trying to authenticate against plugin ...");
emit log(LOGINFO,tr("Plugin uses security interface. Trying to authenticate against plugin ..."));
bool success = false;
QMetaObject::invokeMethod(plugin,"authenticate", Q_RETURN_ARG( bool , success ) ) ;
if ( success )
emit log(LOGINFO,"... ok. Loading plugin ");
emit log(LOGINFO,tr("... ok. Loading plugin "));
else {
emit log(LOGERR,"... failed. Plugin access denied.");
emit log(LOGERR,tr("... failed. Plugin access denied."));
emit log(LOGOUT,"=============================================================================================");
return;
}
}
<