QgsScaleRangeWidget: renamed from QgsScaleVisibilityWidget, do not use ui file

3nids · 3nids · commit d83f3ec4e6b6 · 2014-05-12T16:28:42.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -385,9 +385,9 @@ void QgsVectorLayerProperties::syncToLayer( void )
   setDisplayField( layer-> displayField() );
 
   // set up the scale based layer visibility stuff....
-  mScaleVisibilityWidget->setFromLayer( layer );
+  mScaleRangeWidget->setFromLayer( layer );
   mScaleVisibilityGroupBox->setChecked( layer->hasScaleBasedVisibility() );
-  mScaleVisibilityWidget->setMapCanvas( QgisApp::instance()->mapCanvas() );
+  mScaleRangeWidget->setMapCanvas( QgisApp::instance()->mapCanvas() );
 
   // get simplify drawing configuration
   const QgsVectorSimplifyMethod& simplifyMethod = layer->simplifyMethod();
@@ -494,8 +494,8 @@ void QgsVectorLayerProperties::apply()
 
   // set up the scale based layer visibility stuff....
   layer->toggleScaleBasedVisibility( mScaleVisibilityGroupBox->isChecked() );
-  layer->setMinimumScale( 1.0 / mScaleVisibilityWidget->minimumScale() );
-  layer->setMaximumScale( 1.0 / mScaleVisibilityWidget->maximumScale() );
+  layer->setMinimumScale( 1.0 / mScaleRangeWidget->minimumScale() );
+  layer->setMaximumScale( 1.0 / mScaleRangeWidget->maximumScale() );
 
   // provider-specific options
   if ( layer->dataProvider() )
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -20,7 +20,7 @@
 #define QGSVECTORLAYERPROPERTIES
 
 #include "qgsoptionsdialogbase.h"
-#include "qgsscalevisibilitywidget.h"
+#include "qgsscalerangewidget.h"
 #include "ui_qgsvectorlayerpropertiesbase.h"
 #include "qgisgui.h"
 #include "qgsaddattrdialog.h"
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -12,7 +12,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
    qgsfieldcomboboxplugin.cpp
    qgsfieldexpressionwidgetplugin.cpp
    qgsmaplayercomboboxplugin.cpp
-   qgsscalevisibilitywidgetplugin.cpp
+   qgsscalerangewidgetplugin.cpp
 )
 
 SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
@@ -21,7 +21,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
    qgsfieldcomboboxplugin.h
    qgsfieldexpressionwidgetplugin.h
    qgsmaplayercomboboxplugin.h
-   qgsscalevisibilitywidgetplugin.h
+   qgsscalerangewidgetplugin.h
 )
 
 QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
@@ -36,11 +36,11 @@ SET(QGIS_CUSTOMWIDGETS_HDRS
   qgsfieldcomboboxplugin.h
   qgsfieldexpressionwidgetplugin.h
   qgsmaplayercomboboxplugin.h
-  qgsscalevisibilitywidgetplugin.h
+  qgsscalerangewidgetplugin.h
 )
 
 SET(QGIS_CUSTOMWIDGETS_UI_HDRS
-  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsscalevisibilitywidget.h
+  # ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsXXXwidget.h
 )
 
 INCLUDE_DIRECTORIES(
diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp
@@ -21,7 +21,7 @@
 #include "qgsfieldcomboboxplugin.h"
 #include "qgsfieldexpressionwidgetplugin.h"
 #include "qgsmaplayercomboboxplugin.h"
-#include "qgsscalevisibilitywidgetplugin.h"
+#include "qgsscalerangewidgetplugin.h"
 
 
 QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
@@ -37,7 +37,7 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
   mWidgets.append( new QgsFieldComboBoxPlugin );
   mWidgets.append( new QgsFieldExpressionWidgetPlugin );
   mWidgets.append( new QgsMapLayerComboBoxPlugin );
-  mWidgets.append( new QgsScaleVisibilityWidgetPlugin );
+  mWidgets.append( new QgsScaleRangeWidgetPlugin );
 }
 
 QList<QDesignerCustomWidgetInterface*> QgisCustomWidgets::customWidgets() const
