Changeset 834

Timestamp:

08/18/08 16:26:26 (3 months ago)

Author:

liamstask

Message:

- adding tags for translation in source & first translation file
- bumping version number in .pro

Location:

mcbuilder/trunk

Files:

• mcbuilder.pro (modified) (2 diffs)
• src/About.cpp (modified) (1 diff)
• src/AppUpdater.cpp (modified) (4 diffs)
• src/Builder.cpp (modified) (8 diffs)
• src/MainWindow.cpp (modified) (25 diffs)
• src/Uploader.cpp (modified) (3 diffs)
• src/main.cpp (modified) (2 diffs)
• translations (added)
• translations/mcbuilder_fr.ts (added)

mcbuilder/trunk/mcbuilder.pro

@@ -1 @@
-MCBUILDER_VERSION = "0.2.0"
+MCBUILDER_VERSION = "0.5.0"
 TEMPLATE = app
 #CONFIG += release
@@ -39 +39 @@
           src/BuildLog.cpp \
           src/ProjectManager.cpp
+          
+TRANSLATIONS = translations/mcbuilder_fr.ts
 
 TARGET = mcbuilder

mcbuilder/trunk/src/About.cpp

@@ -28 +28 @@
   verticalLayout->addWidget(&body);
   body.setOpenExternalLinks(true);
-  versionLabel->setText(QString("<font size=6>mcbuilder</font><br>Version %1").arg(MCBUILDER_VERSION));
-  body.append(QString("By <a href=\"http://www.makingthings.com\">MakingThings</a>, %1.<br>").arg(QDate::currentDate().toString("yyyy")));
-  body.append("Thanks to Erik Gilling for <a href=\"http://oss.tekno.us/sam7utils\">sam7utils</a>.<br>");
-  body.append("Thanks to Michael Fischer for <a href=\"http://www.yagarto.de\">Yagarto</a>.<br>");
-  body.append("Application icon by <a href=\"http://cultivatestudios.com\">Cultivate Studios</a>.<br>");
-  body.append("Toolbar icons by <a href=\"http://www.mattballdesign.com\">Matt Ball</a> and <a href=\"http://cultivatestudios.com\">Cultivate Studios</a>.");
+  versionLabel->setText(tr("<font size=6>mcbuilder</font><br>Version %1").arg(MCBUILDER_VERSION));
+  body.append(tr("By <a href=\"http://www.makingthings.com\">MakingThings</a>, %1.<br>").arg(QDate::currentDate().toString("yyyy")));
+  body.append(tr("Thanks to Erik Gilling for <a href=\"http://oss.tekno.us/sam7utils\">sam7utils</a>.<br>"));
+  body.append(tr("Thanks to Michael Fischer for <a href=\"http://www.yagarto.de\">Yagarto</a>.<br>"));
+  body.append(tr("Application icon by <a href=\"http://cultivatestudios.com\">Cultivate Studios</a>.<br>"));
+  body.append(tr("Toolbar icons by <a href=\"http://www.mattballdesign.com\">Matt Ball</a> and <a href=\"http://cultivatestudios.com\">Cultivate Studios</a>."));
 }
 

mcbuilder/trunk/src/AppUpdater.cpp

