Skip to content
Permalink
Browse files

fix warnings and icon size of GRASS toolbar

  • Loading branch information
jef-n committed Jan 29, 2012
1 parent c0cbe53 commit eae552ffa6f57c9684a99eeaf58db8a992fda0a1
@@ -135,14 +135,12 @@ void QgsUndoWidget::setupUi( QDockWidget *UndoWidget )
undoButton = new QPushButton( dockWidgetContents );
undoButton->setObjectName( QString::fromUtf8( "undoButton" ) );
undoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionUndo.png" ) );
undoButton->setIconSize( QSize( 24, 24 ) );

gridLayout->addWidget( undoButton, 1, 0, 1, 1 );

redoButton = new QPushButton( dockWidgetContents );
redoButton->setObjectName( QString::fromUtf8( "redoButton" ) );
redoButton->setIcon( QgisApp::instance()->getThemeIcon( "mActionRedo.png" ) );
redoButton->setIconSize( QSize( 24, 24 ) );

gridLayout->addWidget( redoButton, 1, 1, 1, 1 );

@@ -181,7 +181,6 @@ void QgsGrassPlugin::initGui()

// Add the toolbar to the main window
toolBarPointer = qGisInterface->addToolBar( tr( "GRASS" ) );
toolBarPointer->setIconSize( QSize( 24, 24 ) );
toolBarPointer->setObjectName( "GRASS" );

// Add to the toolbar
@@ -34,8 +34,8 @@ QgsGrassSelect::QgsGrassSelect( QWidget *parent, int type ): QDialog( parent ),
QgsDebugMsg( QString( "QgsGrassSelect() type = %1" ).arg( type ) );

setupUi( this );
connect( buttonBox, SIGNAL( accepted() ), SLOT( on_ok_clicked() ) );
connect( buttonBox, SIGNAL( rejected() ), this, SLOT( on_cancel_clicked() ) );
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );

if ( first )
{
@@ -394,7 +394,7 @@ void QgsGrassSelect::on_GisdbaseBrowse_clicked()
}
}

void QgsGrassSelect::on_ok_clicked()
void QgsGrassSelect::accept()
{
gisdbase = egisdbase->text();
lastGisdbase = QString( gisdbase );
@@ -456,8 +456,3 @@ void QgsGrassSelect::on_ok_clicked()
}
QDialog::accept();
}

void QgsGrassSelect::on_cancel_clicked()
{
QDialog::reject();
}
@@ -49,11 +49,7 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
int selectedType; // RASTER or GROUP

public slots:
//! OK
void on_ok_clicked();

//! Cancel
void on_cancel_clicked();
void accept();

//! Open dialog for Gisdbase
void on_GisdbaseBrowse_clicked();
@@ -74,7 +70,6 @@ class QgsGrassSelect: public QDialog, private Ui::QgsGrassSelectBase
void on_emap_activated() { setLayers(); }
void setLayers();


private:
int type; // map type (mapset element)
static bool first; // called first time

0 comments on commit eae552f

Please sign in to comment.
You can’t perform that action at this time.