Skip to content

Commit

Permalink
Updates for internationalisation from Carlos
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@8671 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jun 23, 2008
1 parent e382790 commit b097987
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1203,13 +1203,15 @@ void QgisApp::createStatusBar()
"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());
Expand All @@ -1230,7 +1232,6 @@ void QgisApp::createStatusBar()
// 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());
Expand Down Expand Up @@ -1374,7 +1375,7 @@ void QgisApp::createCanvas()
{
// "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);
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsexception.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* *
***************************************************************************/


#include <QObject>
#include "qgsexception.h"


Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsattributeactiondialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit b097987

Please sign in to comment.