@@ -32 +32 @@
 {
   setModal( true );
-  setWindowTitle( "Software Update" );
+  setWindowTitle( tr("Software Update") );
   
   acceptButton.setDefault( true );
@@ -82 +82 @@
   if (!doc.setContent(http.readAll(), true, &err, &line, &col))
   {
-    headline.setText( "<font size=4>Couldn't contact the update server...</font>" );
-    details.setText( QString( "Make sure you're connected to the internet." ) );
+    headline.setText( tr("<font size=4>Couldn't contact the update server...</font>") );
+    details.setText( tr( "Make sure you're connected to the internet." ) );
     acceptButton.setText( tr("OK") );
     acceptButton.disconnect( ); // make sure it wasn't connected by anything else previously
@@ -133 +133 @@
   if( updateAvailable )
   {
-    headline.setText( "<font size=4>A new version of mcbuilder is available!</font>" );
-    QString d = QString( "mcbuilder %1 is now available (you have %2).  Would you like to download it?" )
+    headline.setText( tr("<font size=4>A new version of mcbuilder is available!</font>" ));
+    QString d = tr( "mcbuilder %1 is now available (you have %2).  Would you like to download it?" )
                           .arg(latest.first).arg( MCBUILDER_VERSION );
     details.setText( d );
@@ -152 +152 @@
   else
   {
-    headline.setText( "<font size=4>You're up to date!</font>" );
-    details.setText( QString( "You're running the latest version of mcbuilder, version %1." ).arg( MCBUILDER_VERSION ) );
+    headline.setText( tr("<font size=4>You're up to date!</font>") );
+    details.setText( tr( "You're running the latest version of mcbuilder, version %1." ).arg( MCBUILDER_VERSION ) );
     acceptButton.setText( tr("OK") );
     acceptButton.disconnect( );

mcbuilder/trunk/src/Builder.cpp

@@ -54 +54 @@
   {
     createConfigFile(currentProjectPath);      // create a config file based on the Properties for this project
-    qDebug("creating/updating config file");
+    qDebug("builder - creating/updating config file");
   }
   createMakefile(currentProjectPath);        // create a Makefile for this project, given the dependencies
@@ -138 +138 @@
         if(filesize <= 256000)
         {
-          mainWindow->printOutput(QString("%1.bin is %2 out of a possible 256000 bytes.").arg(projectName).arg(filesize));
+          mainWindow->printOutput(tr("%1.bin is %2 out of a possible 256000 bytes.").arg(projectName).arg(filesize));
           mainWindow->onBuildComplete(true);
           success = true;
         }
         else
-          mainWindow->printOutputError(QString("Error - %1.bin is too big!  %2 out of a possible 256000 bytes.").arg(projectName).arg(filesize));
+          mainWindow->printOutputError(tr("Error - %1.bin is too big!  %2 out of a possible 256000 bytes.").arg(projectName).arg(filesize));
       }
       if(!success)
@@ -181 +181 @@
     QTextStream tofile(&makefile);
     tofile << "##################################################################################################" << endl;
-    tofile << "#" << endl << "# This file generated automatically by mcbuilder - ";
+    tofile << "#" << endl << tr("# This file generated automatically by mcbuilder - ");
     tofile << QDateTime::currentDateTime().toString("MMM d, yyyy h:m ap") << endl;
-    tofile << "# Any manual changes made to this file will be overwritten the next time mcbuilder builds." << endl << "#" << endl;
+    tofile << tr("# Any manual changes made to this file will be overwritten the next time mcbuilder builds.") << endl << "#" << endl;
     tofile << "##################################################################################################" << endl << endl;
 
@@ -349 +349 @@
     tofile << "/*****************************************************************************************" << endl << endl;
     tofile << "  config.h" << endl;
-    tofile << "  Generated automatically by mcbuilder - " << QDateTime::currentDateTime().toString("MMM d, yyyy h:m ap") << endl;
-    tofile << "  Any manual changes made to this file will be overwritten the next time mcbuilder builds." << endl << endl;
+    tofile << tr("  Generated automatically by mcbuilder - ") << QDateTime::currentDateTime().toString("MMM d, yyyy h:m ap") << endl;
+    tofile << tr("  Any manual changes made to this file will be overwritten the next time mcbuilder builds.") << endl << endl;
     tofile << "******************************************************************************************/" << endl << endl;
     
@@ -546 +546 @@
   {
     case QProcess::FailedToStart:
-      msg = QString("'%1' failed to start.  It's either missing, or doesn't have the correct permissions").arg(currentProcess);
+      msg = tr("'%1' failed to start.  It's either missing, or doesn't have the correct permissions").arg(currentProcess);
       break;
     case QProcess::Crashed:
-      msg = QString("'%1' was canceled or crashed.").arg(currentProcess);
+      msg = tr("'%1' was canceled or crashed.").arg(currentProcess);
       break;
     case QProcess::Timedout:
-      msg = QString("'%1' timed out.").arg(currentProcess);
+      msg = tr("'%1' timed out.").arg(currentProcess);
       break;
     case QProcess::WriteError:
-      msg = QString("'%1' reported a write error.").arg(currentProcess);
+      msg = tr("'%1' reported a write error.").arg(currentProcess);
       break;
     case QProcess::ReadError:
-      msg = QString("'%1' reported a read error.").arg(currentProcess);
+      msg = tr("'%1' reported a read error.").arg(currentProcess);
       break;
     case QProcess::UnknownError:
-      msg = QString("'%1' - unknown error type.").arg(currentProcess);
-      break;
-  }
-  mainWindow->printOutputError("Error: " + msg);
+      msg = tr("'%1' - unknown error type.").arg(currentProcess);
+      break;
+  }
+  mainWindow->printOutputError(tr("Error: ") + msg);
   resetBuildProcess();
   mainWindow->onBuildComplete(false);
@@ -676 +676 @@
     QFileInfo fi(filepath);
     ConsoleItem *item;
-    QString fullmsg = QString("%1 (line %2): %3").arg(fi.fileName()).arg(linenumber).arg(msg);
+    QString fullmsg = tr("%1 (line %2): %3").arg(fi.fileName()).arg(linenumber).arg(msg);
     if(severity == "error")
     {
@@ -713 +713 @@
     //qDebug("cap! %s: In function %s", qPrintable(filepath), qPrintable(func));
     QFileInfo fi(filepath);
-    QString fullmsg = QString("%1: In function %2").arg(fi.fileName()).arg(func);
+    QString fullmsg = tr("%1: In function %2").arg(fi.fileName()).arg(func);
     mainWindow->printOutputError(fullmsg);
     pos += errExp.matchedLength(); // step the index past the match so we can continue looking
@@ -738 +738 @@
     //qDebug("cap! %s: In function %s", qPrintable(filepath), qPrintable(func));
     QFileInfo fi(filepath);
-    QString fullmsg = QString("Error - in %1: Undefined reference to %2").arg(fi.fileName()).arg(func);
+    QString fullmsg = tr("Error - in %1: Undefined reference to %2").arg(fi.fileName()).arg(func);
     mainWindow->printOutputError(fullmsg);
     pos += errExp.matchedLength(); // step the index past the match so we can continue looking

mcbuilder/trunk/src/MainWindow.cpp

@@ -221 +221 @@
   editor->setExtraSelections( extras );
   
-  statusBar()->showMessage( QString("Line: %1  Column: %2").arg(c.blockNumber()+1).arg(c.columnNumber()));
+  statusBar()->showMessage( tr("Line: %1  Column: %2").arg(c.blockNumber()+1).arg(c.columnNumber()));
 }
 
@@ -361 +361 @@
   if(currentProject.isEmpty())
   {
-    statusBar()->showMessage( "Need to open a project first.  Open or create a new one from the File menu.", 3500 );
+    statusBar()->showMessage( tr("Need to open a project first.  Open or create a new one from the File menu."), 3500 );
     return;
   }
@@ -426 +426 @@
     QTextStream out(&file);
     out << QString("// %1").arg(fi.fileName()) << endl;
-    out << QString("// created %1").arg(QDate::currentDate().toString("MMM d, yyyy") ) << endl << endl;
+    out << tr("// created %1").arg(QDate::currentDate().toString("MMM d, yyyy") ) << endl << endl;
     file.close();
     editorLoadFile(fi.filePath());
@@ -449 +449 @@
   else
   {
-    QString message = QString("Couldn't find %1.").arg(file.fileName());
+    QString message = tr("Couldn't find %1.").arg(file.fileName());
     currentFileDropDown->removeItem(currentFileDropDown->findText(file.fileName()));
     statusBar()->showMessage(message, 3000);
@@ -495 +495 @@
   QString projectName = projectDir.dirName();
   if(!projectDir.exists())
-    return statusBar()->showMessage( QString("Couldn't find %1.").arg(projectName), 3500 );
+    return statusBar()->showMessage( tr("Couldn't find %1.").arg(projectName), 3500 );
 
   QString pathname = projectName; // filename should not have spaces
@@ -534 +534 @@
   }
   else
-    return statusBar()->showMessage( QString("Couldn't find main file for %1.").arg(projectName), 3500 );
+    return statusBar()->showMessage( tr("Couldn't find main file for %1.").arg(projectName), 3500 );
 }
 
@@ -577 +577 @@
 {
   if(currentFile.isEmpty())
-    return statusBar()->showMessage( "Need to open a file or project first.  Open or create a new one from the File menu.", 3500 );
+    return statusBar()->showMessage( tr("Need to open a file or project first.  Open or create a new one from the File menu."), 3500 );
   save( );
 }
@@ -599 +599 @@
   else
   {
-    statusBar()->showMessage( "Couldn't save...maybe the current file has been moved or deleted.", 3500 );
+    statusBar()->showMessage( tr("Couldn't save...maybe the current file has been moved or deleted."), 3500 );
     return false;
   }
@@ -633 +633 @@
 {
   if(currentFile.isEmpty())
-    return statusBar()->showMessage( "Need to open a project first.  Open or create a new one from the File menu.", 3500 );
+    return statusBar()->showMessage( tr("Need to open a project first.  Open or create a new one from the File menu."), 3500 );
     
   QString newFileName = QFileDialog::getSaveFileName(this, tr("Save As"), 
@@ -684 +684 @@
 {
   if(currentProject.isEmpty())
-    return statusBar()->showMessage( "Open a project to build, or create a new one from the File menu.", 3500 );
+    return statusBar()->showMessage( tr("Open a project to build, or create a new one from the File menu."), 3500 );
   if(!maybeSave( ))
     return;
@@ -694 +694 @@
   }
   else
-    return statusBar()->showMessage( "Builder is currently busy...give it a second, then try again.", 3500 );
+    return statusBar()->showMessage( tr("Builder is currently busy...give it a second, then try again."), 3500 );
 }
 
@@ -715 +715 @@
   if(success)
   {
-    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), "Build succeeded.", outputConsole));
+    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), tr("Build succeeded."), outputConsole));
     outputConsole->scrollToBottom();