diff --git a/src/customwidgets/qgsscalerangewidgetplugin.cpp b/src/customwidgets/qgsscalerangewidgetplugin.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-   qgsscalevisibilitywidgetplugin.cpp
+   qgsscalerangewidgetplugin.cpp
     --------------------------------------
    Date                 : 25.04.2014
    Copyright            : (C) 2014 Denis Rouzaud
@@ -14,53 +14,53 @@
 ***************************************************************************/
 
 #include "qgiscustomwidgets.h"
-#include "qgsscalevisibilitywidgetplugin.h"
-#include "qgsscalevisibilitywidget.h"
+#include "qgsscalerangewidgetplugin.h"
+#include "qgsscalerangewidget.h"
 
 
-QgsScaleVisibilityWidgetPlugin::QgsScaleVisibilityWidgetPlugin( QObject *parent )
+QgsScaleRangeWidgetPlugin::QgsScaleRangeWidgetPlugin( QObject *parent )
     : QObject( parent )
     , mInitialized( false )
 {
 }
 
 
-QString QgsScaleVisibilityWidgetPlugin::name() const
+QString QgsScaleRangeWidgetPlugin::name() const
 {
-  return "QgsScaleVisibilityWidget";
+  return "QgsScaleRangeWidget";
 }
 
-QString QgsScaleVisibilityWidgetPlugin::group() const
+QString QgsScaleRangeWidgetPlugin::group() const
 {
   return QgisCustomWidgets::groupName();
 }
 
-QString QgsScaleVisibilityWidgetPlugin::includeFile() const
+QString QgsScaleRangeWidgetPlugin::includeFile() const
 {
-  return "qgsscalevisibilitywidget.h";
+  return "qgsscalerangewidget.h";
 }
 
-QIcon QgsScaleVisibilityWidgetPlugin::icon() const
+QIcon QgsScaleRangeWidgetPlugin::icon() const
 {
   return QIcon();
 }
 
-bool QgsScaleVisibilityWidgetPlugin::isContainer() const
+bool QgsScaleRangeWidgetPlugin::isContainer() const
 {
   return false;
 }
 
-QWidget *QgsScaleVisibilityWidgetPlugin::createWidget( QWidget *parent )
+QWidget *QgsScaleRangeWidgetPlugin::createWidget( QWidget *parent )
 {
-  return new QgsScaleVisibilityWidget( parent );
+  return new QgsScaleRangeWidget( parent );
 }
 
-bool QgsScaleVisibilityWidgetPlugin::isInitialized() const
+bool QgsScaleRangeWidgetPlugin::isInitialized() const
 {
   return mInitialized;
 }
 
-void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
+void QgsScaleRangeWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
 {
   Q_UNUSED( core );
   if ( mInitialized )
@@ -69,20 +69,20 @@ void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *c
 }
 
 
-QString QgsScaleVisibilityWidgetPlugin::toolTip() const
+QString QgsScaleRangeWidgetPlugin::toolTip() const
 {
-  return "A widget to define the scale visibility";
+  return "A widget to define the scale range";
 }
 
-QString QgsScaleVisibilityWidgetPlugin::whatsThis() const
+QString QgsScaleRangeWidgetPlugin::whatsThis() const
 {
-  return "A widget to define the scale visibility";
+  return "A widget to define the scale range.";
 }
 
