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

Use field button for image selection.

Browse Source
This commit is contained in:
Jim Evins
2016-10-22 19:56:06 -04:00
parent 016e86e9c7
commit 34da3fe17c
6 changed files with 144 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/ColorPaletteDialog.cpp
+1 -1
View File
@@ -153,7 +153,7 @@ ColorPaletteDialog::ColorPaletteDialog( const QString& defaultLabel,
vLayout->addWidget( hline4 );
mMergeFieldCombo = new QComboBox();
mMergeFieldCombo->addItem( tr("Merge field...") );
mMergeFieldCombo->addItem( tr("Merge key...") );
mMergeFieldCombo->setMinimumSize( 34, 34 );
mMergeFieldCombo->setFrame( false );
mMergeFieldCombo->setEnabled( false );
glabels/FieldButton.cpp
+40 -51
View File
@@ -1,6 +1,6 @@
/* FieldButton.cpp
*
* Copyright (C) 2014 Jim Evins <evins@snaught.com>
* Copyright (C) 2014-2016 Jim Evins <evins@snaught.com>
*
* This file is part of gLabels-qt.
*
@@ -20,95 +20,84 @@
#include "FieldButton.h"
#include <QStandardItemModel>
#include <QLineEdit>
///
/// Constructor
///
FieldButton::FieldButton( QWidget* parent )
: QPushButton(parent)
: QComboBox(parent)
{
setEnabled( false );
mMenu = new FieldMenu();
setMenu( mMenu );
connect( mMenu, SIGNAL(keySelected(const QString&)), this, SLOT(onMenuKeySelected(const QString&)) );
connect( this, SIGNAL(currentIndexChanged(int)), this, SLOT(onIndexChanged(int)) );
}
void FieldButton::setName( const QString& name )
{
if ( name.isNull() || name.isEmpty() )
mName = name;
if ( count() == 0 )
{
setText( tr("(None)") );
mLabelIsKey = false;
addItem( mName );
}
else
{
setText( name );
mLabelIsKey = true;
setItemText( 0, mName );
}
// Item 0 is the ComboBox title, not an item intended for selection. So disable it.
const QStandardItemModel* itemModel = qobject_cast<const QStandardItemModel*>(model());
QStandardItem* item = itemModel->item(0);
item->setFlags( item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled) );
}
void FieldButton::setKeys( const QList<QString>& keyList )
void FieldButton::setKeys( const QStringList& keyList )
{
mMenu->setKeys( keyList );
// Clear old keys
clear();
addItem( mName );
if ( keyList.length() > 0 )
{
mKey = keyList.first();
// Item 0 is the ComboBox title, not an item intended for selection. So disable it.
const QStandardItemModel* itemModel = qobject_cast<const QStandardItemModel*>(model());
QStandardItem* item = itemModel->item(0);
item->setFlags( item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled) );
if ( mLabelIsKey )
{
setText( mKey );
}
else
{
setText( tr("(None)") );
}
setEnabled( true );
}
else
{
setEnabled( false );
}
// Add new keys
if ( keyList.size() > 0 )
{
addItems( keyList );
setEnabled( true );
}
else
{
setEnabled( false );
}
}
void FieldButton::clearKeys()
{
if ( !mLabelIsKey )
{
setText( tr("(None)") );
}
clear();
addItem( mName );
setEnabled( false );
}
///
/// key getter
///
QString FieldButton::key() const
{
return mKey;
}
///
/// onMenuKeySelected slot
///
void FieldButton::onMenuKeySelected( const QString& key )
void FieldButton::onIndexChanged( int index )
{
mKey = key;
if ( mLabelIsKey )
if ( index > 0 )
{
setText( key );
}
emit keySelected( itemText(index) );
emit keySelected( key );
setCurrentIndex( 0 );
}
}
glabels/FieldButton.h
+7 -17
View File
@@ -1,6 +1,6 @@
/* FieldButton.h
*
* Copyright (C) 2014 Jim Evins <evins@snaught.com>
* Copyright (C) 2014-2016 Jim Evins <evins@snaught.com>
*
* This file is part of gLabels-qt.
*
@@ -21,15 +21,14 @@
#ifndef FieldButton_h
#define FieldButton_h
#include <QPushButton>
#include <QComboBox>
#include <QString>
#include "FieldMenu.h"
///
/// Field Button
///
class FieldButton : public QPushButton
class FieldButton : public QComboBox
{
Q_OBJECT
@@ -44,14 +43,7 @@ public:
// Signals
/////////////////////////////////
signals:
void keySelected( const QString& key );
/////////////////////////////////
// Properties
/////////////////////////////////
public:
QString key() const;
void keySelected( QString key );
/////////////////////////////////
@@ -59,7 +51,7 @@ public:
/////////////////////////////////
public:
void setName( const QString& name = "" );
void setKeys( const QList<QString>& keyList );
void setKeys( const QStringList& keyList );
void clearKeys();
@@ -67,16 +59,14 @@ public:
// Slots
/////////////////////////////////
private slots:
void onMenuKeySelected( const QString& key );
void onIndexChanged( int index );
/////////////////////////////////
// Private Data
/////////////////////////////////
private:
FieldMenu* mMenu;
QString mKey;
bool mLabelIsKey;
QString mName;
};
glabels/ObjectEditor.cpp
+13 -3
View File
@@ -50,6 +50,8 @@ ObjectEditor::ObjectEditor( QWidget *parent )
fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) );
shadowColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
imageFieldCombo->setName( "Key" );
setEnabled( false );
hidePages();
@@ -362,9 +364,11 @@ void ObjectEditor::onMergeSourceChanged()
{
if ( !mBlocked )
{
lineColorButton->setKeys( mModel->merge()->keys() );
fillColorButton->setKeys( mModel->merge()->keys() );
shadowColorButton->setKeys( mModel->merge()->keys() );
QStringList keys = mModel->merge()->keys();
lineColorButton->setKeys( keys );
fillColorButton->setKeys( keys );
imageFieldCombo->setKeys( keys );
shadowColorButton->setKeys( keys );
}
}
@@ -444,6 +448,12 @@ void ObjectEditor::onImageFileButtonClicked()
}
void ObjectEditor::onImageKeySelected(QString key )
{
qDebug() << "Key = " << key;
}
void ObjectEditor::onPositionControlsChanged()
{
if ( !mBlocked )
glabels/ObjectEditor.h
+1
View File
@@ -78,6 +78,7 @@ private slots:
void onLineControlsChanged();
void onFillControlsChanged();
void onImageFileButtonClicked();
void onImageKeySelected(QString key );
void onPositionControlsChanged();
void onRectSizeControlsChanged();
void onLineSizeControlsChanged();
glabels/ui/ObjectEditor.ui
+80 -64
View File
@@ -451,7 +451,7 @@
</spacer>
</item>
<item>
<widget class="FieldButton" name="textInsertFieldButton">
<widget class="QPushButton" name="textInsertFieldButton">
<property name="text">
<string/>
</property>
@@ -679,7 +679,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<widget class="FieldButton" name="barcodeFieldButton">
<widget class="QPushButton" name="barcodeFieldButton">
<property name="text">
<string/>
</property>
@@ -766,37 +766,8 @@
</property>
<layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0">
<layout class="QFormLayout" name="formLayout_8">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="1" column="1">
<widget class="QPushButton" name="imageFileButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>File...</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="FieldButton" name="imageMergeFieldButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Merge field...</string>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLineEdit" name="imageFilenameLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -818,6 +789,51 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_17" stretch="1,0,1">
<item>
<widget class="QPushButton" name="imageFileButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Select File...</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>or</string>
</property>
</widget>
</item>
<item>
<widget class="FieldButton" name="imageFieldCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Select Merge Field...</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
@@ -1488,10 +1504,10 @@
</customwidget>
<customwidget>
<class>FieldButton</class>
<extends>QPushButton</extends>
<extends>QComboBox</extends>
<header>FieldButton.h</header>
<slots>
<signal>keySelected()</signal>
<signal>keySelected(QString)</signal>
</slots>
</customwidget>
</customwidgets>
@@ -1570,8 +1586,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>223</x>
<y>202</y>
<x>236</x>
<y>200</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
@@ -1586,8 +1602,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>134</x>
<y>237</y>
<x>138</x>
<y>235</y>
</hint>
<hint type="destinationlabel">
<x>396</x>
@@ -1618,8 +1634,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>208</x>
<y>318</y>
<x>219</x>
<y>315</y>
</hint>
<hint type="destinationlabel">
<x>398</x>
@@ -1634,8 +1650,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>249</x>
<y>318</y>
<x>271</x>
<y>315</y>
</hint>
<hint type="destinationlabel">
<x>395</x>
@@ -1682,8 +1698,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>267</x>
<y>360</y>
<x>271</x>
<y>357</y>
</hint>
<hint type="destinationlabel">
<x>397</x>
@@ -1698,8 +1714,8 @@
<slot>onChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>149</x>
<y>390</y>
<x>180</x>
<y>389</y>
</hint>
<hint type="destinationlabel">
<x>394</x>
@@ -1906,8 +1922,8 @@
<slot>onFillControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>124</x>
<y>237</y>
<x>146</x>
<y>236</y>
</hint>
<hint type="destinationlabel">
<x>6</x>
@@ -1923,7 +1939,7 @@
<hints>
<hint type="sourcelabel">
<x>153</x>
<y>132</y>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>399</x>
@@ -1986,8 +2002,8 @@
<slot>onResetImageSize()</slot>
<hints>
<hint type="sourcelabel">
<x>211</x>
<y>324</y>
<x>228</x>
<y>323</y>
</hint>
<hint type="destinationlabel">
<x>4</x>
@@ -2066,8 +2082,8 @@
<slot>onShadowControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>115</x>
<y>229</y>
<x>151</x>
<y>227</y>
</hint>
<hint type="destinationlabel">
<x>406</x>
@@ -2098,8 +2114,8 @@
<slot>onLineSizeControlsChanged()</slot>
<hints>
<hint type="sourcelabel">
<x>120</x>
<y>437</y>
<x>164</x>
<y>424</y>
</hint>
<hint type="destinationlabel">
<x>1</x>
@@ -2124,18 +2140,18 @@
</hints>
</connection>
<connection>
<sender>imageMergeFieldButton</sender>
<signal>keySelected()</signal>
<sender>imageFieldCombo</sender>
<signal>keySelected(QString)</signal>
<receiver>ObjectEditor</receiver>
<slot>onImageKeySelected()</slot>
<slot>onImageKeySelected(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>351</x>
<y>147</y>
<x>343</x>
<y>151</y>
</hint>
<hint type="destinationlabel">
<x>7</x>
<y>143</y>
<x>397</x>
<y>32</y>
</hint>
</hints>
</connection>
@@ -2150,6 +2166,6 @@
<slot>onShadowControlsChanged()</slot>
<slot>onLineSizeControlsChanged()</slot>
<slot>onImageFileButtonClicked()</slot>
<slot>onImageKeySelected()</slot>
<slot>onImageKeySelected(QString)</slot>
</slots>
</ui>