BUG: Mark translatable strings in Applications folder

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerMainWindow.cpp

@@ -200,9 +200,10 @@ void ctkCLModuleExplorerMainWindow::closeEvent(QCloseEvent *event)
   {
     QMessageBox::StandardButton button =
         QMessageBox::warning(QApplication::activeWindow(),
-                             QString("Closing %1 running modules").arg(runningFrontends.size()),
-                             "Some modules are still running.\n"
-                             "Closing the application will cancel all current computations.",
+                             //: %1 is the number of running modules
+                             tr("Closing %1 running modules").arg(runningFrontends.size()),
+                             tr("Some modules are still running.\n"
+                                "Closing the application will cancel all current computations."),
                              QMessageBox::Ok | QMessageBox::Cancel);
     if (button == QMessageBox::Ok)
     {

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerShowXmlAction.cpp

@@ -36,7 +36,7 @@
 ctkCmdLineModuleExplorerShowXmlAction::ctkCmdLineModuleExplorerShowXmlAction(QObject *parent)
   : QAction(parent)
 {
-  this->setText("Show XML Description");
+  this->setText(tr("Show XML Description"));
 
   connect(this, SIGNAL(triggered()), SLOT(run()));
 }

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerTabList.cpp

@@ -94,9 +94,11 @@ void ctkCmdLineModuleExplorerTabList::tabCloseRequested(int index)
     {
       QMessageBox::StandardButton button =
           QMessageBox::warning(QApplication::topLevelWidgets().front(),
-                               "Closing a running module",
-                               "The module '" + frontend->moduleReference().description().title() + "' is still running.\n"
-                               "Closing the tab will cancel the current computation.",
+                               tr("Closing a running module"),
+                               //: %1 is the module name
+                               tr("The module '%1' is still running.\n"
+                                  "Closing the tab will cancel the current computation.")
+                                  .arg(frontend->moduleReference().description().title()),
                                QMessageBox::Ok | QMessageBox::Cancel);
       if (button == QMessageBox::Ok)
       {
@@ -107,9 +109,11 @@ void ctkCmdLineModuleExplorerTabList::tabCloseRequested(int index)
     else
     {
       QMessageBox::information(QApplication::topLevelWidgets().front(),
-                               "Closing not possible",
-                               "The module '" + frontend->moduleReference().description().title() + "' is still running "
-                               "and does not support being canceled.");
+                               tr("Closing not possible"),
+                               //: %1 is the module name
+                               tr("The module '%1' is still running "
+                                  "and does not support being canceled.")
+                               .arg(frontend->moduleReference().description().title()));
     }
   }
   else

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerTreeWidget.cpp

@@ -38,7 +38,7 @@
 #include <QApplication>
 #include <QMessageBox>
 
-QString ctkCmdLineModuleExplorerTreeWidget::CATEGORY_UNKNOWN = "Uncategorized";
+QString ctkCmdLineModuleExplorerTreeWidget::CATEGORY_UNKNOWN = ctkCmdLineModuleExplorerTreeWidget::tr("Uncategorized");
 
 class ctkCmdLineModuleTreeWidgetItem : public QStandardItem
 {
@@ -64,7 +64,9 @@ class ctkCmdLineModuleTreeWidgetItem : public QStandardItem
     if (!ModuleRef.xmlValidationErrorString().isEmpty())
     {
       this->setIcon(QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning));
-      toolTip += "\n\nWarning:\n\n" + ModuleRef.xmlValidationErrorString();
+      toolTip += QString("\n\n%1\n\n%2")
+                .arg(ctkCmdLineModuleExplorerTreeWidget::tr("Warning:"))
+                .arg(ModuleRef.xmlValidationErrorString());
     }
     this->setToolTip(toolTip);
   }
@@ -85,7 +87,7 @@ ctkCmdLineModuleExplorerTreeWidget::ctkCmdLineModuleExplorerTreeWidget(QWidget *
   , DefaultFrontendFactory(NULL)
 {
   this->ContextMenu = new QMenu(this);
-  this->ShowFrontendMenu = this->ContextMenu->addMenu("Create Frontend");
+  this->ShowFrontendMenu = this->ContextMenu->addMenu(tr("Create Frontend"));
 
   this->ShowXmlAction = new ctkCmdLineModuleExplorerShowXmlAction(this);
   this->ContextMenu->addAction(ShowXmlAction);
@@ -268,8 +270,13 @@ ctkCmdLineModuleFrontend* ctkCmdLineModuleExplorerTreeWidget::createFrontend(con
   }
   catch (const ctkException& e)
   {
-    QMessageBox::information(this, "Frontend creation failed", "Creating a " + frontendFactory->name()
-                             + " frontend failed:\n\n" + e.what());
+    //: %1 is the frontend factory name and %2 is the error description
+    QMessageBox::information(this,
+      tr("Frontend creation failed"),
+      tr("Creating a %1 frontend failed:\n\n%2")
+        .arg(frontendFactory->name())
+        .arg(e.what())
+    );
     return NULL;
   }
 }

Applications/ctkDICOMHost/ctkDICOMHostMainLogic.cpp

@@ -61,7 +61,7 @@ void ctkDICOMHostMainLogic::aboutToQuit()
 void ctkDICOMHostMainLogic::configureHostedApp()
 {
   //qDebug() << "load button clicked";
-  AppFileName = QFileDialog::getOpenFileName(PlaceHolderForHostedApp,"Choose hosted application",QApplication::applicationDirPath());
+  AppFileName = QFileDialog::getOpenFileName(PlaceHolderForHostedApp,tr("Choose hosted application"),QApplication::applicationDirPath());
   HostControls->setAppFileName(AppFileName);
   emit SelectionValid(((this->Host) && (this->HostControls->validAppFileName()) && (ValidSelection)));
 }
@@ -123,7 +123,7 @@ void ctkDICOMHostMainLogic::onTreeSelectionChanged(const QItemSelection & select
 
         if(model && (model->data(index0,ctkDICOMModel::TypeRole) == static_cast<int>(ctkDICOMModel::SeriesType)))
         {
-          QString s = "Series selected: ";
+          QString s = tr("Series selected: ");
           QString seriesUID = model->data(index0,ctkDICOMModel::UIDRole).toString();
           s.append(seriesUID);
           SelectedFiles = DicomAppWidget->database()->filesForSeries(seriesUID);
@@ -133,7 +133,7 @@ void ctkDICOMHostMainLogic::onTreeSelectionChanged(const QItemSelection & select
       }
     }
     if (ValidSelection==false)
-      emit TreeSelectionChanged("no series selected");
+      emit TreeSelectionChanged(tr("no series selected"));
     emit SelectionValid(((this->Host) && (this->HostControls->validAppFileName()) && (ValidSelection)));
 }
 

Applications/ctkDICOMObjectViewer/ctkDICOMObjectViewerMain.cpp

@@ -50,7 +50,7 @@ int main(int argc, char** argv)
   else
     {
     s = QFileDialog::getOpenFileName( 0,
-     "Choose an image file", ".",
+     QFileDialog::tr("Choose an image file"), ".",
      "DCM (*)"
      );
     if( s.size() == 0 )

Applications/ctkEventBusDemo/ctkEventBusDemoMainWindow.cpp

@@ -39,7 +39,7 @@ void ctkEventBusDemoMainWindow::connectEvents() {
 
 void ctkEventBusDemoMainWindow::sendEvent() {
 
-    QString textToDisplay("Me: ");
+    QString textToDisplay = tr("Me: ");
     textToDisplay.append(ui->txtParameter->property("plainText").toString());
     ui->textBrowser->append(textToDisplay);
 

Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp

@@ -63,7 +63,7 @@ ctkHostAppExampleWidget::~ctkHostAppExampleWidget()
 void ctkHostAppExampleWidget::loadButtonClicked()
 {
   qDebug() << "load button clicked";
-  this->setAppFileName(QFileDialog::getOpenFileName(this,"Choose hosted application",QApplication::applicationDirPath()));
+  this->setAppFileName(QFileDialog::getOpenFileName(this,tr("Choose hosted application"),QApplication::applicationDirPath()));
 }
 
 //----------------------------------------------------------------------------

Applications/ctkPluginBrowser/ctkPluginBrowser.cpp

@@ -49,16 +49,16 @@
 ctkPluginBrowser::ctkPluginBrowser(ctkPluginFramework* framework)
   : framework(framework)
 {
-  pluginEventTypeToString[ctkPluginEvent::INSTALLED] = "Installed";
-  pluginEventTypeToString[ctkPluginEvent::LAZY_ACTIVATION] = "Lazy Activation";
-  pluginEventTypeToString[ctkPluginEvent::RESOLVED] = "Resolved";
-  pluginEventTypeToString[ctkPluginEvent::STARTED] = "Started";
-  pluginEventTypeToString[ctkPluginEvent::STARTING] = "Starting";
-  pluginEventTypeToString[ctkPluginEvent::STOPPED] = "Stopped";
-  pluginEventTypeToString[ctkPluginEvent::STOPPING] = "Stopping";
-  pluginEventTypeToString[ctkPluginEvent::UNINSTALLED] = "Uninstalled";
-  pluginEventTypeToString[ctkPluginEvent::UNRESOLVED] = "Unresolved";
-  pluginEventTypeToString[ctkPluginEvent::UPDATED] = "Updated";
+  pluginEventTypeToString[ctkPluginEvent::INSTALLED] = tr("Installed");
+  pluginEventTypeToString[ctkPluginEvent::LAZY_ACTIVATION] = tr("Lazy Activation");
+  pluginEventTypeToString[ctkPluginEvent::RESOLVED] = tr("Resolved");
+  pluginEventTypeToString[ctkPluginEvent::STARTED] = tr("Started");
+  pluginEventTypeToString[ctkPluginEvent::STARTING] = tr("Starting");
+  pluginEventTypeToString[ctkPluginEvent::STOPPED] = tr("Stopped");
+  pluginEventTypeToString[ctkPluginEvent::STOPPING] = tr("Stopping");
+  pluginEventTypeToString[ctkPluginEvent::UNINSTALLED] = tr("Uninstalled");
+  pluginEventTypeToString[ctkPluginEvent::UNRESOLVED] = tr("Unresolved");
+  pluginEventTypeToString[ctkPluginEvent::UPDATED] = tr("Updated");
 
   framework->getPluginContext()->connectFrameworkListener(this, SLOT(frameworkEvent(ctkPluginFrameworkEvent)));
   framework->getPluginContext()->connectPluginListener(this, SLOT(pluginEvent(ctkPluginEvent)));
@@ -112,9 +112,9 @@ ctkPluginBrowser::ctkPluginBrowser(ctkPluginFramework* framework)
   connect(ui.pluginResourcesTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(dbResourceDoubleClicked(QModelIndex)));
   connect(ui.qtResourcesTreeView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(qtResourceDoubleClicked(QModelIndex)));
 
-  startPluginNowAction = new QAction(QIcon(":/pluginbrowser/images/run-now.png"), "Start Plugin (ignore activation policy)", this);
-  startPluginAction = new QAction(QIcon(":/pluginbrowser/images/run.png"), "Start Plugin", this);
-  stopPluginAction = new QAction(QIcon(":/pluginbrowser/images/stop.png"), "Stop Plugin", this);
+  startPluginNowAction = new QAction(QIcon(":/pluginbrowser/images/run-now.png"), tr("Start Plugin (ignore activation policy)"), this);
+  startPluginAction = new QAction(QIcon(":/pluginbrowser/images/run.png"), tr("Start Plugin"), this);
+  stopPluginAction = new QAction(QIcon(":/pluginbrowser/images/stop.png"), tr("Stop Plugin"), this);
 
   connect(startPluginNowAction, SIGNAL(triggered()), this, SLOT(startPluginNow()));
   connect(startPluginAction, SIGNAL(triggered()), this, SLOT(startPlugin()));

Applications/ctkPluginBrowser/ctkPluginTableModel.cpp

@@ -66,15 +66,15 @@ QVariant ctkPluginTableModel::headerData(int section, Qt::Orientation orientatio
   {
     if (section == 0)
     {
-      return QVariant("Plugin");
+      return QVariant(/*no tr*/"Plugin");
     }
     else if (section == 1)
     {
-      return QVariant("Version");
+      return QVariant(/*no tr*/"Version");
     }
     else if (section == 2)
     {
-      return QVariant("State");
+      return QVariant(/*no tr*/"State");
     }
   }
 
@@ -97,12 +97,12 @@ int ctkPluginTableModel::rowCount(const QModelIndex& parent) const
 
 QString ctkPluginTableModel::getStringForState(const ctkPlugin::State state) const
 {
-  static const QString uninstalled("UNINSTALLED");
-  static const QString installed("INSTALLED");
-  static const QString resolved("RESOLVED");
-  static const QString starting("STARTING");
-  static const QString stopping("STOPPING");
-  static const QString active("ACTIVE");
+  static const QString uninstalled = tr("UNINSTALLED");
+  static const QString installed = tr("INSTALLED");
+  static const QString resolved = tr("RESOLVED");
+  static const QString starting = tr("STARTING");
+  static const QString stopping = tr("STOPPING");
+  static const QString active = tr("ACTIVE");
 
   switch(state)
   {
@@ -112,7 +112,7 @@ QString ctkPluginTableModel::getStringForState(const ctkPlugin::State state) con
   case ctkPlugin::STARTING: return starting;
   case ctkPlugin::STOPPING: return stopping;
   case ctkPlugin::ACTIVE: return active;
-  default: return QString("unknown");
+  default: return tr("unknown");
   }
 }
 

Applications/ctkXnatTreeBrowser/ctkXnatTreeBrowserMainWindow.cpp

@@ -87,8 +87,8 @@ void ctkXnatTreeBrowserMainWindow::loginButtonPushed()
     ui->treeView->reset();
     delete m_Session;
     m_Session = 0;
-    ui->loginButton->setText("Login");
-    ui->loginLabel->setText("Disconnected");
+    ui->loginButton->setText(tr("Login"));
+    ui->loginLabel->setText(tr("Disconnected"));
     ui->downloadLabel->hide();
   }
   else
@@ -99,8 +99,8 @@ void ctkXnatTreeBrowserMainWindow::loginButtonPushed()
       m_Session = loginDialog.session();
       if (m_Session)
       {
-        ui->loginButton->setText("Logout");
-        ui->loginLabel->setText(QString("Connected: %1").arg(m_Session->url().toString()));
+        ui->loginButton->setText(tr("Logout"));
+        ui->loginLabel->setText(tr("Connected: %1").arg(m_Session->url().toString()));
         this->connect(m_Session, SIGNAL(timedOut()), this, SLOT(sessionTimedOutMsg()));
         this->connect(m_Session, SIGNAL(aboutToTimeOut()), this, SLOT(sessionAboutToTimeOutMsg()));
 
@@ -192,18 +192,18 @@ void ctkXnatTreeBrowserMainWindow::sessionTimedOutMsg()
   ui->treeView->reset();
   delete m_Session;
   m_Session = 0;
-  ui->loginButton->setText("Login");
-  ui->loginLabel->setText("Disconnected");
+  ui->loginButton->setText(tr("Login"));
+  ui->loginLabel->setText(tr("Disconnected"));
   ui->downloadLabel->hide();
-  QMessageBox::warning(this, "Session Timeout", "The session timed out.");
+  QMessageBox::warning(this, tr("Session Timeout"), tr("The session timed out."));
 }
 
 void ctkXnatTreeBrowserMainWindow::sessionAboutToTimeOutMsg()
 {
   QMessageBox msgBox;
   msgBox.setIcon(QMessageBox::Warning);
-  msgBox.setWindowTitle("Session Timeout Soon");
-  msgBox.setText("The session will time out in 1 minute.\nDo you want to renew the session?");
+  msgBox.setWindowTitle(tr("Session Timeout Soon"));
+  msgBox.setText(tr("The session will time out in 1 minute.\nDo you want to renew the session?"));
   msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
   msgBox.setDefaultButton(QMessageBox::No);
   msgBox.show();

Libs/Widgets/ctkBasePopupWidget.cpp

@@ -463,7 +463,6 @@ void ctkBasePopupWidgetPrivate::hideAll()
 // Qt::Toolip is preferred to Qt::Popup as it would close itself at the first
 // click outside the widget (typically a click in the BaseWidget)
 ctkBasePopupWidget::ctkBasePopupWidget(QWidget* parentWidget)
-  //: Superclass(QApplication::desktop()->screen(QApplication::desktop()->screenNumber(parentWidget)),
   : Superclass(parentWidget,
                PopupWindowType | Qt::FramelessWindowHint)
   , d_ptr(new ctkBasePopupWidgetPrivate(*this))
@@ -474,7 +473,6 @@ ctkBasePopupWidget::ctkBasePopupWidget(QWidget* parentWidget)
 
 // -------------------------------------------------------------------------
 ctkBasePopupWidget::ctkBasePopupWidget(ctkBasePopupWidgetPrivate* pimpl, QWidget* parentWidget)
-  //: //Superclass(QApplication::desktop()->screen(QApplication::desktop()->screenNumber(parentWidget)),
   : Superclass(parentWidget,
                PopupWindowType | Qt::FramelessWindowHint)
   , d_ptr(pimpl)

Plugins/org.commontk.dah.core/ctkDicomAppHostingTypesHelper.cpp

@@ -159,7 +159,6 @@ ctkDicomAppHosting::Status ctkDicomSoapStatus::getStatus(const QtSoapType& type)
 
 //----------------------------------------------------------------------------
 ctkDicomSoapUID::ctkDicomSoapUID(const QString& name, const QString& uid)
-  //: QtSoapSimpleType(QtSoapQName(name), uid)
   : QtSoapStruct(QtSoapQName(name))
 {
   this->insert(new QtSoapSimpleType(QtSoapQName("Uid"),uid));

Plugins/org.commontk.eventbus/ctkEventDefinitions.h

@@ -42,7 +42,7 @@ class ctkBusEvent;
         ctkBusEvent *properties = new ctkBusEvent(topic, ctkEventBus::ctkEventTypeLocal, ctkEventBus::ctkSignatureTypeSignal, static_cast<QObject*>(sender), signature); \
         bool ok = ctkEventBus::ctkEventBusManager::instance()->addEventProperty(*properties);\
         if(!ok) {\
-            qWarning("%s", tr("Some problem occourred during the signal registration with ID '%1'.").arg(topic).toUtf8().data());\
+            qWarning("%s", QString("Some problem occourred during the signal registration with ID '%1'.").arg(topic).toUtf8().data());\
             if(properties) {delete properties; properties = NULL;} \
             }\
     }
@@ -52,7 +52,7 @@ class ctkBusEvent;
         ctkBusEvent *properties = new ctkBusEvent(topic, ctkEventBus::ctkEventTypeRemote, ctkEventBus::ctkSignatureTypeSignal, static_cast<QObject*>(sender), signature); \
         bool ok =  ctkEventBus::ctkEventBusManager::instance()->addEventProperty(*properties);\
         if(!ok) {\
-            qWarning("%s", tr("Some problem occourred during the signal registration with ID '%1'.").arg(topic).toUtf8().data());\
+            qWarning("%s", QString("Some problem occourred during the signal registration with ID '%1'.").arg(topic).toUtf8().data());\
             if(properties) {delete properties; properties = NULL;} \
         }\
     }
@@ -62,7 +62,7 @@ class ctkBusEvent;
         ctkBusEvent *properties = new ctkBusEvent(topic, ctkEventBus::ctkEventTypeLocal, ctkEventBus::ctkSignatureTypeCallback, static_cast<QObject*>(observer), signature); \
         bool ok =  ctkEventBus::ctkEventBusManager::instance()->addEventProperty(*properties);\
         if(!ok) {\
-            qWarning("%s", tr("Some problem occourred during the callback registration with ID '%1'.").arg(topic).toUtf8().data());\
+            qWarning("%s", QString("Some problem occourred during the callback registration with ID '%1'.").arg(topic).toUtf8().data());\
             if(properties) {delete properties; properties = NULL;} \
         }\
     }
@@ -72,7 +72,7 @@ class ctkBusEvent;
         ctkBusEvent *properties = new ctkBusEvent(topic, ctkEventBus::ctkEventTypeRemote, ctkEventBus::ctkSignatureTypeCallback, static_cast<QObject*>(sender), signature); \
         bool ok =  ctkEventBus::ctkEventBusManager::instance()->addEventProperty(*properties);\
         if(!ok) {\
-            qWarning("%s", tr("Some problem occourred during the callback registration with ID '%1'.").arg(topic).toUtf8().data());\
+            qWarning("%s", QString("Some problem occourred during the callback registration with ID '%1'.").arg(topic).toUtf8().data());\
             if(properties) {delete properties; properties = NULL;} \
         }\
     }