Skip to content
Permalink
Browse files

remove a failing connect and avoid absolutePath warning in empty project

  • Loading branch information
jef-n committed Feb 25, 2016
1 parent 17f20bb commit 0ba038fcc193425fae2c941daf5d185f70bb5409
Showing with 4 additions and 3 deletions.
  1. +0 −2 src/app/qgsattributetypedialog.cpp
  2. +4 −1 src/gui/editorwidgets/qgsexternalresourceconfigdlg.cpp
@@ -45,8 +45,6 @@ QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx
setupUi( this );
setWindowTitle( tr( "Edit Widget Properties - %1 (%2)" ).arg( vl->fields().at( fieldIdx ).name(), vl->name() ) );

connect( selectionListWidget, SIGNAL( currentRowChanged( int ) ), this, SLOT( setStackPage( int ) ) );

QMapIterator<QString, QgsEditorWidgetFactory*> it( QgsEditorWidgetRegistry::instance()->factories() );
while ( it.hasNext() )
{
@@ -31,7 +31,10 @@ QgsExternalResourceConfigDlg::QgsExternalResourceConfigDlg( QgsVectorLayer* vl,
mUseLink->setChecked( false );
mFullUrl->setChecked( false );
mDocumentViewerGroupBox->setChecked( false );
mRootPath->setPlaceholderText( QSettings().value( "/UI/lastExternalResourceWidgetDefaultPath", QDir::toNativeSeparators( QDir::cleanPath( QgsProject::instance()->fileInfo().absolutePath() ) ) ).toString() );

QString defpath = QgsProject::instance()->fileName().isEmpty() ? QDir::currentPath() : QgsProject::instance()->fileInfo().absolutePath();

mRootPath->setPlaceholderText( QSettings().value( "/UI/lastExternalResourceWidgetDefaultPath", QDir::toNativeSeparators( QDir::cleanPath( defpath ) ) ).toString() );

// Add connection to button for choosing default path
connect( mRootPathButton, SIGNAL( clicked() ), this, SLOT( chooseDefaultPath() ) );

0 comments on commit 0ba038f

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