Skip to content

Commit 838fb92

Browse files
StevenBStevenB
authored andcommitted
Fixed ticket 827 by converting the returnPressed() handlers into
editingFinished() ones. git-svn-id: http://svn.osgeo.org/qgis/trunk@7653 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e15e36f commit 838fb92

9 files changed

+34
-34
lines changed

src/app/composer/qgscomposermap.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ void QgsComposerMap::sizeChanged ( void )
405405
writeSettings();
406406
}
407407

408-
void QgsComposerMap::on_mWidthLineEdit_returnPressed ( void ) { sizeChanged(); }
409-
void QgsComposerMap::on_mHeightLineEdit_returnPressed ( void ) { sizeChanged(); }
408+
void QgsComposerMap::on_mWidthLineEdit_editingFinished ( void ) { sizeChanged(); }
409+
void QgsComposerMap::on_mHeightLineEdit_editingFinished ( void ) { sizeChanged(); }
410410

411411
void QgsComposerMap::on_mCalculateComboBox_activated( int )
412412
{
@@ -462,10 +462,10 @@ double QgsComposerMap::userScaleFromScale ( double s )
462462
return us;
463463
}
464464

465-
void QgsComposerMap::on_mScaleLineEdit_returnPressed()
465+
void QgsComposerMap::on_mScaleLineEdit_editingFinished()
466466
{
467467
#ifdef QGISDEBUG
468-
std::cout << "QgsComposerMap::on_mScaleLineEdit_returnPressed" << std::endl;
468+
std::cout << "QgsComposerMap::on_mScaleLineEdit_editingFinished" << std::endl;
469469
#endif
470470
mCalculate = mCalculateComboBox->currentItem();
471471

@@ -497,9 +497,9 @@ void QgsComposerMap::scaleChanged ( void )
497497
mComposition->emitMapChanged ( mId );
498498
}
499499

500-
void QgsComposerMap::on_mFontScaleLineEdit_returnPressed ( void ) { scaleChanged(); }
501-
void QgsComposerMap::on_mSymbolScaleLineEdit_returnPressed ( void ) { scaleChanged(); }
502-
void QgsComposerMap::on_mWidthScaleLineEdit_returnPressed ( void ) { scaleChanged(); }
500+
void QgsComposerMap::on_mFontScaleLineEdit_editingFinished ( void ) { scaleChanged(); }
501+
void QgsComposerMap::on_mSymbolScaleLineEdit_editingFinished ( void ) { scaleChanged(); }
502+
void QgsComposerMap::on_mWidthScaleLineEdit_editingFinished ( void ) { scaleChanged(); }
503503

504504
void QgsComposerMap::mapCanvasChanged ( void )
505505
{

src/app/composer/qgscomposermap.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ class QgsComposerMap : public QWidget, private Ui::QgsComposerMapBase, public QG
109109

110110
public slots:
111111
// Called by GUI if with or height was changed
112-
void on_mWidthLineEdit_returnPressed ( void );
113-
void on_mHeightLineEdit_returnPressed ( void );
112+
void on_mWidthLineEdit_editingFinished ( void );
113+
void on_mHeightLineEdit_editingFinished ( void );
114114

115115
// Set User extent to current map extent
116116
void on_mSetCurrentExtentButton_clicked ( void );
@@ -119,12 +119,12 @@ public slots:
119119
void on_mCalculateComboBox_activated ( int i );
120120

121121
// Called by GUI if map scale has changed
122-
void on_mScaleLineEdit_returnPressed ( void );
122+
void on_mScaleLineEdit_editingFinished ( void );
123123

124124
// Called by GUI if with scale was changed
125-
void on_mFontScaleLineEdit_returnPressed ( void );
126-
void on_mSymbolScaleLineEdit_returnPressed ( void );
127-
void on_mWidthScaleLineEdit_returnPressed ( void );
125+
void on_mFontScaleLineEdit_editingFinished ( void );
126+
void on_mSymbolScaleLineEdit_editingFinished ( void );
127+
void on_mWidthScaleLineEdit_editingFinished ( void );
128128

129129
// Frame settings changed
130130
void on_mFrameCheckBox_clicked ( void );

src/app/composer/qgscomposerpicture.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ void QgsComposerPicture::on_mFrameCheckBox_stateChanged ( int )
341341
writeSettings();
342342
}
343343

344-
void QgsComposerPicture::on_mAngleLineEdit_returnPressed ( )
344+
void QgsComposerPicture::on_mAngleLineEdit_editingFinished ( )
345345
{
346346
#ifdef QGISDEBUG
347-
std::cout << "QgsComposerPicture::on_mAngleLineEdit_returnPressed()" << std::endl;
347+
std::cout << "QgsComposerPicture::on_mAngleLineEdit_editingFinished()" << std::endl;
348348
#endif
349349
mAngle = mAngleLineEdit->text().toDouble();
350350

@@ -354,10 +354,10 @@ void QgsComposerPicture::on_mAngleLineEdit_returnPressed ( )
354354

355355
}
356356

357-
void QgsComposerPicture::on_mWidthLineEdit_returnPressed ( )
357+
void QgsComposerPicture::on_mWidthLineEdit_editingFinished ( )
358358
{
359359
#ifdef QGISDEBUG
360-
std::cout << "QgsComposerPicture::on_mWidthLineEdit_returnPressed()" << std::endl;
360+
std::cout << "QgsComposerPicture::on_mWidthLineEdit_editingFinished()" << std::endl;
361361
#endif
362362

363363
mWidth = mComposition->fromMM ( mWidthLineEdit->text().toDouble() );
@@ -409,7 +409,7 @@ void QgsComposerPicture::pictureChanged ( )
409409
}
410410
}
411411