-    statusBar()->showMessage("Build succeeded.");
+    statusBar()->showMessage(tr("Build succeeded."));
   }
   else
   {
-    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/error.png"), "Build failed.", outputConsole));
+    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/error.png"), tr("Build failed."), outputConsole));
     outputConsole->scrollToBottom();
-    statusBar()->showMessage("Build failed.");
+    statusBar()->showMessage(tr("Build failed."));
   }
   actionStop->setEnabled(false);
@@ -732 +732 @@
   if(success)
   {
-    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), "Upload succeeded.", outputConsole));
+    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), tr("Upload succeeded."), outputConsole));
     outputConsole->scrollToBottom();
-    statusBar()->showMessage("Upload succeeded.");
+    statusBar()->showMessage(tr("Upload succeeded."));
   }
   else
   {
-    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/error.png"), "Upload failed.", outputConsole));
+    outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/error.png"), tr("Upload failed."), outputConsole));
     outputConsole->scrollToBottom();
-    statusBar()->showMessage("Upload failed.");
+    statusBar()->showMessage(tr("Upload failed."));
   }
 }
@@ -747 +747 @@
 {
   outputConsole->clear();
-  outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), "Clean succeeded.", outputConsole));
-  statusBar()->showMessage("Clean succeeded.");
+  outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/success.png"), tr("Clean succeeded."), outputConsole));
+  statusBar()->showMessage(tr("Clean succeeded."));
 }
 
 void MainWindow::buildingNow(QString file)
 {
-  statusBar()->showMessage("Building..." + file);
+  statusBar()->showMessage(tr("Building...") + file);
 }
 
