sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Vertically stack the color widget when in dock mode

Browse Source
This commit is contained in:
Nyall Dawson 2016-08-16 16:32:57 +10:00
parent ce133102bf
commit cd4bc8887b
5 changed files with 609 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/gui/qgscompoundcolorwidget.sip
View File

@ -14,11 +14,19 @@ class QgsCompoundColorWidget : QgsPanelWidget
public:
//! Widget layout
enum Layout
{
LayoutDefault, /*!< Use the default (rectangular) layout */
LayoutVertical, /*!< Use a narrower, vertically stacked layout */
};
/** Constructor for QgsCompoundColorWidget
* @param parent parent widget
* @param color initial color for dialog
* @param layout widget layout to use
*/
QgsCompoundColorWidget( QWidget *parent /TransferThis/ = nullptr, const QColor& color = QColor() );
QgsCompoundColorWidget( QWidget *parent /TransferThis/ = nullptr, const QColor& color = QColor(), Layout layout = LayoutDefault );
~QgsCompoundColorWidget();

3
src/gui/qgscolorbutton.cpp
View File

@ -96,7 +96,8 @@ void QgsColorButton::showColorDialog()
{
if ( QgsPanelWidget* panel = QgsPanelWidget::findParentPanel( this ) )
{
QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color() );
QgsCompoundColorWidget* colorWidget = new QgsCompoundColorWidget( panel, color(), panel->dockMode() ? QgsCompoundColorWidget::LayoutVertical :
QgsCompoundColorWidget::LayoutDefault );
colorWidget->setPanelTitle( mColorDialogTitle );
colorWidget->setAllowAlpha( mAllowAlpha );
connect( colorWidget, SIGNAL( currentColorChanged( QColor ) ), this, SLOT( setValidTemporaryColor( QColor ) ) );

16
src/gui/qgscompoundcolorwidget.cpp
View File

@ -28,9 +28,9 @@
#include <QDesktopWidget>
#include <QMouseEvent>
#include <QInputDialog>
#include <QVBoxLayout>
QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor& color )
QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor& color, Layout widgetLayout )
: QgsPanelWidget( parent )
, mAllowAlpha( true )
, mLastCustomColorIndex( 0 )
@ -38,6 +38,18 @@ QgsCompoundColorWidget::QgsCompoundColorWidget( QWidget *parent, const QColor& c
{
setupUi( this );
if ( widgetLayout == LayoutVertical )
{
// shuffle stuff around
QVBoxLayout* newLayout = new QVBoxLayout();
newLayout->addWidget( mTabWidget );
newLayout->addWidget( mSlidersWidget );
newLayout->addWidget( mPreviewWidget );
newLayout->addWidget( mSwatchesWidget );
delete layout();
setLayout( newLayout );
}
QSettings settings;
mSchemeList->header()->hide();

10
src/gui/qgscompoundcolorwidget.h
View File

@ -34,11 +34,19 @@ class GUI_EXPORT QgsCompoundColorWidget : public QgsPanelWidget, private Ui::Qgs
public:
//! Widget layout
enum Layout
{
LayoutDefault = 0, /*!< Use the default (rectangular) layout */
LayoutVertical, /*!< Use a narrower, vertically stacked layout */
};
/** Constructor for QgsCompoundColorWidget
* @param parent parent widget
* @param color initial color for dialog
* @param layout widget layout to use
*/
QgsCompoundColorWidget( QWidget *parent = nullptr, const QColor& color = QColor() );
QgsCompoundColorWidget( QWidget *parent = nullptr, const QColor& color = QColor(), Layout layout = LayoutDefault );
~QgsCompoundColorWidget();

1144
src/ui/qgscompoundcolorwidget.ui
View File

File diff suppressed because it is too large Load Diff