Skip to content

Commit

Permalink
fix some evis typos and update translation strings
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@11001 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 1, 2009
1 parent ef8f540 commit 37f185f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ void eVisDatabaseConnectionGui::on_pbtnConnect_clicked( )
//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
Expand All @@ -292,7 +292,8 @@ void eVisDatabaseConnectionGui::on_pbtnConnect_clicked( )
}
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() ) );
}
}
}
Expand Down Expand Up @@ -410,7 +411,7 @@ void eVisDatabaseConnectionGui::on_pbtnLoadPredefinedQueries_clicked( )
}
else
{
teditConsole->append( tr( "Error: Unabled to open file" ) + " ["+ myFilename +"]" );
teditConsole->append( tr( "Error: Unabled to open file [%1]" ).arg( myFilename ) );
}
}
}
Expand Down Expand Up @@ -466,7 +467,7 @@ void eVisDatabaseConnectionGui::on_pbtnRunQuery_clicked( )
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( ) )
{
Expand Down Expand Up @@ -520,7 +521,7 @@ void eVisDatabaseConnectionGui::on_pbtnRunQuery_clicked( )
}
else
{
teditConsole->append( tr( "Error: Counld not create temporary file, process halted" ) );
teditConsole->append( tr( "Error: Could not create temporary file, process halted" ) );
}
}
}
Expand Down
57 changes: 5 additions & 52 deletions src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,14 +306,7 @@ bool eVisGenericEventBrowserGui::initBrowser( )
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( );
Expand Down Expand Up @@ -996,28 +989,8 @@ void eVisGenericEventBrowserGui::on_pbtnNext_clicked( )
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( );
}
Expand All @@ -1038,28 +1011,8 @@ void eVisGenericEventBrowserGui::on_pbtnPrevious_clicked( )
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( );
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ eVisImageDisplayWidget::eVisImageDisplayWidget( QWidget* parent, Qt::WFlags fl )
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" ) );
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/evis/ui/evisdatabaseconnectionguibase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</rect>
</property>
<attribute name="label" >
<string>Predfined Queries</string>
<string>Predefined Queries</string>
</attribute>
<layout class="QGridLayout" >
<property name="margin" >
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/evis/ui/evisgenericeventbrowserguibase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ p, li { white-space: pre-wrap; }
<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>
Expand Down Expand Up @@ -690,7 +690,7 @@ p, li { white-space: pre-wrap; }
</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>
Expand Down Expand Up @@ -747,7 +747,7 @@ p, li { white-space: pre-wrap; }
<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/>
Expand Down Expand Up @@ -849,7 +849,7 @@ Base Path (i.e. keep only filename from attribute)</string>
<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>
Expand Down

0 comments on commit 37f185f

Please sign in to comment.