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

Reconcile style differences between TextNode and ColorNode classes.

Browse Source
This commit is contained in:
Jim Evins
2017-01-06 02:51:44 -05:00
parent 90ea790e7a
commit 5b65f069dd
7 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorButton.cpp
+4 -4
View File
@@ -67,7 +67,7 @@ void ColorButton::setColorNode( ColorNode colorNode )
mColorNode = colorNode;
if ( colorNode.fieldFlag() )
if ( colorNode.isField() )
{
setIcon( QIcon() );
setText( QString("${%1}").arg( colorNode.key() ) );
@@ -86,7 +86,7 @@ void ColorButton::setColor( QColor color )
{
mIsDefault = false;
mColorNode.setFieldFlag( false );
mColorNode.setField( false );
mColorNode.setColor( color );
mColorNode.setKey( "" );
@@ -99,7 +99,7 @@ void ColorButton::setToDefault()
{
mIsDefault = true;
mColorNode.setFieldFlag( false );
mColorNode.setField( false );
mColorNode.setColor( mDefaultColor );
mColorNode.setKey( "" );
@@ -158,7 +158,7 @@ void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
mColorNode = colorNode;
mIsDefault = isDefault;
if ( colorNode.fieldFlag() )
if ( colorNode.isField() )
{
setIcon( QIcon() );
setText( QString("${%1}").arg( colorNode.key() ) );