Skip to content
Permalink
Browse files

Rename color ramp dialogs to match new ramp class names

  • Loading branch information
nyalldawson committed Aug 24, 2016
1 parent 932e469 commit 7413db79b0eb013f4e212b56162f76e0134966d1
Showing with 138 additions and 138 deletions.
  1. +6 −6 doc/api_break.dox
  2. +3 −3 python/gui/gui.sip
  3. +19 −0 python/gui/qgscolorbrewercolorrampdialog.sip
  4. +3 −3 python/gui/{symbology-ng/qgsvectorgradientcolorrampdialog.sip → qgsgradientcolorrampdialog.sip}
  5. +3 −3 python/gui/{symbology-ng/qgsvectorrandomcolorrampdialog.sip → qgslimitedrandomcolorrampdialog.sip}
  6. +0 −19 python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip
  7. +6 −6 src/gui/CMakeLists.txt
  8. +7 −7 src/gui/{symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp → qgscolorbrewercolorrampdialog.cpp}
  9. +7 −7 src/gui/{symbology-ng/qgsvectorcolorbrewercolorrampdialog.h → qgscolorbrewercolorrampdialog.h}
  10. +24 −24 src/gui/{symbology-ng/qgsvectorgradientcolorrampdialog.cpp → qgsgradientcolorrampdialog.cpp}
  11. +9 −9 src/gui/{symbology-ng/qgsvectorgradientcolorrampdialog.h → qgsgradientcolorrampdialog.h}
  12. +11 −11 src/gui/{symbology-ng/qgsvectorrandomcolorrampdialog.cpp → qgslimitedrandomcolorrampdialog.cpp}
  13. +7 −7 src/gui/{symbology-ng/qgsvectorrandomcolorrampdialog.h → qgslimitedrandomcolorrampdialog.h}
  14. +6 −6 src/gui/symbology-ng/qgscolorrampcombobox.cpp
  15. +9 −9 src/gui/symbology-ng/qgsstylemanagerdialog.cpp
  16. +1 −1 src/gui/symbology-ng/qgssymbollayerwidget.cpp
  17. +4 −4 src/ui/{qgsvectorcolorbrewercolorrampv2dialogbase.ui → qgscolorbrewercolorrampdialogbase.ui}
  18. +9 −9 src/ui/{qgsvectorgradientcolorrampv2dialogbase.ui → qgsgradientcolorrampdialogbase.ui}
  19. +4 −4 src/ui/{qgsvectorrandomcolorrampv2dialogbase.ui → qgslimitedrandomcolorrampdialogbase.ui}
@@ -126,18 +126,18 @@ This page tries to maintain a list with incompatible changes that happened in pr
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsVectorColorBrewerColorRampDialog
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsVectorColorBrewerColorRampDialogBase
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
<tr><td>QgsVectorColorRampV2<td>QgsColorRamp
<tr><td>QgsVectorColorRampV2Map<td>QgsVectorColorRampMap
<tr><td>QgsVectorGradientColorRampV2<td>QgsGradientColorRamp
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsVectorGradientColorRampDialog
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsVectorGradientColorRampDialogBase
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsGradientColorRampDialog
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsGradientColorRampDialogBase
<tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
<tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
<tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsVectorRandomColorRampDialog
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsVectorRandomColorRampDialogBase
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
<tr><th>QgsSymbolV2<th>QgsSymbol
</table>

@@ -45,6 +45,7 @@
%Include qgscodeeditorcss.sip
%End
%Include qgscharacterselectdialog.sip
%Include qgscolorbrewercolorrampdialog.sip
%Include qgscolorbutton.sip
%Include qgscolorbutton.sip
%Include qgscolordialog.sip
@@ -87,6 +88,7 @@
%Include qgsformannotationitem.sip
%Include qgsgenericprojectionselector.sip
%Include qgsgeometryrubberband.sip
%Include qgsgradientcolorrampdialog.sip
%Include qgsgradientstopeditor.sip
%Include qgsgroupwmsdatadialog.sip
%Include qgshighlight.sip
@@ -95,6 +97,7 @@
%Include qgsidentifymenu.sip
%Include qgslegendfilterbutton.sip
%Include qgslegendinterface.sip
%Include qgslimitedrandomcolorrampdialog.sip
%Include qgslonglongvalidator.sip
%Include qgsludialog.sip
%Include qgsmanageconnectionsdialog.sip
@@ -249,10 +252,7 @@
%Include symbology-ng/qgssymbollevelsdialog.sip
%Include symbology-ng/qgssymbolslistwidget.sip
%Include symbology-ng/qgssymbolselectordialog.sip
%Include symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip
%Include symbology-ng/qgsvectorfieldsymbollayerwidget.sip
%Include symbology-ng/qgsvectorgradientcolorrampdialog.sip
%Include symbology-ng/qgsvectorrandomcolorrampdialog.sip

