Skip to content
Permalink
Browse files

[ui] use a combobox for bool values in advanced settings tree (#6078)

  • Loading branch information
nirvn committed Jan 16, 2018
1 parent 5da28ed commit 6239365844c703c71c036ec82e3bae021eed9743
Showing with 93 additions and 73 deletions.
  1. +3 −1 src/app/qgssettingstree.cpp
  2. +90 −72 src/app/qgsvariantdelegate.cpp
@@ -58,7 +58,7 @@ QgsSettingsTree::QgsSettingsTree( QWidget *parent )
// header()->setResizeMode( 2, QHeaderView::Stretch );
header()->resizeSection( 0, 250 );
header()->resizeSection( 1, 100 );
header()->resizeSection( 2, 100 );
header()->resizeSection( 2, 250 );

settings = nullptr;
refreshTimer.setInterval( 2000 );
@@ -70,6 +70,8 @@ QgsSettingsTree::QgsSettingsTree( QWidget *parent )
QIcon::Normal, QIcon::On );
keyIcon.addPixmap( style()->standardPixmap( QStyle::SP_FileIcon ) );

setEditTriggers( QAbstractItemView::AllEditTriggers );

connect( &refreshTimer, &QTimer::timeout, this, &QgsSettingsTree::maybeRefresh );
}

@@ -38,6 +38,7 @@
**
****************************************************************************/

#include <QComboBox>
#include <QLineEdit>
#include <QDateTime>

@@ -95,16 +96,9 @@ QWidget *QgsVariantDelegate::createEditor( QWidget *parent,
if ( !isSupportedType( QgsVariantDelegate::type( originalValue ) ) )
return nullptr;

QLineEdit *lineEdit = new QLineEdit( parent );
lineEdit->setFrame( false );

QRegExp regExp;

switch ( QgsVariantDelegate::type( originalValue ) )
{
case QVariant::Bool:
regExp = mBoolExp;
break;
case QVariant::ByteArray:
regExp = mByteArrayExp;
break;
@@ -147,97 +141,121 @@ QWidget *QgsVariantDelegate::createEditor( QWidget *parent,
;
}

if ( !regExp.isEmpty() )
if ( QgsVariantDelegate::type( originalValue ) == QVariant::Bool )
{
QValidator *validator = new QRegExpValidator( regExp, lineEdit );
lineEdit->setValidator( validator );
QComboBox *comboBox = new QComboBox( parent );
comboBox->addItem( QStringLiteral( "false" ) );
comboBox->addItem( QStringLiteral( "true" ) );
return comboBox;
}
else
{
QLineEdit *lineEdit = new QLineEdit( parent );
lineEdit->setFrame( false );
if ( !regExp.isEmpty() )
{
QValidator *validator = new QRegExpValidator( regExp, lineEdit );
lineEdit->setValidator( validator );
}
return lineEdit;
}

return lineEdit;
}

void QgsVariantDelegate::setEditorData( QWidget *editor,
const QModelIndex &index ) const
{
QVariant value = index.model()->data( index, Qt::UserRole );
if ( QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor ) )

if ( QComboBox *comboBox = qobject_cast<QComboBox * >( editor ) )
{
comboBox->setCurrentIndex( value.toBool() == true ? 1 : 0 );
}
else if ( QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor ) )
{
lineEdit->setText( displayText( value ) );
}
}

void QgsVariantDelegate::setModelData( QWidget *editor, QAbstractItemModel *model,
const QModelIndex &index ) const
{
QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor );
if ( !lineEdit->isModified() )
return;

QString text = lineEdit->text();
const QValidator *validator = lineEdit->validator();
if ( validator )
{
int pos;
if ( validator->validate( text, pos ) != QValidator::Acceptable )
return;
}

QVariant originalValue = index.model()->data( index, Qt::UserRole );
QVariant value;