412-
void QgsComposerPicture::on_mPictureLineEdit_returnPressed ( )
412+
void QgsComposerPicture::on_mPictureLineEdit_editingFinished ( )
413413
{
414414
pictureChanged();
415415
}

src/app/composer/qgscomposerpicture.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class QgsComposerPicture : public QWidget, private Ui::QgsComposerPictureBase,
8989

9090
public slots:
9191
// Called when picture file is changed in edit line
92-
void on_mPictureLineEdit_returnPressed ( void );
92+
void on_mPictureLineEdit_editingFinished ( void );
9393

9494
// Select new picture in dialog box
9595
void on_mPictureBrowseButton_clicked ( void );
@@ -98,10 +98,10 @@ public slots:
9898
void on_mFrameCheckBox_stateChanged ( int );
9999

100100
// Angle changed
101-
void on_mAngleLineEdit_returnPressed ( void );
101+
void on_mAngleLineEdit_editingFinished ( void );
102102

103103
// Width changed
104-
void on_mWidthLineEdit_returnPressed ( void );
104+
void on_mWidthLineEdit_editingFinished ( void );
105105

106106
private:
107107
// Pointer to composition

src/app/composer/qgscomposerscalebar.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void QgsComposerScalebar::on_mFontButton_clicked(void)
340340
}
341341
}
342342

343-
void QgsComposerScalebar::on_mUnitLabelLineEdit_returnPressed()
343+
void QgsComposerScalebar::on_mUnitLabelLineEdit_editingFinished()
344344
{
345345
mUnitLabel = mUnitLabelLineEdit->text();
346346
recalculate();
@@ -384,17 +384,17 @@ void QgsComposerScalebar::on_mLineWidthSpinBox_valueChanged()
384384
sizeChanged();
385385
}
386386

387-
void QgsComposerScalebar::on_mMapUnitsPerUnitLineEdit_returnPressed()
387+
void QgsComposerScalebar::on_mMapUnitsPerUnitLineEdit_editingFinished()
388388
{
389389
sizeChanged();
390390
}
391391

392-
void QgsComposerScalebar::on_mNumSegmentsLineEdit_returnPressed()
392+
void QgsComposerScalebar::on_mNumSegmentsLineEdit_editingFinished()
393393
{
394394
sizeChanged();
395395
}
396396

397-
void QgsComposerScalebar::on_mSegmentLengthLineEdit_returnPressed()
397+
void QgsComposerScalebar::on_mSegmentLengthLineEdit_editingFinished()
398398
{
399399
sizeChanged();
400400
}

src/app/composer/qgscomposerscalebar.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ public slots:
9494
void on_mFontButton_clicked ( void );
9595

9696
// Title changed
97-
void on_mUnitLabelLineEdit_returnPressed ( void );
97+
void on_mUnitLabelLineEdit_editingFinished ( void );
9898

9999
// Size changed
100100
void on_mLineWidthSpinBox_valueChanged ( void );
101-
void on_mMapUnitsPerUnitLineEdit_returnPressed ( void );
102-
void on_mNumSegmentsLineEdit_returnPressed ( void );
103-
void on_mSegmentLengthLineEdit_returnPressed ( void );
101+
void on_mMapUnitsPerUnitLineEdit_editingFinished ( void );
102+
void on_mNumSegmentsLineEdit_editingFinished ( void );
103+
void on_mSegmentLengthLineEdit_editingFinished ( void );
104104

105105
// Called by GUI when map selection changed
106106
void on_mMapComboBox_activated ( int i );

src/app/composer/qgscomposervectorlegend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void QgsComposerVectorLegend::on_mFontButton_clicked ( void )
549549
}
550550
}
551551

552-
void QgsComposerVectorLegend::on_mTitleLineEdit_returnPressed ( void )
552+
void QgsComposerVectorLegend::on_mTitleLineEdit_editingFinished ( void )
553553
{
554554
mTitle = mTitleLineEdit->text();
555555
recalculate();

src/app/composer/qgscomposervectorlegend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public slots:
138138
void on_mFontButton_clicked ( void );
139139

140140
// Title changed
141-
void on_mTitleLineEdit_returnPressed ( void );
141+
void on_mTitleLineEdit_editingFinished ( void );
142142

143143
// Called by GUI if preview style was changed
144144
void on_mPreviewModeComboBox_activated ( int i );

src/app/composer/qgscomposition.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ QgsCompositionPaper::~QgsCompositionPaper ( )
4848
QgsComposition::QgsComposition( QgsComposer *c, int id )
4949
{
5050
setupUi(this);
51-
connect(mPaperWidthLineEdit, SIGNAL(returnPressed()), this, SLOT(paperSizeChanged()));
52-
connect(mPaperHeightLineEdit, SIGNAL(returnPressed()), this, SLOT(paperSizeChanged()));
51+
connect(mPaperWidthLineEdit, SIGNAL(editingFinished()), this, SLOT(paperSizeChanged()));
52+
connect(mPaperHeightLineEdit, SIGNAL(editingFinished()), this, SLOT(paperSizeChanged()));
5353
connect(mPaperOrientationComboBox, SIGNAL(activated(int)), this, SLOT(paperSizeChanged()));
5454
connect(mPaperSizeComboBox, SIGNAL(activated(int)), this, SLOT(paperSizeChanged()));
55-
connect(mResolutionLineEdit, SIGNAL(returnPressed()), this, SLOT(resolutionChanged()));
55+
connect(mResolutionLineEdit, SIGNAL(editingFinished()), this, SLOT(resolutionChanged()));
5656

5757
#ifdef QGISDEBUG
5858
std::cerr << "QgsComposition::QgsComposition()" << std::endl;

0 commit comments

Comments
 (0)