[QGIS Commit] r11001 - in trunk/qgis/src/plugins/evis:
databaseconnection eventbrowser ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Jul 1 17:51:21 EDT 2009
Author: jef
Date: 2009-07-01 17:51:21 -0400 (Wed, 01 Jul 2009)
New Revision: 11001
Modified:
trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
trunk/qgis/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
trunk/qgis/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
Log:
fix some evis typos and update translation strings
Modified: trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
===================================================================
--- trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp 2009-07-01 19:43:21 UTC (rev 11000)
+++ trunk/qgis/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp 2009-07-01 21:51:21 UTC (rev 11001)
@@ -279,7 +279,7 @@
//Try to connect the database connection object
if( mDatabaseConnection->connect( ) )
{
- teditConsole->append( tr( "Connection to" ) +" ["+ leDatabaseHost->text( ) +"."+ leDatabaseName->text( ) +"] "+ tr( "established" ) );
+ teditConsole->append( tr( "Connection to [%1.%2] established" ).arg( leDatabaseHost->text() ).arg( leDatabaseName->text() ) );
lblConnectionStatus->setText( tr( "connected" ) );
//List the tables in the database
@@ -292,7 +292,8 @@
}
else
{
- teditConsole->append( tr( "Connection to [" )+ leDatabaseHost->text( ) +"."+ leDatabaseName->text( ) +tr( "] failed: " )+ mDatabaseConnection->lastError( ) );
+ teditConsole->append( tr( "Connection to [%1.%2] failed: %3" )
+ .arg( leDatabaseHost->text() ).arg( leDatabaseName->text( ) ).arg( mDatabaseConnection->lastError() ) );
}
}
}
@@ -410,7 +411,7 @@
}
else
{
- teditConsole->append( tr( "Error: Unabled to open file" ) + " ["+ myFilename +"]" );
+ teditConsole->append( tr( "Error: Unabled to open file [%1]" ).arg( myFilename ) );
}
}
}
@@ -466,7 +467,7 @@
QSqlQuery* myResults = mDatabaseConnection->query( teditSqlStatement->toPlainText( ) );
if( 0 == myResults )
{
- teditConsole->append( tr( "Error: Query failed: " )+ mDatabaseConnection->lastError( ) );
+ teditConsole->append( tr( "Error: Query failed: %1" ).arg( mDatabaseConnection->lastError( ) ) );
}
else if( myResults->isSelect( ) )
{
@@ -520,7 +521,7 @@
}
else
{
- teditConsole->append( tr( "Error: Counld not create temporary file, process halted" ) );
+ teditConsole->append( tr( "Error: Could not create temporary file, process halted" ) );
}
}
}
Modified: trunk/qgis/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
===================================================================
--- trunk/qgis/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp 2009-07-01 19:43:21 UTC (rev 11000)
+++ trunk/qgis/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp 2009-07-01 21:51:21 UTC (rev 11001)
@@ -306,14 +306,7 @@
pbtnNext->setEnabled( true );
}
- if( mFeatureIds.size( ) < 10 )
- {
- setWindowTitle( tr( "Event Browser - Displaying records 01 of") +" 0"+ QString::number( mFeatureIds.size( ) ) );
- }
- else
- {
- setWindowTitle( tr( "Event Browser - Displaying records 01 of") +" "+ QString::number( mFeatureIds.size( ) ) );
- }
+ setWindowTitle( tr( "Event Browser - Displaying records 01 of %1").arg( mFeatureIds.size(), 2, 10, QChar('0') ) );
//Set Options tab gui items
initOptionsTab( );
@@ -996,28 +989,8 @@
pbtnPrevious->setEnabled( true );
mCurrentFeatureIndex++;
- if( mFeatureIds.size( ) < 10 )
- {
- if( mCurrentFeatureIndex < 9 )
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" 0%2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- else
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" 0%2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- }
- else
- {
- if( mCurrentFeatureIndex < 9 )
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" %2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- else
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "%1 "+ tr( "of" ) +" %2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- }
+ setWindowTitle( tr( "Event Browser - Displaying records %1 of %2" )
+ .arg( mCurrentFeatureIndex+1, 2, 10, QChar('0') ).arg( mFeatureIds.size(), 2, 10, QChar('0') ) );
loadRecord( );
}
@@ -1038,28 +1011,8 @@
pbtnNext->setEnabled( true );
mCurrentFeatureIndex--;
- if( mFeatureIds.size( ) < 10 )
- {
- if( mCurrentFeatureIndex < 9 )
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" 0%2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- else
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" 0%2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- }
- else
- {
- if( mCurrentFeatureIndex < 9 )
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "0%1 "+ tr( "of" ) +" %2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- else
- {
- setWindowTitle( tr( "Event Browser - Displaying records " )+ QString( "%1 "+ tr( "of" ) +" %2" ).arg( mCurrentFeatureIndex+1 ).arg( mFeatureIds.size( ) ) );
- }
- }
+ setWindowTitle( tr( "Event Browser - Displaying records %1 of %2" )
+ .arg( mCurrentFeatureIndex+1, 2, 10, QChar('0') ).arg( mFeatureIds.size(), 2, 10, QChar('0') ) );
loadRecord( );
}
Modified: trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
===================================================================
--- trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp 2009-07-01 19:43:21 UTC (rev 11000)
+++ trunk/qgis/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp 2009-07-01 21:51:21 UTC (rev 11001)
@@ -50,7 +50,7 @@
pbtnZoomFull->setEnabled( false );
QString myThemePath = QgsApplication::activeThemePath( );
pbtnZoomIn->setToolTip( tr( "Zoom in" ) );
- pbtnZoomIn->setWhatsThis( tr( "Zoom in to see more detal." ) );
+ pbtnZoomIn->setWhatsThis( tr( "Zoom in to see more detail." ) );
pbtnZoomOut->setToolTip( tr( "Zoom out" ) );
pbtnZoomOut->setWhatsThis( tr( "Zoom out to see more area." ) );
pbtnZoomFull->setToolTip( tr( "Zoom to full extent" ) );
Modified: trunk/qgis/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
===================================================================
--- trunk/qgis/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui 2009-07-01 19:43:21 UTC (rev 11000)
+++ trunk/qgis/src/plugins/evis/ui/evisdatabaseconnectionguibase.ui 2009-07-01 21:51:21 UTC (rev 11001)
@@ -44,7 +44,7 @@
</rect>
</property>
<attribute name="label" >
- <string>Predfined Queries</string>
+ <string>Predefined Queries</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
@@ -105,7 +105,7 @@
<string/>
</property>
<property name="whatsThis" >
- <string>Select the predefined query you want to use from the drop-down list containing queries identified form the file loaded using the Open File icon above. To run the query you need to click on the SQL Query tab. The query will be automatically entered in the query window.</string>
+ <string>Select the predefined query you want to use from the drop-down list containing queries identified from the file loaded using the Open File icon above. To run the query you need to click on the SQL Query tab. The query will be automatically entered in the query window.</string>
</property>
</widget>
</item>
Modified: trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
===================================================================
--- trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui 2009-07-01 19:43:21 UTC (rev 11000)
+++ trunk/qgis/src/plugins/evis/ui/evisgenericeventbrowserguibase.ui 2009-07-01 21:51:21 UTC (rev 11001)
@@ -264,7 +264,7 @@
<string/>
</property>
<property name="whatsThis">
- <string>If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below. </string>
+ <string>If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below.</string>
</property>
<property name="text">
<string>Path Is Relative</string>
@@ -690,7 +690,7 @@
</sizepolicy>
</property>
<property name="toolTip">
- <string>Base path</string>
+ <string>Base Path</string>
</property>
<property name="whatsThis">
<string>The Base Path onto which the relative path defined above will be appended.</string>
@@ -747,7 +747,7 @@
<string>Reset to default</string>
</property>
<property name="whatsThis">
- <string>Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information.</string>
+ <string>Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information.</string>
</property>
<property name="text">
<string/>
@@ -849,7 +849,7 @@
<string/>
</property>
<property name="whatsThis">
- <string>If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter.</string>
+ <string>If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter.</string>
</property>
<property name="text">
<string>Apply Path to Image rules when loading docs in external applications</string>
More information about the QGIS-commit
mailing list