-QString QgsScaleVisibilityWidgetPlugin::domXml() const
+QString QgsScaleRangeWidgetPlugin::domXml() const
 {
   return QString( "<ui language=\"c++\">\n"
-                  " <widget class=\"%1\" name=\"mScaleVisibilityWidget\">\n"
+                  " <widget class=\"%1\" name=\"mScaleRangeWidget\">\n"
                   "  <property name=\"geometry\">\n"
                   "   <rect>\n"
                   "    <x>0</x>\n"
diff --git a/src/customwidgets/qgsscalerangewidgetplugin.h b/src/customwidgets/qgsscalerangewidgetplugin.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-   qgsscalevisibilitywidgetplugin.h
+   qgsscalerangewidgetplugin.h
     --------------------------------------
    Date                 : 25.04.2014
    Copyright            : (C) 2014 Denis Rouzaud
@@ -13,20 +13,20 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef QGSSCALEVISIBILITYWIDGETPLUGIN_H
-#define QGSSCALEVISIBILITYWIDGETPLUGIN_H
+#ifndef QGSSCALERANGEWIDGETPLUGIN_H
+#define QGSSCALERANGEWIDGETPLUGIN_H
 
 #include <QDesignerExportWidget>
 #include <QDesignerCustomWidgetInterface>
 
 
-class QDESIGNER_WIDGET_EXPORT QgsScaleVisibilityWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
+class QDESIGNER_WIDGET_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
     Q_INTERFACES( QDesignerCustomWidgetInterface )
 
   public:
-    explicit QgsScaleVisibilityWidgetPlugin( QObject *parent = 0 );
+    explicit QgsScaleRangeWidgetPlugin( QObject *parent = 0 );
 
   private:
     bool mInitialized;
@@ -45,4 +45,4 @@ class QDESIGNER_WIDGET_EXPORT QgsScaleVisibilityWidgetPlugin : public QObject, p
     QString whatsThis() const;
     QString domXml() const;
 };
-#endif // QGSSCALEVISIBILITYWIDGETPLUGIN_H
+#endif // QGSSCALERANGEWIDGETPLUGIN_H
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -138,7 +138,7 @@ qgsrelationeditor.cpp
 qgsrelationmanagerdialog.cpp
 qgsrubberband.cpp
 qgsscalecombobox.cpp
-qgsscalevisibilitywidget.cpp
+qgsscalerangewidget.cpp
 qgssearchquerybuilder.cpp
 qgssublayersdialog.cpp
 qgssvgannotationitem.cpp
@@ -277,7 +277,7 @@ qgsrelationadddlg.h
 qgsrelationeditor.h
 qgsrelationmanagerdialog.h
 qgsscalecombobox.h
-qgsscalevisibilitywidget.h
+qgsscalerangewidget.h
 qgssearchquerybuilder.h
 qgssublayersdialog.h
 qgsunitselectionwidget.h
@@ -342,7 +342,7 @@ qgsprojectionselector.h
 qgsrelationeditor.h
 qgsrubberband.h
 qgsscalecombobox.h
-qgsscalevisibilitywidget.h
+qgsscalerangewidget.h
 qgssearchquerybuilder.h
 qgssublayersdialog.h
 qgsvectorlayertools.h
diff --git a/src/gui/qgsscalerangewidget.cpp b/src/gui/qgsscalerangewidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-   qgsscalevisibilitywidget.cpp
+   qgsscalerangewidget.cpp
     --------------------------------------
    Date                 : 25.04.2014
    Copyright            : (C) 2014 Denis Rouzaud
@@ -13,28 +13,42 @@
 *                                                                         *
 ***************************************************************************/
 
-#include "qgsscalevisibilitywidget.h"
+#include "qgsscalerangewidget.h"
 #include "qgsapplication.h"
 #include "qgsproject.h"
 
-QgsScaleVisibilityWidget::QgsScaleVisibilityWidget( QWidget *parent )
+
+QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
     : QWidget( parent )
     , mCanvas( 0 )
 {
-  setupUi( this );
+  mLayout = new QGridLayout( this );
+  mLayout->setContentsMargins( 0, 0, 0, 0 );
+
+  QLabel* maxLbl = new QLabel( tr("Maximimum (inclusive)"), this);
+  QLabel* minLbl = new QLabel( tr("Minimimum (exclusive)"), this);
 
+  mMaximumScaleIconLabel = new QLabel(this);
   mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.svg" ) );
+  mMinimumScaleIconLabel = new QLabel(this);
   mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.svg" ) );
 
-  mMinimumScaleSetCurrentPushButton->hide();
-  mMaximumScaleSetCurrentPushButton->hide();
+  mMaximumScaleComboBox = new QgsScaleComboBox(this);
+  mMinimumScaleComboBox = new QgsScaleComboBox(this);
+
+  mLayout->addWidget(maxLbl, 0, 0);
+  mLayout->addWidget(mMaximumScaleIconLabel, 0, 1);
+  mLayout->addWidget(mMaximumScaleComboBox, 0, 2);
+  mLayout->addWidget(minLbl, 0, 3);
+  mLayout->addWidget(mMinimumScaleIconLabel, 0, 4);
+  mLayout->addWidget(mMinimumScaleComboBox, 0, 5);
 }
 
-QgsScaleVisibilityWidget::~QgsScaleVisibilityWidget()
+QgsScaleRangeWidget::~QgsScaleRangeWidget()
 {
 }
 
-void QgsScaleVisibilityWidget::showEvent( QShowEvent * )
+void QgsScaleRangeWidget::showEvent( QShowEvent * )
 {
   bool projectScales = QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" );
   if ( projectScales )
@@ -45,47 +59,57 @@ void QgsScaleVisibilityWidget::showEvent( QShowEvent * )
   }
 }
 
