@@ -1660,7 +1660,7 @@ QgsGrassModuleOption::QgsGrassModuleOption( QgsGrassModule *module, QString key,
1660
1660
}
1661
1661
else
1662
1662
{
1663
- QCheckBox *cb = new QCheckBox ( desc, this );
1663
+ QgsGrassModuleCheckBox *cb = new QgsGrassModuleCheckBox ( desc, this );
1664
1664
mCheckBoxes .push_back ( cb );
1665
1665
mLayout ->addWidget ( cb );
1666
1666
}
@@ -1944,7 +1944,7 @@ QgsGrassModuleOption::~QgsGrassModuleOption()
1944
1944
QgsGrassModuleFlag::QgsGrassModuleFlag ( QgsGrassModule *module , QString key,
1945
1945
QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode,
1946
1946
QWidget * parent )
1947
- : QCheckBox( parent ), QgsGrassModuleItem( module , key, qdesc, gdesc, gnode )
1947
+ : QgsGrassModuleCheckBox( " " , parent ), QgsGrassModuleItem( module , key, qdesc, gdesc, gnode )
1948
1948
{
1949
1949
QgsDebugMsg ( " called." );
1950
1950
@@ -1956,6 +1956,7 @@ QgsGrassModuleFlag::QgsGrassModuleFlag( QgsGrassModule *module, QString key,
1956
1956
setChecked ( false );
1957
1957
1958
1958
setText ( mTitle );
1959
+ setToolTip ( mToolTip );
1959
1960
}
1960
1961
1961
1962
QStringList QgsGrassModuleFlag::options ()
@@ -1972,18 +1973,6 @@ QgsGrassModuleFlag::~QgsGrassModuleFlag()
1972
1973
{
1973
1974
}
1974
1975
1975
- void QgsGrassModuleFlag::resizeEvent ( QResizeEvent * event )
1976
- {
1977
- adjustText ();
1978
- }
1979
-
1980
- void QgsGrassModuleFlag::adjustText ()
1981
- {
1982
- QString t = fontMetrics ().elidedText ( mTitle , Qt::ElideRight, width () - iconSize ().width () - 20 );
1983
-
1984
- setText ( t );
1985
- }
1986
-
1987
1976
/* ************************* QgsGrassModuleInput ***************************/
1988
1977
1989
1978
QgsGrassModuleInput::QgsGrassModuleInput ( QgsGrassModule *module ,
@@ -2925,7 +2914,9 @@ QgsGrassModuleSelection::QgsGrassModuleSelection(
2925
2914
connect ( mLayerInput , SIGNAL ( valueChanged () ), this , SLOT ( updateSelection () ) );
2926
2915
}
2927
2916
2917
+ QHBoxLayout *l = new QHBoxLayout ( this );
2928
2918
mLineEdit = new QLineEdit ( this );
2919
+ l->addWidget ( mLineEdit );
2929
2920
2930
2921
// Fill in layer current fields
2931
2922
updateSelection ();
@@ -3127,3 +3118,44 @@ QString QgsGrassModuleFile::ready()
3127
3118
QgsGrassModuleFile::~QgsGrassModuleFile ()
3128
3119
{
3129
3120
}
3121
+
3122
+ /* **************************** QgsGrassModuleCheckBox *********************************/
3123
+
3124
+ QgsGrassModuleCheckBox::QgsGrassModuleCheckBox ( const QString & text, QWidget * parent )
3125
+ : QCheckBox( text, parent ), mText(text)
3126
+ {
3127
+ QgsDebugMsg ( " called." );
3128
+ adjustText ();
3129
+ }
3130
+
3131
+ QgsGrassModuleCheckBox::~QgsGrassModuleCheckBox ()
3132
+ {
3133
+ }
3134
+
3135
+ void QgsGrassModuleCheckBox::resizeEvent ( QResizeEvent * event )
3136
+ {
3137
+ adjustText ();
3138
+ }
3139
+ void QgsGrassModuleCheckBox::setText ( const QString & text )
3140
+ {
3141
+ mText = text;
3142
+ adjustText ();
3143
+ }
3144
+ void QgsGrassModuleCheckBox::setToolTip ( const QString & text )
3145
+ {
3146
+ mTip = text;
3147
+ QWidget::setToolTip ( text );
3148
+ }
3149
+ void QgsGrassModuleCheckBox::adjustText ()
3150
+ {
3151
+ QString t = fontMetrics ().elidedText ( mText , Qt::ElideRight, width () - iconSize ().width () - 20 );
3152
+ QCheckBox::setText ( t );
3153
+
3154
+ if ( mTip .isEmpty () ) {
3155
+ QString tt;
3156
+ if ( t != mText ) {
3157
+ tt = mText ;
3158
+ }
3159
+ QWidget::setToolTip ( tt );
3160
+ }
3161
+ }
0 commit comments