[QGIS Commit] r8671 - in trunk/qgis/src: app core ui

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-06-23 04:54:39 -0400 (Mon, 23 Jun 2008)
New Revision: 8671

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/core/qgsexception.cpp
   trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
Log:
Updates for internationalisation from Carlos

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-06-22 15:00:52 UTC (rev 8670)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-06-23 08:54:39 UTC (rev 8671)
@@ -1203,13 +1203,15 @@
         "as the mouse is moved."));
   mCoordsLabel->setToolTip(tr("Map coordinates at mouse cursor position"));
   statusBar()->addPermanentWidget(mCoordsLabel, 0);
+  QString myIconPath = QgsApplication::themePath();
   //stop rendering status bar widget
   mStopRenderButton = new QToolButton( statusBar() );
   mStopRenderButton->setMaximumWidth(20);
   mStopRenderButton->setMaximumHeight(20);
-//#ifdef Q_WS_MAC //MH: disable the button on Mac for now to avoid problems with resizing
-  mStopRenderButton->setEnabled(false);
-//#endif //Q_WS_MAC
+  QPixmap myStopPixmap;
+  myStopPixmap.load(myIconPath+"/mIconDelete.png");
+  mStopRenderButton->setIcon(myStopPixmap);
+  mStopRenderButton->setToolTip(tr("Stop map rendering") );
   statusBar()->addPermanentWidget(mStopRenderButton, 0);
   // render suppression status bar widget
   mRenderSuppressionCBox = new QCheckBox(tr("Render"),statusBar());
@@ -1230,7 +1232,6 @@
   // For Qt/Mac 3.3, the default toolbutton height is 30 and labels were expanding to match
   mOnTheFlyProjectionStatusButton->setMaximumHeight(mScaleLabel->height());
   QPixmap myProjPixmap;
-  QString myIconPath = QgsApplication::themePath();
   myProjPixmap.load(myIconPath+"/mIconProjectionDisabled.png");
   mOnTheFlyProjectionStatusButton->setIcon(myProjPixmap);
   QgsDebugMsg("Icon Path: " + myIconPath.toLocal8Bit());
@@ -1374,7 +1375,7 @@
 {
   // "theMapCanvas" used to find this canonical instance later
   mMapCanvas = new QgsMapCanvas(this, "theMapCanvas" );
-  mMapCanvas->setWhatsThis(tr("Map canvas. This is where raster and vector"
+  mMapCanvas->setWhatsThis(tr("Map canvas. This is where raster and vector "
         "layers are displayed when added to the map"));
   
 //  mMapCanvas->setMinimumWidth(10);

Modified: trunk/qgis/src/core/qgsexception.cpp
===================================================================
--- trunk/qgis/src/core/qgsexception.cpp	2008-06-22 15:00:52 UTC (rev 8670)
+++ trunk/qgis/src/core/qgsexception.cpp	2008-06-23 08:54:39 UTC (rev 8671)
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
+#include <QObject>
 #include "qgsexception.h"
 
 

Modified: trunk/qgis/src/ui/qgsattributeactiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsattributeactiondialogbase.ui	2008-06-22 15:00:52 UTC (rev 8670)
+++ trunk/qgis/src/ui/qgsattributeactiondialogbase.ui	2008-06-23 08:54:39 UTC (rev 8671)
@@ -92,7 +92,7 @@
          <string>Click to browse for an action</string>
         </property>
         <property name="whatsThis" >
-         <string>Clicking the buttone will let you select an application to use as the action</string>
+         <string>Clicking the button will let you select an application to use as the action</string>
         </property>
         <property name="text" >
          <string>...</string>