Skip to content

Commit 713d3c1

Browse files
slarosaslarosa
committedMar 18, 2013
replace some message box with message bar in main app
·
ltr-3_40archive/master_2
1 parent 7e598f7 commit 713d3c1

File tree

1 file changed

+40
-29
lines changed

1 file changed

+40
-29
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4454,7 +4454,7 @@ void QgisApp::saveAsVectorFileGeneral( bool saveOnlySelection )
44544454
}
44554455
messageBar()->pushMessage( tr( "Saving done" ),
44564456
tr( "Export to vector file has been completed" ),
4457-
QgsMessageBar::INFO, 3 );
4457+
QgsMessageBar::INFO, messageTimeout() );
44584458
}
44594459
else
44604460
{
@@ -4491,32 +4491,34 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent )
44914491

44924492
if ( !layer )
44934493
{
4494-
QMessageBox::information( parent,
4495-
tr( "No Layer Selected" ),
4496-
tr( "To delete features, you must select a vector layer in the legend" ) );
4494+
messageBar()->pushMessage( tr( "No Layer Selected" ),
4495+
tr( "To delete features, you must select a vector layer in the legend" ),
4496+
QgsMessageBar::INFO, messageTimeout() );
44974497
return;
44984498
}
44994499

45004500
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer *>( layer );
45014501
if ( !vlayer )
45024502
{
4503-
QMessageBox::information( parent,
4504-
tr( "No Vector Layer Selected" ),
4505-
tr( "Deleting features only works on vector layers" ) );
4503+
messageBar()->pushMessage( tr( "No Vector Layer Selected" ),
4504+
tr( "Deleting features only works on vector layers" ),
4505+
QgsMessageBar::INFO, messageTimeout() );
45064506
return;
45074507
}
45084508

