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

Incorporated FieldButton into ColorPaletteDialog. Tweaked ColorPaletteDialog.

Browse Source
This commit is contained in:
Jim Evins
2019-07-21 17:08:24 -04:00
parent 8fa34325a5
commit 1e1db1fc89
9 changed files with 112 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ObjectEditor.cpp
+3 -4
View File
@@ -503,13 +503,12 @@ namespace glabels
{
if ( !mBlocked )
{
QStringList keys = mModel->merge()->keys();
lineColorButton->setKeys( keys );
fillColorButton->setKeys( keys );
lineColorButton->setKeys( mModel->merge(), mModel->variables() );
fillColorButton->setKeys( mModel->merge(), mModel->variables() );
textInsertFieldButton->setKeys( mModel->merge(), mModel->variables() );
barcodeInsertFieldButton->setKeys( mModel->merge(), mModel->variables() );
imageFieldButton->setKeys( mModel->merge(), mModel->variables() );
shadowColorButton->setKeys( keys );
shadowColorButton->setKeys( mModel->merge(), mModel->variables() );
}
}