-void QgsScaleVisibilityWidget::setMapCanvas( QgsMapCanvas *mapCanvas )
+void QgsScaleRangeWidget::setMapCanvas( QgsMapCanvas *mapCanvas )
 {
+  if (mMinimumScaleSetCurrentPushButton)
+    delete mMinimumScaleSetCurrentPushButton;
+  if (mMaximumScaleSetCurrentPushButton)
+    delete mMaximumScaleSetCurrentPushButton;
   if ( !mapCanvas )
     return;
 
   mCanvas = mapCanvas;
-  mMinimumScaleSetCurrentPushButton->show();
-  mMaximumScaleSetCurrentPushButton->show();
+
+  mMaximumScaleSetCurrentPushButton = new QToolButton();
+  connect( mMaximumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMaxScaleFromCanvas()));
+  mMinimumScaleSetCurrentPushButton = new QToolButton();
+  connect( mMinimumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMinScaleFromCanvas()));
+
+  mLayout->addWidget(mMaximumScaleSetCurrentPushButton, 1,2);
+  mLayout->addWidget(mMinimumScaleSetCurrentPushButton, 1,5);
 }
 
-void QgsScaleVisibilityWidget::setMinimumScale( double scale )
+void QgsScaleRangeWidget::setMinimumScale( double scale )
 {
   mMinimumScaleComboBox->setScale( scale );
 }
 
-double QgsScaleVisibilityWidget::minimumScale()
+double QgsScaleRangeWidget::minimumScale()
 {
   return mMinimumScaleComboBox->scale();
 }
 
-void QgsScaleVisibilityWidget::setMaximumScale( double scale )
+void QgsScaleRangeWidget::setMaximumScale( double scale )
 {
   mMaximumScaleComboBox->setScale( scale );
 }
 
-double QgsScaleVisibilityWidget::maximumScale()
+double QgsScaleRangeWidget::maximumScale()
 {
   return mMaximumScaleComboBox->scale();
 }
 
-void QgsScaleVisibilityWidget::on_mMinimumScaleSetCurrentPushButton_clicked()
+void QgsScaleRangeWidget::setMinScaleFromCanvas()
 {
   mMinimumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );
 }
 
-void QgsScaleVisibilityWidget::on_mMaximumScaleSetCurrentPushButton_clicked()
+void QgsScaleRangeWidget::setMaxScaleFromCanvas()
 {
   mMaximumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );
 }
 