%Include effects/qgseffectdrawmodecombobox.sip
%Include effects/qgseffectstackpropertieswidget.sip
@@ -0,0 +1,19 @@
class QgsColorBrewerColorRampDialog : QDialog
{
%TypeHeaderCode
#include <qgscolorbrewercolorrampdialog.h>
%End

public:
QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );

public slots:
void setSchemeName();
void setColors();

void populateVariants();

protected:

void updatePreview();
};
@@ -1,11 +1,11 @@
class QgsVectorGradientColorRampDialog : QDialog
class QgsGradientColorRampDialog : QDialog
{
%TypeHeaderCode
#include <qgsvectorgradientcolorrampdialog.h>
#include <qgsgradientcolorrampdialog.h>
%End

public:
QgsVectorGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
QgsGradientColorRampDialog( QgsGradientColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );

public slots:
void setColor1( const QColor& color );
@@ -1,11 +1,11 @@
class QgsVectorRandomColorRampDialog : QDialog
class QgsLimitedRandomColorRampDialog : QDialog
{
%TypeHeaderCode
#include <qgsvectorrandomcolorrampdialog.h>
#include <qgslimitedrandomcolorrampdialog.h>
%End

public:
QgsVectorRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
QgsLimitedRandomColorRampDialog( QgsLimitedRandomColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );

public slots:
void setCount( int val );

This file was deleted.

@@ -42,10 +42,7 @@ SET(QGIS_GUI_SRCS
symbology-ng/qgssymbollevelsdialog.cpp
symbology-ng/qgssymbolslistwidget.cpp
symbology-ng/qgssymbolselectordialog.cpp
symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp
symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
symbology-ng/qgsvectorgradientcolorrampdialog.cpp
symbology-ng/qgsvectorrandomcolorrampdialog.cpp

effects/qgseffectdrawmodecombobox.cpp
effects/qgseffectstackpropertieswidget.cpp
@@ -182,6 +179,7 @@ SET(QGIS_GUI_SRCS
qgscodeeditorpython.cpp
qgscodeeditorsql.cpp
qgscollapsiblegroupbox.cpp
qgscolorbrewercolorrampdialog.cpp
qgscolorbutton.cpp
qgscolordialog.cpp
qgscolorschemelist.cpp
@@ -225,6 +223,7 @@ SET(QGIS_GUI_SRCS
qgsformannotationitem.cpp
qgsgenericprojectionselector.cpp
qgsgeometryrubberband.cpp
qgsgradientcolorrampdialog.cpp
qgsgradientstopeditor.cpp
qgsgroupwmsdatadialog.cpp
qgshighlight.cpp
@@ -233,6 +232,7 @@ SET(QGIS_GUI_SRCS
qgsidentifymenu.cpp
qgslegendfilterbutton.cpp
qgslegendinterface.cpp
qgslimitedrandomcolorrampdialog.cpp
qgsludialog.cpp
qgsmanageconnectionsdialog.cpp
qgsmapcanvas.cpp
@@ -343,6 +343,7 @@ SET(QGIS_GUI_MOC_HDRS
qgscodeeditorpython.h
qgscodeeditorsql.h
qgscollapsiblegroupbox.h
qgscolorbrewercolorrampdialog.h
qgscolorbutton.h
qgscolordialog.h
qgscolorschemelist.h
@@ -382,13 +383,15 @@ SET(QGIS_GUI_MOC_HDRS
qgsfocuswatcher.h
qgsformannotationitem.h
qgsgenericprojectionselector.h
qgsgradientcolorrampdialog.h
qgsgradientstopeditor.h
qgsgroupwmsdatadialog.h
qgshistogramwidget.h
qgshtmlannotationitem.h
qgsidentifymenu.h
qgslegendfilterbutton.h
qgslegendinterface.h
qgslimitedrandomcolorrampdialog.h
qgslonglongvalidator.h
qgsludialog.h
qgsmanageconnectionsdialog.h
@@ -494,10 +497,7 @@ SET(QGIS_GUI_MOC_HDRS
symbology-ng/qgssymbollevelsdialog.h
symbology-ng/qgssymbolslistwidget.h
symbology-ng/qgssymbolselectordialog.h
symbology-ng/qgsvectorcolorbrewercolorrampdialog.h
symbology-ng/qgsvectorfieldsymbollayerwidget.h
symbology-ng/qgsvectorgradientcolorrampdialog.h
symbology-ng/qgsvectorrandomcolorrampdialog.h

attributetable/qgsattributetabledelegate.h
attributetable/qgsattributetablefiltermodel.h
@@ -1,5 +1,5 @@
/***************************************************************************
qgsvectorcolorbrewercolorrampdialog.cpp
qgscolorbrewercolorrampdialog.cpp
---------------------
begin : November 2009
copyright : (C) 2009 by Martin Dobias
@@ -13,7 +13,7 @@
* *
***************************************************************************/

#include "qgsvectorcolorbrewercolorrampdialog.h"
#include "qgscolorbrewercolorrampdialog.h"

#include "qgscolorramp.h"
#include "qgssymbollayerutils.h"
@@ -31,7 +31,7 @@ static void updateColorButton( QAbstractButton* button, QColor color )
/////////


QgsVectorColorBrewerColorRampDialog::QgsVectorColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent )
QgsColorBrewerColorRampDialog::QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent )
: QDialog( parent )
, mRamp( ramp )
{
@@ -61,7 +61,7 @@ QgsVectorColorBrewerColorRampDialog::QgsVectorColorBrewerColorRampDialog( QgsCol
updatePreview();
}

void QgsVectorColorBrewerColorRampDialog::populateVariants()
void QgsColorBrewerColorRampDialog::populateVariants()
{
QString oldVariant = cboColors->currentText();

@@ -83,13 +83,13 @@ void QgsVectorColorBrewerColorRampDialog::populateVariants()
cboColors->setCurrentIndex( idx );
}

void QgsVectorColorBrewerColorRampDialog::updatePreview()
void QgsColorBrewerColorRampDialog::updatePreview()
{
QSize size( 300, 40 );
lblPreview->setPixmap( QgsSymbolLayerUtils::colorRampPreviewPixmap( mRamp, size ) );
}

void QgsVectorColorBrewerColorRampDialog::setSchemeName()
void QgsColorBrewerColorRampDialog::setSchemeName()
{
// populate list of variants
populateVariants();
@@ -98,7 +98,7 @@ void QgsVectorColorBrewerColorRampDialog::setSchemeName()
updatePreview();
}

void QgsVectorColorBrewerColorRampDialog::setColors()
void QgsColorBrewerColorRampDialog::setColors()
{
int num = cboColors->currentText().toInt();
mRamp->setColors( num );
@@ -1,5 +1,5 @@
/***************************************************************************
qgsvectorcolorbrewercolorrampdialog.h
qgscolorbrewercolorrampdialog.h
---------------------
begin : November 2009
copyright : (C) 2009 by Martin Dobias
@@ -13,24 +13,24 @@
* *
***************************************************************************/

#ifndef QGSVECTORCOLORBREWERCOLORRAMPV2DIALOG_H
#define QGSVECTORCOLORBREWERCOLORRAMPV2DIALOG_H
#ifndef QGSCOLORBREWERCOLORRAMPDIALOG_H
#define QGSCOLORBREWERCOLORRAMPDIALOG_H

#include <QDialog>

#include "ui_qgsvectorcolorbrewercolorrampv2dialogbase.h"
#include "ui_qgscolorbrewercolorrampdialogbase.h"

class QgsColorBrewerColorRamp;

/** \ingroup gui
* \class QgsVectorColorBrewerColorRampDialog
* \class QgsColorBrewerColorRampDialog
*/
class GUI_EXPORT QgsVectorColorBrewerColorRampDialog : public QDialog, private Ui::QgsVectorColorBrewerColorRampDialogBase
class GUI_EXPORT QgsColorBrewerColorRampDialog : public QDialog, private Ui::QgsColorBrewerColorRampDialogBase
{
Q_OBJECT

public:
QgsVectorColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent = nullptr );
QgsColorBrewerColorRampDialog( QgsColorBrewerColorRamp* ramp, QWidget* parent = nullptr );

public slots:
void setSchemeName();

0 comments on commit 7413db7

Please sign in to comment.
You can’t perform that action at this time.