Skip to content

Commit b672fa7

Browse files
author
timlinux
committed
Fix typo in commnets for zoom in map tool
git-svn-id: http://svn.osgeo.org/qgis/trunk@5819 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2e0a381 commit b672fa7

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/gui/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3155,7 +3155,7 @@ void QgisApp::zoomIn()
31553155
{
31563156
QgsDebugMsg ("Setting map tool to zoomIn");
31573157

3158-
QgsMapTool* tool = new QgsMapToolZoom(mMapCanvas, FALSE /* zoomOut */);
3158+
QgsMapTool* tool = new QgsMapToolZoom(mMapCanvas, FALSE /* zoomIn */);
31593159
tool->setAction(mActionZoomIn);
31603160
mMapCanvas->setMapTool(tool);
31613161

src/gui/qgscustomprojectiondialog.cpp

+15-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog(QWidget *parent, Qt::WFlags
6565
on_pbnFirst_clicked();
6666
else
6767
on_pbnNew_clicked();
68+
//automatically go to insert mode if there are not recs yet
69+
if (mRecordCountLong<1)
70+
{
71+
on_pbnNew_clicked();
72+
}
6873
}
6974

7075
QgsCustomProjectionDialog::~QgsCustomProjectionDialog()
@@ -428,15 +433,23 @@ void QgsCustomProjectionDialog::on_pbnFirst_clicked()
428433
//enable nav buttons as appropriate
429434
pbnFirst->setEnabled(false);
430435
pbnPrevious->setEnabled(false);
431-
if (mCurrentRecordLong==mRecordCountLong)
436+
//automatically go to insert mode if there are not recs yet
437+
if (mRecordCountLong < 1)
438+
{
439+
on_pbnNew_clicked();
440+
pbnDelete->setEnabled(false);
441+
}
442+
else if (mCurrentRecordLong==mRecordCountLong)
432443
{
433444
pbnNext->setEnabled(false);
434445
pbnLast->setEnabled(false);
446+
pbnDelete->setEnabled(false);
435447
}
436448
else
437449
{
438450
pbnNext->setEnabled(true);
439451
pbnLast->setEnabled(true);
452+
pbnDelete->setEnabled(false);
440453
}
441454
}
442455

@@ -694,6 +707,7 @@ void QgsCustomProjectionDialog::on_pbnNew_clicked()
694707
pbnPrevious->setEnabled(false);
695708
pbnNext->setEnabled(false);
696709
pbnLast->setEnabled(false);
710+
pbnDelete->setEnabled(false);
697711
pbnNew->setText(tr("Abort"));
698712
//clear the controls
699713
leName->setText("");

0 commit comments

Comments
 (0)