@@ -767 +767 @@
     builder->clean(currentProject);
   else
-    return statusBar()->showMessage( "Builder is currently busy...give it a second, then try again.", 3500 );
+    return statusBar()->showMessage( tr("Builder is currently busy...give it a second, then try again."), 3500 );
 }
 
@@ -777 +777 @@
 {
   if(currentProject.isEmpty())
-    return statusBar()->showMessage( "Open a project first, or create a new one from the File menu.", 3500 );
+    return statusBar()->showMessage( tr("Open a project first, or create a new one from the File menu."), 3500 );
   if( !projInfo->loadAndShow() )
   {
     QDir dir(currentProject);
-    return statusBar()->showMessage( "Couldn't find/open project properties for " + dir.dirName(), 3500 );
+    return statusBar()->showMessage( tr("Couldn't find/open project properties for ") + dir.dirName(), 3500 );
   }
 }
@@ -792 +792 @@
 {
   if(currentProject.isEmpty())
-    return statusBar()->showMessage( "Open a project to upload, or create a new one from the File menu.", 3500 );
+    return statusBar()->showMessage( tr("Open a project to upload, or create a new one from the File menu."), 3500 );
   QDir projectDir(currentProject);
   projectDir.cd("build");
@@ -800 +800 @@
     uploadFile(bins.first().filePath());
   else
-    return statusBar()->showMessage( "Couldn't find the file to upload for this project.", 3500 );
+    return statusBar()->showMessage( tr("Couldn't find the file to upload for this project."), 3500 );
 }
 
@@ -825 +825 @@
   QFileInfo fi(filename);
   if(!fi.exists())
-    return statusBar()->showMessage( QString("Couldn't find %1.").arg(fi.fileName()), 3500 );
+    return statusBar()->showMessage( tr("Couldn't find %1.").arg(fi.fileName()), 3500 );
   QAction *board = boardTypeGroup->checkedAction( );
   if(board)
@@ -832 +832 @@
       uploader->upload(board->data().toString(), filename);
     else
-      return statusBar()->showMessage( "Uploader is currently busy...give it a second, then try again.", 3500 );
+      return statusBar()->showMessage( tr("Uploader is currently busy...give it a second, then try again."), 3500 );
   }
   else
-    return statusBar()->showMessage( "Please select a board type from the Project menu first.", 3500 );
+    return statusBar()->showMessage( tr("Please select a board type from the Project menu first."), 3500 );
 }
 
