[QGIS Commit] r8165 - in branches/gdalogr-capi-branch/qgis/src: app
core gui plugins/gps_importer ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Feb 16 19:42:05 EST 2008
Author: warmerdam
Date: 2008-02-16 19:42:04 -0500 (Sat, 16 Feb 2008)
New Revision: 8165
Modified:
branches/gdalogr-capi-branch/qgis/src/app/qgisapp.cpp
branches/gdalogr-capi-branch/qgis/src/app/qgisapp.h
branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.cpp
branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.h
branches/gdalogr-capi-branch/qgis/src/core/qgsgeometry.cpp
branches/gdalogr-capi-branch/qgis/src/gui/qgsquickprint.cpp
branches/gdalogr-capi-branch/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui
branches/gdalogr-capi-branch/qgis/src/ui/qgsoptionsbase.ui
Log:
merge changes made in trunk
Modified: branches/gdalogr-capi-branch/qgis/src/app/qgisapp.cpp
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/app/qgisapp.cpp 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/app/qgisapp.cpp 2008-02-17 00:42:04 UTC (rev 8165)
@@ -31,6 +31,7 @@
#include <QClipboard>
#include <QColor>
#include <QCursor>
+#include <QDesktopServices>
#include <QDesktopWidget>
#include <QDialog>
#include <QDir>
@@ -401,6 +402,10 @@
mSplash->showMessage(tr("QGIS Ready!"), Qt::AlignHCenter | Qt::AlignBottom);
mMapTipsVisible = false;
+
+ // setup drag drop
+ setAcceptDrops(true);
+
mFullScreenMode = false;
showNormal();
qApp->processEvents();
@@ -439,6 +444,43 @@
QgsApplication::exitQgis();
}
+void QgisApp::dragEnterEvent(QDragEnterEvent *event)
+{
+ if (event->mimeData()->hasUrls())
+ {
+ event->acceptProposedAction();
+ }
+}
+
+void QgisApp::dropEvent(QDropEvent *event)
+{
+ // get the file list
+ QList<QUrl>::iterator i;
+ QList<QUrl>urls = event->mimeData()->urls();
+ for (i = urls.begin(); i != urls.end(); i++)
+ {
+ QUrl mUrl = *i;
+ // seems that some drag and drop operations include an empty url
+ // so we test for length to make sure we have something
+ if( mUrl.path().length() > 0)
+ {
+ // check to see if we are opening a project file
+ QFileInfo fi(mUrl.path());
+ if( fi.completeSuffix() == "qgs" )
+ {
+ QgsDebugMsg("Opening project " + mUrl.path());
+ }
+ else
+ {
+ QgsDebugMsg("Adding " + mUrl.path() + " to the map canvas");
+ openLayer(mUrl.path());
+ }
+ }
+ }
+ event->acceptProposedAction();
+}
+
+
// restore any application settings stored in QSettings
void QgisApp::readSettings()
{
@@ -4247,47 +4289,7 @@
status = 0; //avoid compiler warning
CFRelease(urlRef);
#else
- // find a browser
- QSettings settings;
- QString browser = settings.readEntry("/qgis/browser");
- if (browser.length() == 0)
- {
- // ask user for browser and use it
- bool ok;
- QString myHeading = tr("QGIS Browser Selection");
- QString myMessage = tr("Enter the name of a web browser to use (eg. konqueror).\n");
- myMessage += tr("Enter the full path if the browser is not in your PATH.\n");
- myMessage += tr("You can change this option later by selecting Options from the Settings menu (Help Browser tab).");
- QString text = QInputDialog::getText(myHeading,
- myMessage,
- QLineEdit::Normal,
- QString::null, &ok, this);
- if (ok && !text.isEmpty())
- {
- // user entered something and pressed OK
- browser = text;
- // save the setting
- settings.writeEntry("/qgis/browser", browser);
- }
- else
- {
- browser = "";
- }
-
- }
- if (browser.length() > 0)
- {
- // find the installed location of the help files
- // open index.html using browser
- //XXX for debug on win32 QMessageBox::information(this,"Help opening...", browser + " - " + url);
- QProcess *helpProcess = new QProcess(this);
- QStringList myArgs;
- myArgs << url;
- helpProcess->start(browser,myArgs);
- }
- /* mHelpViewer = new QgsHelpViewer(this,"helpviewer",false);
- mHelpViewer->showContent(QgsApplication::prefixPath() +"/share/doc","index.html");
- mHelpViewer->show(); */
+ QDesktopServices::openUrl(url);
#endif
}
Modified: branches/gdalogr-capi-branch/qgis/src/app/qgisapp.h
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/app/qgisapp.h 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/app/qgisapp.h 2008-02-17 00:42:04 UTC (rev 8165)
@@ -145,6 +145,10 @@
//! Returns a pointer to the internal clipboard
QgsClipboard * clipboard();
+ void dragEnterEvent(QDragEnterEvent *);
+
+ void dropEvent(QDropEvent *);
+
//private slots:
public slots:
//! About QGis
Modified: branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.cpp
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.cpp 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.cpp 2008-02-17 00:42:04 UTC (rev 8165)
@@ -53,8 +53,6 @@
qparent = parent;
// read the current browser and set it
QSettings settings;
- QString browser = settings.readEntry("/qgis/browser");
- cmbBrowser->setCurrentText(browser);
#ifdef QGISDEBUG
std::cout << "Standard Identify radius setting: " << QGis::DEFAULT_IDENTIFY_RADIUS << std::endl;
#endif
@@ -223,7 +221,6 @@
void QgsOptions::saveOptions()
{
QSettings settings;
- settings.writeEntry("/qgis/browser", cmbBrowser->currentText());
settings.writeEntry("/Map/identifyRadius", spinBoxIdentifyValue->value());
settings.writeEntry("/qgis/hideSplash",cbxHideSplash->isChecked());
settings.writeEntry("/qgis/new_layers_visible",chkAddedVisibility->isChecked());
@@ -300,26 +297,6 @@
}
-void QgsOptions::on_btnFindBrowser_clicked()
-{
- QString filter;
-#ifdef WIN32
- filter = "Applications (*.exe)";
-#else
- filter = "All Files (*)";
-#endif
- QString browser = QFileDialog::getOpenFileName(
- this,
- "Choose a browser",
- "./",
- filter );
- if(browser.length() > 0)
- {
- cmbBrowser->setCurrentText(browser);
- }
-}
-
-
void QgsOptions::on_pbnSelectProjection_clicked()
{
QSettings settings;
Modified: branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.h
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.h 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/app/qgsoptions.h 2008-02-17 00:42:04 UTC (rev 8165)
@@ -49,7 +49,6 @@
public slots:
//! Slot called when user chooses to change the project wide projection.
void on_pbnSelectProjection_clicked();
- void on_btnFindBrowser_clicked();
void on_chkAntiAliasing_stateChanged();
void on_chkUseQPixmap_stateChanged();
void saveOptions();
Modified: branches/gdalogr-capi-branch/qgis/src/core/qgsgeometry.cpp
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/core/qgsgeometry.cpp 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/core/qgsgeometry.cpp 2008-02-17 00:42:04 UTC (rev 8165)
@@ -5044,7 +5044,13 @@
QgsGeometry* QgsGeometry::buffer(double distance, int segments)
{
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
+ if(!mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->buffer(distance, segments);
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
@@ -5054,7 +5060,13 @@
QgsGeometry* QgsGeometry::convexHull()
{
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
+ if(!mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->convexHull();
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
@@ -5064,11 +5076,21 @@
QgsGeometry* QgsGeometry::intersection(QgsGeometry* geometry)
{
if (geometry == NULL)
- return NULL;
+ {
+ return NULL;
+ }
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
if (geometry->mGeos == NULL)
- geometry->exportWkbToGeos();
+ {
+ geometry->exportWkbToGeos();
+ }
+ if(!mGeos || !geometry->mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->intersection(geometry->mGeos);
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
@@ -5078,11 +5100,21 @@
QgsGeometry* QgsGeometry::Union(QgsGeometry* geometry)
{
if (geometry == NULL)
- return NULL;
+ {
+ return NULL;
+ }
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
if (geometry->mGeos == NULL)
- geometry->exportWkbToGeos();
+ {
+ geometry->exportWkbToGeos();
+ }
+ if(!mGeos || !geometry->mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->Union(geometry->mGeos);
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
@@ -5092,11 +5124,21 @@
QgsGeometry* QgsGeometry::difference(QgsGeometry* geometry)
{
if (geometry == NULL)
- return NULL;
+ {
+ return NULL;
+ }
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
if (geometry->mGeos == NULL)
- geometry->exportWkbToGeos();
+ {
+ geometry->exportWkbToGeos();
+ }
+ if(!mGeos || !geometry->mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->difference(geometry->mGeos);
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
@@ -5106,11 +5148,21 @@
QgsGeometry* QgsGeometry::symDifference(QgsGeometry* geometry)
{
if (geometry == NULL)
- return NULL;
+ {
+ return NULL;
+ }
if (mGeos == NULL)
- exportWkbToGeos();
+ {
+ exportWkbToGeos();
+ }
if (geometry->mGeos == NULL)
- geometry->exportWkbToGeos();
+ {
+ geometry->exportWkbToGeos();
+ }
+ if(!mGeos || !geometry->mGeos)
+ {
+ return 0;
+ }
GEOS_GEOM::Geometry* geos = mGeos->symDifference(geometry->mGeos);
QgsGeometry* g = new QgsGeometry;
g->setGeos(geos);
Modified: branches/gdalogr-capi-branch/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/gui/qgsquickprint.cpp 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/gui/qgsquickprint.cpp 2008-02-17 00:42:04 UTC (rev 8165)
@@ -222,7 +222,13 @@
int myLegendHeightPercent = 65;
int myLogoWidthPercent = 23;
int myLogoHeightPercent = 17;
- int mySymbolScalingAmount = myPrintResolutionDpi / myScreenResolutionDpi;
+ //
+ // Remember the size and dpi of the maprender
+ // so we can restore it properly
+ //
+ int myOriginalDpi = mpMapRender->outputDpi();
+ QSize myOriginalSize = mpMapRender->outputSize();
+ int mySymbolScalingAmount = myPrintResolutionDpi / myOriginalDpi;
//define the font sizes and family
int myMapTitleFontSize = 24;
@@ -337,12 +343,6 @@
myMapPixmap.fill ( mMapBackgroundColour );
QPainter myMapPainter;
myMapPainter.begin( &myMapPixmap );
- //
- // Remember the size and dpi of the maprender
- // so we can restore it properly
- //
- int myOriginalDpi = mpMapRender->outputDpi();
- QSize myOriginalSize = mpMapRender->outputSize();
// Now resize for print
mpMapRender->setOutputSize(
QSize ( myMapDimensionX, myMapDimensionY ), myPrinter.resolution() );
@@ -795,7 +795,6 @@
bool mySnappingFlag = true;
QColor mColour = Qt::black;
// Hard coded sizes
- int myMajorTickSize=10;
int myTextOffsetX=0;
int myTextOffsetY=5;
int myXMargin=20;
@@ -935,14 +934,14 @@
myStops << QGradientStop(1.0,QColor("#656565"));
//draw again with the brush in the revers direction to complete teh glossiness
QLinearGradient myReverseGlossyBrush(
- QPointF(myOriginX,myOriginY + myMajorTickSize*3),
+ QPointF(myOriginX,myOriginY + myFontHeight*3),
QPointF(myOriginX,myOriginY));
thepPainter->setBrush(myReverseGlossyBrush);
thepPainter->drawRect(
myOriginX,
myOriginY,
myOriginX + myScaleBarWidthInt,
- myOriginY + myMajorTickSize
+ myOriginY + myFontHeight
);
//
@@ -953,7 +952,6 @@
//Draw the minimum label buffer
thepPainter->setPen( myBackColor );
myFontWidth = myFontMetrics.width( "0" );
- myFontHeight = myFontMetrics.height();
for (int i = 0-myBufferSize; i <= myBufferSize; i++)
{
@@ -1003,14 +1001,13 @@
//
thepPainter->setPen( myBackColor );
myFontWidth = myFontMetrics.width( myScaleBarUnitLabel );
- myFontHeight = myFontMetrics.height();
//first the buffer
for (int i = 0-myBufferSize; i <= myBufferSize; i++)
{
for (int j = 0-myBufferSize; j <= myBufferSize; j++)
{
thepPainter->drawText( i + (myOriginX+myScaleBarWidthInt+myTextOffsetX),
- j + myOriginY + myMajorTickSize + (myFontHeight*2.5) + myTextOffsetY,
+ j + myOriginY + myFontHeight + (myFontHeight*2.5) + myTextOffsetY,
myScaleBarUnitLabel);
}
}
@@ -1018,7 +1015,7 @@
thepPainter->setPen( myForeColor );
thepPainter->drawText(
myOriginX + myScaleBarWidthInt + myTextOffsetX,
- myOriginY + myMajorTickSize + (myFontHeight*2.5) + myTextOffsetY,
+ myOriginY + myFontHeight + (myFontHeight*2.5) + myTextOffsetY,
myScaleBarUnitLabel
);
}
Modified: branches/gdalogr-capi-branch/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/plugins/gps_importer/qgsgpspluginguibase.ui 2008-02-17 00:42:04 UTC (rev 8165)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>820</width>
+ <width>930</width>
<height>406</height>
</rect>
</property>
@@ -81,7 +81,10 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
@@ -167,7 +170,10 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
@@ -278,7 +284,10 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
@@ -449,7 +458,10 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
@@ -513,7 +525,6 @@
</item>
</layout>
</widget>
-
<widget class="QWidget" name="tab5" >
<attribute name="title" >
<string>GPX Conversions</string>
@@ -531,7 +542,10 @@
<bool>true</bool>
</property>
<property name="html" >
- <string></string>
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
</property>
</widget>
</item>
@@ -618,7 +632,6 @@
</item>
</layout>
</widget>
-
</widget>
</item>
<item row="1" column="0" colspan="3" >
@@ -641,6 +654,43 @@
<header>qgsfiledropedit.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>leGPXFile</tabstop>
+ <tabstop>pbnGPXSelectFile</tabstop>
+ <tabstop>cbGPXWaypoints</tabstop>
+ <tabstop>cbGPXRoutes</tabstop>
+ <tabstop>cbGPXTracks</tabstop>
+ <tabstop>buttonBox</tabstop>
+ <tabstop>leIMPInput</tabstop>
+ <tabstop>pbnIMPInput</tabstop>
+ <tabstop>cmbIMPFeature</tabstop>
+ <tabstop>leIMPOutput</tabstop>
+ <tabstop>pbnIMPOutput</tabstop>
+ <tabstop>leIMPLayer</tabstop>
+ <tabstop>cmbDLDevice</tabstop>
+ <tabstop>cmbDLPort</tabstop>
+ <tabstop>pbDLEditDevices</tabstop>
+ <tabstop>cmbDLFeatureType</tabstop>
+ <tabstop>leDLOutput</tabstop>
+ <tabstop>pbnDLOutput</tabstop>
+ <tabstop>leDLBasename</tabstop>
+ <tabstop>cmbULLayer</tabstop>
+ <tabstop>cmbULDevice</tabstop>
+ <tabstop>cmbULPort</tabstop>
+ <tabstop>pbULEditDevices</tabstop>
+ <tabstop>leCONVInput</tabstop>
+ <tabstop>pbnCONVInput</tabstop>
+ <tabstop>cmbCONVType</tabstop>
+ <tabstop>leCONVOutput</tabstop>
+ <tabstop>pbnCONVOutput</tabstop>
+ <tabstop>leCONVLayer</tabstop>
+ <tabstop>teCONVDescription</tabstop>
+ <tabstop>teDLDescription</tabstop>
+ <tabstop>teULDescription</tabstop>
+ <tabstop>teLoadDescription</tabstop>
+ <tabstop>tabWidget</tabstop>
+ <tabstop>teIMPDescription</tabstop>
+ </tabstops>
<resources>
<include location="qgsgps_plugin.qrc" />
</resources>
Modified: branches/gdalogr-capi-branch/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- branches/gdalogr-capi-branch/qgis/src/ui/qgsoptionsbase.ui 2008-02-16 20:47:08 UTC (rev 8164)
+++ branches/gdalogr-capi-branch/qgis/src/ui/qgsoptionsbase.ui 2008-02-17 00:42:04 UTC (rev 8165)
@@ -1021,107 +1021,6 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabHelpBrowser" >
- <attribute name="title" >
- <string>Help &Browser</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="2" column="0" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="3" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
- <string><b>Note:</b> The browser must be in your PATH or you can specify the full path above</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="btnFindBrowser" >
- <property name="maximumSize" >
- <size>
- <width>60</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="cmbBrowser" >
- <property name="editable" >
- <bool>true</bool>
- </property>
- <item>
- <property name="text" >
- <string>epiphany</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>firefox</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>mozilla-firefox</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>galeon</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>konqueror</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>mozilla</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>opera</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Open help documents with</string>
- </property>
- <property name="buddy" >
- <cstring>cmbBrowser</cstring>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
</widget>
</item>
</layout>
@@ -1136,7 +1035,6 @@
</customwidgets>
<tabstops>
<tabstop>tabWidget</tabstop>
- <tabstop>btnFindBrowser</tabstop>
<tabstop>cbxHideSplash</tabstop>
<tabstop>cmbTheme</tabstop>
<tabstop>pbnSelectionColour</tabstop>
@@ -1150,7 +1048,6 @@
<tabstop>radUseGlobalProjection</tabstop>
<tabstop>txtGlobalWKT</tabstop>
<tabstop>pbnSelectProjection</tabstop>
- <tabstop>cmbBrowser</tabstop>
</tabstops>
<resources/>
<connections/>
More information about the QGIS-commit
mailing list