-void QgsScaleVisibilityWidget::setFromLayer( QgsMapLayer *layer )
+void QgsScaleRangeWidget::setFromLayer( QgsMapLayer *layer )
 {
   mMinimumScaleComboBox->setScale( 1.0 / layer->minimumScale() );
   mMaximumScaleComboBox->setScale( 1.0 / layer->maximumScale() );
diff --git a/src/gui/qgsscalerangewidget.h b/src/gui/qgsscalerangewidget.h
diff --git a/src/ui/qgsscalevisibilitywidget.ui b/src/ui/qgsscalevisibilitywidget.ui
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/***************************************************************************`
`2`		`- qgsscalevisibilitywidgetplugin.cpp`
	`2`	`+ qgsscalerangewidgetplugin.cpp`
`3`	`3`	`--------------------------------------`
`4`	`4`	`Date : 25.04.2014`
`5`	`5`	`Copyright : (C) 2014 Denis Rouzaud`
`@@ -14,53 +14,53 @@`
`14`	`14`	`***************************************************************************/`
`15`	`15`
`16`	`16`	`#include "qgiscustomwidgets.h"`
`17`		`-#include "qgsscalevisibilitywidgetplugin.h"`
`18`		`-#include "qgsscalevisibilitywidget.h"`
	`17`	`+#include "qgsscalerangewidgetplugin.h"`
	`18`	`+#include "qgsscalerangewidget.h"`
`19`	`19`
`20`	`20`
`21`		`-QgsScaleVisibilityWidgetPlugin::QgsScaleVisibilityWidgetPlugin( QObject *parent )`
	`21`	`+QgsScaleRangeWidgetPlugin::QgsScaleRangeWidgetPlugin( QObject *parent )`
`22`	`22`	`: QObject( parent )`
`23`	`23`	`, mInitialized( false )`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
`27`	`27`
`28`		`-QString QgsScaleVisibilityWidgetPlugin::name() const`
	`28`	`+QString QgsScaleRangeWidgetPlugin::name() const`
`29`	`29`	`{`
`30`		`- return "QgsScaleVisibilityWidget";`
	`30`	`+ return "QgsScaleRangeWidget";`
`31`	`31`	`}`
`32`	`32`
`33`		`-QString QgsScaleVisibilityWidgetPlugin::group() const`
	`33`	`+QString QgsScaleRangeWidgetPlugin::group() const`
`34`	`34`	`{`
`35`	`35`	`return QgisCustomWidgets::groupName();`
`36`	`36`	`}`
`37`	`37`
`38`		`-QString QgsScaleVisibilityWidgetPlugin::includeFile() const`
	`38`	`+QString QgsScaleRangeWidgetPlugin::includeFile() const`
`39`	`39`	`{`
`40`		`- return "qgsscalevisibilitywidget.h";`
	`40`	`+ return "qgsscalerangewidget.h";`
`41`	`41`	`}`
`42`	`42`
`43`		`-QIcon QgsScaleVisibilityWidgetPlugin::icon() const`
	`43`	`+QIcon QgsScaleRangeWidgetPlugin::icon() const`
`44`	`44`	`{`
`45`	`45`	`return QIcon();`
`46`	`46`	`}`
`47`	`47`
`48`		`-bool QgsScaleVisibilityWidgetPlugin::isContainer() const`
	`48`	`+bool QgsScaleRangeWidgetPlugin::isContainer() const`
`49`	`49`	`{`
`50`	`50`	`return false;`
`51`	`51`	`}`
`52`	`52`
`53`		`-QWidget QgsScaleVisibilityWidgetPlugin::createWidget( QWidget parent )`
	`53`	`+QWidget QgsScaleRangeWidgetPlugin::createWidget( QWidget parent )`
`54`	`54`	`{`
`55`		`- return new QgsScaleVisibilityWidget( parent );`
	`55`	`+ return new QgsScaleRangeWidget( parent );`
`56`	`56`	`}`
`57`	`57`
`58`		`-bool QgsScaleVisibilityWidgetPlugin::isInitialized() const`
	`58`	`+bool QgsScaleRangeWidgetPlugin::isInitialized() const`
`59`	`59`	`{`
`60`	`60`	`return mInitialized;`
`61`	`61`	`}`
`62`	`62`
`63`		`-void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *core )`
	`63`	`+void QgsScaleRangeWidgetPlugin::initialize( QDesignerFormEditorInterface *core )`
`64`	`64`	`{`
`65`	`65`	`Q_UNUSED( core );`
`66`	`66`	`if ( mInitialized )`
`@@ -69,20 +69,20 @@ void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *c`
`69`	`69`	`}`
`70`	`70`
`71`	`71`
`72`		`-QString QgsScaleVisibilityWidgetPlugin::toolTip() const`
	`72`	`+QString QgsScaleRangeWidgetPlugin::toolTip() const`
`73`	`73`	`{`
`74`		`- return "A widget to define the scale visibility";`
	`74`	`+ return "A widget to define the scale range";`
`75`	`75`	`}`
`76`	`76`
`77`		`-QString QgsScaleVisibilityWidgetPlugin::whatsThis() const`
	`77`	`+QString QgsScaleRangeWidgetPlugin::whatsThis() const`
`78`	`78`	`{`
`79`		`- return "A widget to define the scale visibility";`
	`79`	`+ return "A widget to define the scale range.";`
`80`	`80`	`}`
`81`	`81`
`82`		`-QString QgsScaleVisibilityWidgetPlugin::domXml() const`
	`82`	`+QString QgsScaleRangeWidgetPlugin::domXml() const`
`83`	`83`	`{`
`84`	`84`	`return QString( "<ui language=\"c++\">\n"`
`85`		`- " <widget class=\"%1\" name=\"mScaleVisibilityWidget\">\n"`
	`85`	`+ " <widget class=\"%1\" name=\"mScaleRangeWidget\">\n"`
`86`	`86`	`" <property name=\"geometry\">\n"`
`87`	`87`	`" <rect>\n"`
`88`	`88`	`" <x>0</x>\n"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/***************************************************************************`
`2`		`- qgsscalevisibilitywidget.cpp`
	`2`	`+ qgsscalerangewidget.cpp`
`3`	`3`	`--------------------------------------`
`4`	`4`	`Date : 25.04.2014`
`5`	`5`	`Copyright : (C) 2014 Denis Rouzaud`
`@@ -13,28 +13,42 @@`
`13`	`13`	`* *`
`14`	`14`	`***************************************************************************/`
`15`	`15`
`16`		`-#include "qgsscalevisibilitywidget.h"`
	`16`	`+#include "qgsscalerangewidget.h"`
`17`	`17`	`#include "qgsapplication.h"`
`18`	`18`	`#include "qgsproject.h"`
`19`	`19`
`20`		`-QgsScaleVisibilityWidget::QgsScaleVisibilityWidget( QWidget *parent )`
	`20`	`+`
	`21`	`+QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )`
`21`	`22`	`: QWidget( parent )`
`22`	`23`	`, mCanvas( 0 )`
`23`	`24`	`{`
`24`		`- setupUi( this );`
	`25`	`+ mLayout = new QGridLayout( this );`
	`26`	`+ mLayout->setContentsMargins( 0, 0, 0, 0 );`
	`27`	`+`
	`28`	`+ QLabel* maxLbl = new QLabel( tr("Maximimum (inclusive)"), this);`
	`29`	`+ QLabel* minLbl = new QLabel( tr("Minimimum (exclusive)"), this);`
`25`	`30`
	`31`	`+ mMaximumScaleIconLabel = new QLabel(this);`
`26`	`32`	`mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.svg" ) );`
	`33`	`+ mMinimumScaleIconLabel = new QLabel(this);`
`27`	`34`	`mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.svg" ) );`
`28`	`35`
`29`		`- mMinimumScaleSetCurrentPushButton->hide();`
`30`		`- mMaximumScaleSetCurrentPushButton->hide();`
	`36`	`+ mMaximumScaleComboBox = new QgsScaleComboBox(this);`
	`37`	`+ mMinimumScaleComboBox = new QgsScaleComboBox(this);`
	`38`	`+`
	`39`	`+ mLayout->addWidget(maxLbl, 0, 0);`
	`40`	`+ mLayout->addWidget(mMaximumScaleIconLabel, 0, 1);`
	`41`	`+ mLayout->addWidget(mMaximumScaleComboBox, 0, 2);`
	`42`	`+ mLayout->addWidget(minLbl, 0, 3);`
	`43`	`+ mLayout->addWidget(mMinimumScaleIconLabel, 0, 4);`
	`44`	`+ mLayout->addWidget(mMinimumScaleComboBox, 0, 5);`
`31`	`45`	`}`
`32`	`46`
`33`		`-QgsScaleVisibilityWidget::~QgsScaleVisibilityWidget()`
	`47`	`+QgsScaleRangeWidget::~QgsScaleRangeWidget()`
`34`	`48`	`{`
`35`	`49`	`}`
`36`	`50`
`37`		`-void QgsScaleVisibilityWidget::showEvent( QShowEvent * )`
	`51`	`+void QgsScaleRangeWidget::showEvent( QShowEvent * )`
`38`	`52`	`{`
`39`	`53`	`bool projectScales = QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" );`
`40`	`54`	`if ( projectScales )`
`@@ -45,47 +59,57 @@ void QgsScaleVisibilityWidget::showEvent( QShowEvent * )`
`45`	`59`	`}`
`46`	`60`	`}`
`47`	`61`
`48`		`-void QgsScaleVisibilityWidget::setMapCanvas( QgsMapCanvas *mapCanvas )`
	`62`	`+void QgsScaleRangeWidget::setMapCanvas( QgsMapCanvas *mapCanvas )`
`49`	`63`	`{`
	`64`	`+ if (mMinimumScaleSetCurrentPushButton)`
	`65`	`+ delete mMinimumScaleSetCurrentPushButton;`
	`66`	`+ if (mMaximumScaleSetCurrentPushButton)`
	`67`	`+ delete mMaximumScaleSetCurrentPushButton;`
`50`	`68`	`if ( !mapCanvas )`
`51`	`69`	`return;`
`52`	`70`
`53`	`71`	`mCanvas = mapCanvas;`
`54`		`- mMinimumScaleSetCurrentPushButton->show();`
`55`		`- mMaximumScaleSetCurrentPushButton->show();`
	`72`	`+`
	`73`	`+ mMaximumScaleSetCurrentPushButton = new QToolButton();`
	`74`	`+ connect( mMaximumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMaxScaleFromCanvas()));`
	`75`	`+ mMinimumScaleSetCurrentPushButton = new QToolButton();`
	`76`	`+ connect( mMinimumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMinScaleFromCanvas()));`
	`77`	`+`
	`78`	`+ mLayout->addWidget(mMaximumScaleSetCurrentPushButton, 1,2);`
	`79`	`+ mLayout->addWidget(mMinimumScaleSetCurrentPushButton, 1,5);`
`56`	`80`	`}`
`57`	`81`
`58`		`-void QgsScaleVisibilityWidget::setMinimumScale( double scale )`
	`82`	`+void QgsScaleRangeWidget::setMinimumScale( double scale )`
`59`	`83`	`{`
`60`	`84`	`mMinimumScaleComboBox->setScale( scale );`
`61`	`85`	`}`
`62`	`86`
`63`		`-double QgsScaleVisibilityWidget::minimumScale()`
	`87`	`+double QgsScaleRangeWidget::minimumScale()`
`64`	`88`	`{`
`65`	`89`	`return mMinimumScaleComboBox->scale();`
`66`	`90`	`}`
`67`	`91`
`68`		`-void QgsScaleVisibilityWidget::setMaximumScale( double scale )`
	`92`	`+void QgsScaleRangeWidget::setMaximumScale( double scale )`
`69`	`93`	`{`
`70`	`94`	`mMaximumScaleComboBox->setScale( scale );`
`71`	`95`	`}`
`72`	`96`
`73`		`-double QgsScaleVisibilityWidget::maximumScale()`
	`97`	`+double QgsScaleRangeWidget::maximumScale()`
`74`	`98`	`{`
`75`	`99`	`return mMaximumScaleComboBox->scale();`
`76`	`100`	`}`
`77`	`101`
`78`		`-void QgsScaleVisibilityWidget::on_mMinimumScaleSetCurrentPushButton_clicked()`
	`102`	`+void QgsScaleRangeWidget::setMinScaleFromCanvas()`
`79`	`103`	`{`
`80`	`104`	`mMinimumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );`
`81`	`105`	`}`
`82`	`106`
`83`		`-void QgsScaleVisibilityWidget::on_mMaximumScaleSetCurrentPushButton_clicked()`
	`107`	`+void QgsScaleRangeWidget::setMaxScaleFromCanvas()`
`84`	`108`	`{`
`85`	`109`	`mMaximumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );`
`86`	`110`	`}`
`87`	`111`
`88`		`-void QgsScaleVisibilityWidget::setFromLayer( QgsMapLayer *layer )`
	`112`	`+void QgsScaleRangeWidget::setFromLayer( QgsMapLayer *layer )`
`89`	`113`	`{`
`90`	`114`	`mMinimumScaleComboBox->setScale( 1.0 / layer->minimumScale() );`
`91`	`115`	`mMaximumScaleComboBox->setScale( 1.0 / layer->maximumScale() );`