@@ -934 +934 @@
         QMenu *menu = new QMenu(libname, menuLibraries);
         menuLibraries->addMenu(menu);
-        QAction *a = new QAction("Import to Current Project", menu);
+        QAction *a = new QAction(tr("Import to Current Project"), menu);
         a->setData(library);
         menu->addAction(a);
@@ -941 +941 @@
         if(nodes.count())
         {
-          a = new QAction("View Documentation", menu);
+          a = new QAction(tr("View Documentation"), menu);
           QString doclink = nodes.at(0).toElement().text();
           QUrl url(doclink);
@@ -962 +962 @@
 void MainWindow::onLibrary(QAction *example)
 {
-  if(example->text() == "Import to Current Project")
+  if(example->text() == tr("Import to Current Project"))
   {
     QString includeString = QString("#include \"%1.h\"").arg(example->data().toString());
@@ -973 +973 @@
     }
   }
-  else if(example->text() == "View Documentation")
+  else if(example->text() == tr("View Documentation"))
     QDesktopServices::openUrl(QUrl::fromLocalFile(example->data().toString()));
 }
@@ -1002 +1002 @@
 void MainWindow::printOutputError(QString text)
 {
-  if(text.startsWith("Warning"))
+  if(text.startsWith(tr("Warning")))
     outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/warning.png"), text.trimmed(), outputConsole));
-  else if(text.startsWith("Error"))
+  else if(text.startsWith(tr("Error")))
     outputConsole->addItem(new QListWidgetItem(QIcon(":/icons/error.png"), text.trimmed(), outputConsole));
   else

mcbuilder/trunk/src/Uploader.cpp

@@ -107 +107 @@
   if(err.startsWith("can't find boot agent"))
   {
-    mainWindow->printOutputError("Error - couldn't find an unprogrammed board to upload to.");
-    mainWindow->printOutputError("  Make sure you've erased and unplugged/replugged your board.");
+    mainWindow->printOutputError(tr("Error - couldn't find an unprogrammed board to upload to."));
+    mainWindow->printOutputError(tr("  Make sure you've erased and unplugged/replugged your board."));
   }
   else
@@ -122 +122 @@
 {
   QFileInfo fi(currentFile);
-  uploaderProgress->setLabelText(QString("Uploading %1...").arg(fi.fileName()));
+  uploaderProgress->setLabelText(tr("Uploading %1...").arg(fi.fileName()));
   uploaderProgress->show();
 }
@@ -149 +149 @@
   {
     case QProcess::FailedToStart:
-      msg = QString("uploader failed to start.  '%1' is either missing, or doesn't have the correct permissions").arg(uploaderName);
+      msg = tr("uploader failed to start.  '%1' is either missing, or doesn't have the correct permissions").arg(uploaderName);
       break;
     case QProcess::Crashed:
-      msg = QString("uploader (%1) was canceled or crashed.").arg(uploaderName);
+      msg = tr("uploader (%1) was canceled or crashed.").arg(uploaderName);
       break;
     case QProcess::Timedout:
-      msg = QString("uploader (%1) timed out.").arg(uploaderName);
+      msg = tr("uploader (%1) timed out.").arg(uploaderName);
       break;
     case QProcess::WriteError:
-      msg = QString("uploader (%1) reported a write error.").arg(uploaderName);
+      msg = tr("uploader (%1) reported a write error.").arg(uploaderName);
       break;
     case QProcess::ReadError:
-      msg = QString("uploader (%1) reported a read error.").arg(uploaderName);
+      msg = tr("uploader (%1) reported a read error.").arg(uploaderName);
       break;
     case QProcess::UnknownError:
-      msg = QString("uploader (%1) - unknown error type.").arg(uploaderName);
+      msg = tr("uploader (%1) - unknown error type.").arg(uploaderName);
       break;
   }
-  mainWindow->printOutputError("Error - " + msg);
+  mainWindow->printOutputError(tr("Error - ") + msg);
 }
 

mcbuilder/trunk/src/main.cpp

@@ -19 +19 @@
 
 #include <QApplication>
+#include <QTranslator>
+#include <QLibraryInfo>
 #include "MainWindow.h"
 
@@ -24 +26 @@
 {
   QApplication app(argc, argv);
+  
+  QString locale = QLocale::system().name();
+
+  QTranslator qtTranslator;
+  QTranslator mcbuilderTranslator;
+
+  qtTranslator.load(QString("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+  app.installTranslator(&qtTranslator);
+
+  mcbuilderTranslator.load(QString("mcbuilder_") + locale);
+  app.installTranslator(&mcbuilderTranslator);
+
   MainWindow window;
   window.show();