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

Restructuring directory layout. Move towards "Modern CMake" usage.

Browse Source
This commit is contained in:
Jim Evins
2017-11-23 22:15:24 -05:00
parent 8bec3594ec
commit b8ee5e1f73
198 changed files with 4509 additions and 5324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorButton.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ namespace glabels
const QColor& color )
{
mDefaultColor = defaultColor;
mColorNode = ColorNode( color );
mColorNode = model::ColorNode( color );
setMinimumSize( QSize( 85, 34 ) );
setIconSize( QSize(SWATCH_W, SWATCH_H) );
@@ -64,14 +64,14 @@ namespace glabels
mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
connect( this, SIGNAL(toggled(bool)), this, SLOT(onButtonToggled(bool)) );
connect( mDialog, SIGNAL(colorChanged(ColorNode,bool)),
this, SLOT(onPaletteDialogChanged(ColorNode,bool)) );
connect( mDialog, SIGNAL(colorChanged(model::ColorNode,bool)),
this, SLOT(onPaletteDialogChanged(model::ColorNode,bool)) );
connect( mDialog, SIGNAL(accepted()), this, SLOT(onPaletteDialogAccepted()) );
connect( mDialog, SIGNAL(rejected()), this, SLOT(onPaletteDialogRejected()) );
}
void ColorButton::setColorNode( ColorNode colorNode )
void ColorButton::setColorNode( model::ColorNode colorNode )
{
mIsDefault = false;
@@ -118,7 +118,7 @@ namespace glabels
}
ColorNode ColorButton::colorNode()
model::ColorNode ColorButton::colorNode()
{
return mColorNode;
}
@@ -163,7 +163,7 @@ namespace glabels
}
void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
void ColorButton::onPaletteDialogChanged( model::ColorNode colorNode, bool isDefault )
{
mColorNode = colorNode;
mIsDefault = isDefault;