switch ( QgsVariantDelegate::type( originalValue ) )
if ( QComboBox *comboBox = qobject_cast<QComboBox * >( editor ) )
{
case QVariant::Char:
value = text.at( 0 );
break;
case QVariant::Color:
( void )mColorExp.exactMatch( text );
value = QColor( std::min( mColorExp.cap( 1 ).toInt(), 255 ),
std::min( mColorExp.cap( 2 ).toInt(), 255 ),
std::min( mColorExp.cap( 3 ).toInt(), 255 ),
std::min( mColorExp.cap( 4 ).toInt(), 255 ) );
break;
case QVariant::Date:
value = comboBox->currentIndex() == 1;
}
else if ( QLineEdit *lineEdit = qobject_cast<QLineEdit * >( editor ) )
{
if ( !lineEdit->isModified() )
return;

QString text = lineEdit->text();
const QValidator *validator = lineEdit->validator();
if ( validator )
{
QDate date = QDate::fromString( text, Qt::ISODate );
if ( !date.isValid() )
int pos;
if ( validator->validate( text, pos ) != QValidator::Acceptable )
return;
value = date;
}
break;
case QVariant::DateTime:

switch ( QgsVariantDelegate::type( originalValue ) )
{
QDateTime dateTime = QDateTime::fromString( text, Qt::ISODate );
if ( !dateTime.isValid() )
return;
value = dateTime;
}
break;
case QVariant::Point:
( void )mPointExp.exactMatch( text );
value = QPoint( mPointExp.cap( 1 ).toInt(), mPointExp.cap( 2 ).toInt() );
case QVariant::Char:
value = text.at( 0 );
break;
case QVariant::Color:
( void )mColorExp.exactMatch( text );
value = QColor( std::min( mColorExp.cap( 1 ).toInt(), 255 ),
std::min( mColorExp.cap( 2 ).toInt(), 255 ),
std::min( mColorExp.cap( 3 ).toInt(), 255 ),
std::min( mColorExp.cap( 4 ).toInt(), 255 ) );
break;
case QVariant::Date:
{
QDate date = QDate::fromString( text, Qt::ISODate );
if ( !date.isValid() )
return;
value = date;
}
break;
case QVariant::Rect:
( void )mRectExp.exactMatch( text );
value = QRect( mRectExp.cap( 1 ).toInt(), mRectExp.cap( 2 ).toInt(),
mRectExp.cap( 3 ).toInt(), mRectExp.cap( 4 ).toInt() );
break;
case QVariant::Size:
( void )mSizeExp.exactMatch( text );
value = QSize( mSizeExp.cap( 1 ).toInt(), mSizeExp.cap( 2 ).toInt() );
case QVariant::DateTime:
{
QDateTime dateTime = QDateTime::fromString( text, Qt::ISODate );
if ( !dateTime.isValid() )
return;
value = dateTime;
}
break;
case QVariant::StringList:
value = text.split( ',' );
case QVariant::Point:
( void )mPointExp.exactMatch( text );
value = QPoint( mPointExp.cap( 1 ).toInt(), mPointExp.cap( 2 ).toInt() );
break;
case QVariant::Rect:
( void )mRectExp.exactMatch( text );
value = QRect( mRectExp.cap( 1 ).toInt(), mRectExp.cap( 2 ).toInt(),
mRectExp.cap( 3 ).toInt(), mRectExp.cap( 4 ).toInt() );
break;
case QVariant::Size:
( void )mSizeExp.exactMatch( text );
value = QSize( mSizeExp.cap( 1 ).toInt(), mSizeExp.cap( 2 ).toInt() );
break;
case QVariant::StringList:
value = text.split( ',' );
break;
case QVariant::Time:
{
QTime time = QTime::fromString( text, Qt::ISODate );
if ( !time.isValid() )
return;
value = time;
}
break;
case QVariant::Time:
{
QTime time = QTime::fromString( text, Qt::ISODate );
if ( !time.isValid() )
return;
value = time;
default:
value = text;
value.convert( QgsVariantDelegate::type( originalValue ) );
}
break;
default:
value = text;
value.convert( QgsVariantDelegate::type( originalValue ) );
}

model->setData( index, displayText( value ), Qt::DisplayRole );

0 comments on commit 6239365

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