Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

More tweaking of color button and dialog.

Browse Source
This commit is contained in:
Jim Evins
2015-08-19 10:14:05 -04:00
parent b1bfdc6952
commit e4d2603cb4
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorButton.cpp
+31 -13
View File
@@ -22,7 +22,6 @@
#include "ColorSwatch.h"
#include <QIcon>
#include <QMenu>
#include <QHBoxLayout>
#include <QtDebug>
@@ -53,16 +52,12 @@ namespace glabels
setCheckable( true );
mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
//mDialog->setModal( true );
mMenu = new QMenu();
QHBoxLayout* layout = new QHBoxLayout;
layout->addWidget( mDialog );
mMenu->setLayout( layout );
setMenu( mMenu );
connect( this, SIGNAL(toggled(bool)), this, SLOT(onButtonToggled(bool)) );
connect( mDialog, SIGNAL(colorChanged(ColorNode,bool)),
this, SLOT(onPaletteDialogChanged(ColorNode,bool)) );
connect( mDialog, SIGNAL(accepted()), this, SLOT(onPaletteDialogAccepted()) );
connect( mDialog, SIGNAL(rejected()), this, SLOT(onPaletteDialogRejected()) );
}
@@ -129,18 +124,41 @@ namespace glabels
}
void ColorButton::onButtonToggled( bool checked )
{
if ( checked )
{
///
/// @TODO: improve positioning of dialog -- near edges of screen.
///
QPoint dialogPos( 0, height() );
mDialog->move( mapToGlobal(dialogPos) );
mDialog->show();
}
}
void ColorButton::onPaletteDialogAccepted()
{
setChecked( false );
}
void ColorButton::onPaletteDialogRejected()
{
setChecked( false );
}
void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
{
qDebug() << "Palette Dialog Changed.";
mColorNode = colorNode;
mIsDefault = isDefault;
setIcon( QIcon( ColorSwatch( SWATCH_W, SWATCH_H, colorNode.color() ) ) );
setText( "" );
mMenu->setVisible( false );
emit colorChanged();
}