45094509
if ( !( vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
45104510
{
4511-
QMessageBox::information( parent, tr( "Provider does not support deletion" ),
4512-
tr( "Data provider does not support deleting features" ) );
4511+
messageBar()->pushMessage( tr( "Provider does not support deletion" ),
4512+
tr( "Data provider does not support deleting features" ),
4513+
QgsMessageBar::INFO, messageTimeout() );
45134514
return;
45144515
}
45154516

45164517
if ( !vlayer->isEditable() )
45174518
{
4518-
QMessageBox::information( parent, tr( "Layer not editable" ),
4519-
tr( "The current layer is not editable. Choose 'Start editing' in the digitizing toolbar." ) );
4519+
messageBar()->pushMessage( tr( "Layer not editable" ),
4520+
tr( "The current layer is not editable. Choose 'Start editing' in the digitizing toolbar." ),
4521+
QgsMessageBar::INFO, messageTimeout() );
45204522
return;
45214523
}
45224524

@@ -4530,8 +4532,9 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent )
45304532
vlayer->beginEditCommand( tr( "Features deleted" ) );
45314533
if ( !vlayer->deleteSelectedFeatures() )
45324534
{
4533-
QMessageBox::information( parent, tr( "Problem deleting features" ),
4534-
tr( "A problem occured during deletion of features" ) );
4535+
messageBar()->pushMessage( tr( "Problem deleting features" ),
4536+
tr( "A problem occured during deletion of features" ),
4537+
QgsMessageBar::WARNING );
45354538
}
45364539

45374540
vlayer->endEditCommand();
@@ -4955,7 +4958,9 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
49554958
QgsMapLayer *activeMapLayer = activeLayer();
49564959
if ( !activeMapLayer )
49574960
{
4958-
QMessageBox::information( 0, tr( "No active layer" ), tr( "No active layer found. Please select a layer in the layer list" ) );
4961+
messageBar()->pushMessage( tr( "No active layer" ),
4962+
tr( "No active layer found. Please select a layer in the layer list" ),
4963+
QgsMessageBar::INFO, messageTimeout() );
49594964
return;
49604965
}
49614966

@@ -5473,7 +5478,9 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
54735478
{
54745479
mActionToggleEditing->setChecked( false );
54755480
mActionToggleEditing->setEnabled( false );
5476-
QMessageBox::information( 0, tr( "Start editing failed" ), tr( "Provider cannot be opened for editing" ) );
5481+
messageBar()->pushMessage( tr( "Start editing failed" ),
5482+
tr( "Provider cannot be opened for editing" ),
5483+
QgsMessageBar::INFO, messageTimeout() );
54775484
return false;
54785485
}
54795486

@@ -5526,7 +5533,9 @@ bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
55265533
mMapCanvas->freeze( true );
55275534
if ( !vlayer->rollBack() )
55285535
{
5529-
QMessageBox::information( 0, tr( "Error" ), tr( "Problems during roll back" ) );
5536+
messageBar()->pushMessage( tr( "Error" ),
5537+
tr( "Problems during roll back" ),
5538+
QgsMessageBar::CRITICAL );
55305539
res = false;
55315540
}
55325541
mMapCanvas->freeze( false );
@@ -6439,18 +6448,18 @@ void QgisApp::histogramStretch( bool visibleAreaOnly, QgsRasterLayer::ContrastEn
64396448

64406449
if ( !myLayer )
64416450
{
6442-
QMessageBox::information( this,
6443-
tr( "No Layer Selected" ),
6444-
tr( "To perform a full histogram stretch, you need to have a raster layer selected." ) );
6451+
messageBar()->pushMessage( tr( "No Layer Selected" ),
6452+
tr( "To perform a full histogram stretch, you need to have a raster layer selected." ),
6453+
QgsMessageBar::INFO, messageTimeout() );
64456454
return;
64466455
}
64476456

64486457
QgsRasterLayer* myRasterLayer = qobject_cast<QgsRasterLayer *>( myLayer );
64496458
if ( !myRasterLayer )
64506459
{
6451-
QMessageBox::information( this,
6452-
tr( "No Raster Layer Selected" ),
6453-
tr( "To perform a full histogram stretch, you need to have a raster layer selected." ) );
6460+
messageBar()->pushMessage( tr( "No Layer Selected" ),
6461+
tr( "To perform a full histogram stretch, you need to have a raster layer selected." ),
6462+
QgsMessageBar::INFO, messageTimeout() );
64546463
return;
64556464
}
64566465

@@ -6490,18 +6499,18 @@ void QgisApp::adjustBrightnessContrast( int delta, bool updateBrightness )
64906499

64916500
if ( !myLayer )
64926501
{
6493-
QMessageBox::information( this,
6494-
tr( "No Layer Selected" ),
6495-
tr( "To change brightness or contrast, you need to have a raster layer selected." ) );
6502+
messageBar()->pushMessage( tr( "No Layer Selected" ),
6503+
tr( "To change brightness or contrast, you need to have a raster layer selected." ),
6504+
QgsMessageBar::INFO, messageTimeout() );
64966505
return;
64976506
}
64986507

64996508
QgsRasterLayer* myRasterLayer = qobject_cast<QgsRasterLayer *>( myLayer );
65006509
if ( !myRasterLayer )
65016510
{
6502-
QMessageBox::information( this,
6503-
tr( "No Raster Layer Selected" ),
6504-
tr( "To change brightness or contrast, you need to have a raster layer selected." ) );
6511+
messageBar()->pushMessage( tr( "No Layer Selected" ),
6512+
tr( "To change brightness or contrast, you need to have a raster layer selected." ),
6513+
QgsMessageBar::INFO, messageTimeout() );
65056514
return;
65066515
}
65076516

@@ -8684,7 +8693,9 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
86848693

86858694
if ( !plt->showLayerProperties( pl ) )
86868695
{
8687-
QMessageBox::information( this, tr( "Warning" ), tr( "This layer doesn't have a properties dialog." ) );
8696+
messageBar()->pushMessage( tr( "Warning" ),
8697+
tr( "This layer doesn't have a properties dialog." ),
8698+
QgsMessageBar::INFO, messageTimeout() );
86888699
}
86898700
}
86908701
}

0 commit comments

Comments
 (0)
Please sign in to comment.