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

UserVariables branch merge

Browse Source
This commit is contained in:
gitlost
2019-08-21 03:37:56 +01:00
parent 6ab3a12b92 6a789c9632
commit 2444cacb74
92 changed files with 3624 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ObjectEditor.cpp
+27 -18
View File
@@ -36,6 +36,7 @@
#include "merge/Merge.h"
#include <QFileDialog>
#include <QDir>
#include <QtMath>
#include <QtDebug>
@@ -67,9 +68,9 @@ namespace glabels
barcodeColorButton->init( tr("Default"), QColor(0,0,0,255), QColor(0,0,0,255) );
shadowColorButton->init( tr("Default"), QColor(0,0,0,255), QColor(0,0,0,255) );
textInsertFieldCombo->setName( tr("Insert Field") );
barcodeInsertFieldCombo->setName( tr("Insert Field") );
imageFieldCombo->setName( tr("Key") );
textInsertFieldButton->setText( tr("Insert substitution field") );
barcodeInsertFieldButton->setText( tr("Insert substitution field") );
imageFieldButton->setText( tr("Use substitution field") );
setEnabled( false );
hidePages();
@@ -93,11 +94,14 @@ namespace glabels
this, SLOT(onSelectionChanged()) );
connect( mModel, SIGNAL(mergeSourceChanged()),
this, SLOT(onMergeSourceChanged()) );
this, SLOT(onFieldsAvailableChanged()) );
connect( mModel, SIGNAL(variablesChanged()),
this, SLOT(onFieldsAvailableChanged()) );
onLabelSizeChanged();
onSelectionChanged();
onMergeSourceChanged();
onFieldsAvailableChanged();
}
@@ -122,12 +126,12 @@ namespace glabels
if ( filenameNode.isField() )
{
QString field = QString("${%1}").arg( filenameNode.data() );
imageFilenameLineEdit->setText( field );
imageFilenameLineEdit->setText( QString("${%1}").arg(filenameNode.data()) );
}
else
{
imageFilenameLineEdit->setText( filenameNode.data() );
QString fn = mModel->dir().relativeFilePath( filenameNode.data() );
imageFilenameLineEdit->setText( fn );
}
mBlocked = false;
@@ -499,17 +503,19 @@ namespace glabels
}
void ObjectEditor::onMergeSourceChanged()
void ObjectEditor::onFieldsAvailableChanged()
{
if ( !mBlocked )
{
QStringList keys = mModel->merge()->keys();
lineColorButton->setKeys( keys );
fillColorButton->setKeys( keys );
textInsertFieldCombo->setKeys( keys );
barcodeInsertFieldCombo->setKeys( keys );
imageFieldCombo->setKeys( keys );
shadowColorButton->setKeys( keys );
lineColorButton->setKeys( mModel->merge(), mModel->variables() );
fillColorButton->setKeys( mModel->merge(), mModel->variables() );
textColorButton->setKeys( mModel->merge(), mModel->variables() );
barcodeColorButton->setKeys( mModel->merge(), mModel->variables() );
shadowColorButton->setKeys( mModel->merge(), mModel->variables() );
textInsertFieldButton->setKeys( mModel->merge(), mModel->variables() );
barcodeInsertFieldButton->setKeys( mModel->merge(), mModel->variables() );
imageFieldButton->setKeys( mModel->merge(), mModel->variables() );
}
}
@@ -620,8 +626,11 @@ namespace glabels
void ObjectEditor::onImageKeySelected( QString key )
{
mUndoRedoModel->checkpoint( tr("Set image") );
mObject->setFilenameNode( model::TextNode( true, key ) );
if ( mObject )
{
mUndoRedoModel->checkpoint( tr("Set image") );
mObject->setFilenameNode( model::TextNode( true, key ) );
}
}