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

Fleshing out of using merge for colors.

Browse Source
This commit is contained in:
Jim Evins
2016-05-17 23:31:52 -04:00
parent d7480f9bb8
commit 669c1d02e7
16 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ObjectEditor.cpp
+13
View File
@@ -59,9 +59,11 @@ void ObjectEditor::setModel( LabelModel* model, UndoRedoModel* undoRedoModel )
connect( mModel, SIGNAL(sizeChanged()), this, SLOT(onLabelSizeChanged()) );
connect( mModel, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()) );
connect( mModel, SIGNAL(mergeSourceChanged()), this, SLOT(onMergeSourceChanged()) );
onLabelSizeChanged();
onSelectionChanged();
onMergeSourceChanged();
}
@@ -246,6 +248,17 @@ void ObjectEditor::onSelectionChanged()
}
void ObjectEditor::onMergeSourceChanged()
{
if ( !mBlocked )
{
lineColorButton->setKeys( mModel->merge()->keys() );
fillColorButton->setKeys( mModel->merge()->keys() );
shadowColorButton->setKeys( mModel->merge()->keys() );
}
}
void ObjectEditor::onObjectChanged()
{
if ( !mBlocked )