Added basic image object functionality.

glabels/CMakeLists.txt

@@ -37,6 +37,7 @@ set (glabels_sources
   LabelModelObject.cpp
   LabelModelBoxObject.cpp
   LabelModelEllipseObject.cpp
+  LabelModelImageObject.cpp
   LabelModelLineObject.cpp
   LabelModelShapeObject.cpp
   LabelRegion.cpp
@@ -81,6 +82,7 @@ set (glabels_qobject_headers
   LabelModelObject.h
   LabelModelBoxObject.h
   LabelModelEllipseObject.h
+  LabelModelImageObject.h
   LabelModelLineObject.h
   LabelModelShapeObject.h
   MainWindow.h

glabels/LabelEditor.cpp

@@ -29,6 +29,7 @@
 #include "LabelModelObject.h"
 #include "LabelModelBoxObject.h"
 #include "LabelModelEllipseObject.h"
+#include "LabelModelImageObject.h"
 #include "LabelModelLineObject.h"
 #include "UndoRedoModel.h"
 #include "Settings.h"
@@ -340,6 +341,19 @@ LabelEditor::createEllipseMode()
 }
 
 
+///
+/// Create image mode
+///
+void
+LabelEditor::createImageMode()
+{
+	setCursor( Cursors::Image() );
+
+	mCreateObjectType = Image;
+	mState = CreateIdle;
+}
+
+
 ///
 /// Create line mode
 ///
@@ -492,7 +506,7 @@ LabelEditor::mousePressEvent( QMouseEvent* event )
 					mCreateObject = new LabelModelLineObject();
 					break;
 				case Image:
-					// mCreateObject = new LabelModelImageObject();
+					mCreateObject = new LabelModelImageObject();
 					break;
 				case Text:
 					// mCreateObject = new LabelModelTextObject();

glabels/LabelModelImageObject.cpp

@@ -0,0 +1,240 @@
+/*  LabelModelImageObject.cpp
+ *
+ *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "LabelModelImageObject.h"
+
+#include <QBrush>
+#include <QPen>
+#include <QImage>
+
+
+namespace
+{
+}
+
+
+///
+/// Static data
+///
+QImage* LabelModelImageObject::smDefaultImage = 0;
+
+
+///
+/// Constructor
+///
+LabelModelImageObject::LabelModelImageObject() : mImage(0)
+{
+	mOutline = new Outline( this );
+
+	mHandles << new HandleNorthWest( this );
+	mHandles << new HandleNorth( this );
+	mHandles << new HandleNorthEast( this );
+	mHandles << new HandleEast( this );
+	mHandles << new HandleSouthEast( this );
+	mHandles << new HandleSouth( this );
+	mHandles << new HandleSouthWest( this );
+	mHandles << new HandleWest( this );
+
+	if ( smDefaultImage == 0 )
+	{
+		smDefaultImage = new QImage( ":images/checkerboard.png" );
+	}
+}
+
+
+///
+/// Copy constructor
+///
+LabelModelImageObject::LabelModelImageObject( const LabelModelImageObject* object ) : LabelModelObject(object)
+{
+	mFilenameNode = object->mFilenameNode;
+}
+
+
+///
+/// Destructor
+///
+LabelModelImageObject::~LabelModelImageObject()
+{
+	delete mOutline;
+
+	foreach( Handle* handle, mHandles )
+	{
+		delete handle;
+	}
+	mHandles.clear();
+}
+
+
+///
+/// Clone
+///
+LabelModelImageObject* LabelModelImageObject::clone() const
+{
+	return new LabelModelImageObject( this );
+}
+
+
+///
+/// Image filenameNode Property Getter
+///
+TextNode LabelModelImageObject::filenameNode( void ) const
+{
+	return mFilenameNode;
+}
+
+
+///
+/// Image filenameNode Property Setter
+///
+void LabelModelImageObject::setFilenameNode( const TextNode& value )
+{
+	if ( mFilenameNode != value )
+	{
+		mFilenameNode = value;
+		loadImage();
+		
+		emit changed();
+	}
+}
+
+
+///
+/// Draw shadow of object
+///
+void LabelModelImageObject::drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const
+{
+	QRectF destRect( 0, 0, mW.pt(), mH.pt() );
+	
+	QColor shadowColor = mShadowColorNode.color( record );
+	shadowColor.setAlphaF( mShadowOpacity );
+
+	if ( mImage && mImage->hasAlphaChannel() && (mImage->depth() == 32) )
+	{
+		QImage* shadowImage = createShadowImage( shadowColor );
+		painter->drawImage( destRect, *shadowImage );
+		delete shadowImage;
+	}
+	else
+	{
+		painter->setBrush( shadowColor );
+		painter->setPen( QPen( Qt::NoPen ) );
+
+		painter->drawRect( destRect );
+	}
+}
+
+	
+///
+/// Draw object itself
+///
+void LabelModelImageObject::drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const
+{
+	QRectF destRect( 0, 0, mW.pt(), mH.pt() );
+	
+	if ( inEditor && (mFilenameNode.isField() || !mImage ) )
+	{
+		painter->save();
+		painter->setRenderHint( QPainter::SmoothPixmapTransform, false );
+		painter->drawImage( destRect, *smDefaultImage );
+		painter->restore();
+	}
+	else if ( mImage )
+	{
+		painter->drawImage( destRect, *mImage );
+	}
+	else if ( mFilenameNode.isField() )
+	{
+	}
+}
+
+
+///
+/// Path to test for hover condition
+///
+QPainterPath LabelModelImageObject::hoverPath( double scale ) const
+{
+	QPainterPath path;
+	path.addRect( 0, 0, mW.pt(), mH.pt() );
+
+	return path;
+}
+
+
+///
+/// Load image
+///
+void LabelModelImageObject::loadImage()
+{
+	if ( mImage )
+	{
+		delete mImage;
+	}
+
+	if ( mFilenameNode.isField() )
+	{
+		mImage = 0;
+	}
+	else
+	{
+		QString filename = mFilenameNode.data();
+		mImage = new QImage( filename );
+		if ( mImage->isNull() )
+		{
+			mImage = 0;
+		}
+		else
+		{
+			double imageW = mImage->width();
+			double imageH = mImage->height();
+			double aspectRatio = imageH / imageW;
+			if ( mH > mW*aspectRatio )
+			{
+				mH = mW*aspectRatio;
+			}
+			else
+			{
+				mW = mH/aspectRatio;
+			}
+		}
+	}
+}
+
+
+QImage* LabelModelImageObject::createShadowImage( const QColor& color ) const
+{
+	int r = color.red();
+	int g = color.green();
+	int b = color.blue();
+	int a = color.alpha();
+		
+	QImage* shadow = new QImage( *mImage );
+	for ( int iy = 0; iy < shadow->height(); iy++ )
+	{
+		QRgb* scanLine = (QRgb*)shadow->scanLine( iy );
+		
+		for ( int ix = 0; ix < shadow->width(); ix++ )
+		{
+			scanLine[ix] = qRgba( r, g, b, (a*qAlpha(scanLine[ix]))/255 );
+		}
+	}
+
+	return shadow;
+}

glabels/LabelModelImageObject.h

@@ -0,0 +1,93 @@
+/*  LabelModelImageObject.h
+ *
+ *  Copyright (C) 2013-2016  Jim Evins <evins@snaught.com>
+ *
+ *  This file is part of gLabels-qt.
+ *
+ *  gLabels-qt is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  gLabels-qt is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LabelModelImageObject_h
+#define LabelModelImageObject_h
+
+#include "LabelModelObject.h"
+
+
+///
+/// Label Model Image Object
+///
+class LabelModelImageObject : public LabelModelObject
+{
+	Q_OBJECT
+
+	///////////////////////////////////////////////////////////////
+	// Lifecycle Methods
+	///////////////////////////////////////////////////////////////
+public:
+	LabelModelImageObject();
+	LabelModelImageObject( const LabelModelImageObject* object );
+	virtual ~LabelModelImageObject();
+
+
+	///////////////////////////////////////////////////////////////
+	// Object duplication
+	///////////////////////////////////////////////////////////////
+	virtual LabelModelImageObject* clone() const;
+
+
+	///////////////////////////////////////////////////////////////
+	// Property Implementations
+	///////////////////////////////////////////////////////////////
+public:
+	//
+	// Image Property: filenameNode
+	//
+	virtual TextNode filenameNode( void ) const;
+	virtual void setFilenameNode( const TextNode& value );
+
+
+	///////////////////////////////////////////////////////////////
+	// Capability Implementations
+	///////////////////////////////////////////////////////////////
+
+
+	///////////////////////////////////////////////////////////////
+	// Drawing operations
+	///////////////////////////////////////////////////////////////
+protected:
+	virtual void drawShadow( QPainter* painter, bool inEditor, merge::Record* record ) const;
+	virtual void drawObject( QPainter* painter, bool inEditor, merge::Record* record ) const;
+	virtual QPainterPath hoverPath( double scale ) const;
+
+
+	///////////////////////////////////////////////////////////////
+	// Private
+	///////////////////////////////////////////////////////////////
+	void loadImage();
+	QImage* createShadowImage( const QColor& color ) const;
+	
+
+	///////////////////////////////////////////////////////////////
+	// Private Members
+	///////////////////////////////////////////////////////////////
+protected:
+	TextNode       mFilenameNode;
+	QImage*        mImage;
+
+	static QImage* smDefaultImage;
+
+};
+
+
+#endif // LabelModelImageObject_h

glabels/MainWindow.cpp

@@ -45,8 +45,6 @@
 #include "MergeView.h"
 #include "PrintView.h"
 #include "LabelModel.h"
-#include "LabelModelBoxObject.h"
-#include "LabelModelEllipseObject.h"
 #include "UndoRedoModel.h"
 #include "Icons.h"
 #include "File.h"
@@ -1255,7 +1253,8 @@ void MainWindow::objectsCreateEllipse()
 ///
 void MainWindow::objectsCreateImage()
 {
-	qDebug() << "ACTION: objects->Create->Image";
+	mUndoRedoModel->checkpoint( tr("Create Image") );
+	mLabelEditor->createImageMode();
 }
 
 

glabels/ObjectEditor.cpp

@@ -25,6 +25,7 @@
 #include "LabelModelObject.h"
 #include "LabelModelBoxObject.h"
 #include "LabelModelEllipseObject.h"
+#include "LabelModelImageObject.h"
 #include "LabelModelLineObject.h"
 #include "UndoRedoModel.h"
 
@@ -32,6 +33,7 @@
 
 #include "Settings.h"
 
+#include <QFileDialog>
 #include <cmath>
 #include <QtDebug>
 
@@ -82,6 +84,28 @@ void ObjectEditor::hidePages()
 }
 
 
+void ObjectEditor::loadImagePage()
+{
+	if ( mObject )
+	{
+		mBlocked = true;
+
+		TextNode filenameNode = mObject->filenameNode();
+
+		if ( filenameNode.isField() )
+		{
+			imageFilenameLineEdit->setText( QString("${%1}").arg( filenameNode.data() ) );
+		}
+		else
+		{
+			imageFilenameLineEdit->setText( filenameNode.data() );
+		}
+
+		mBlocked = false;			
+	}
+}
+
+
 void ObjectEditor::loadLineFillPage()
 {
 	if ( mObject )
@@ -273,6 +297,25 @@ void ObjectEditor::onSelectionChanged()
 				
 				setEnabled( true );
 			}
+			else if ( dynamic_cast<LabelModelImageObject*>(mObject) )
+			{
+				titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.png") );
+				titleLabel->setText( tr("Image object properties") );
+
+				notebook->addTab( imagePage, "image" );
+				notebook->addTab( posSizePage, "position/size" );
+				notebook->addTab( shadowPage, "shadow" );
+
+				sizeRectFrame->setVisible( true );
+				sizeResetImageButton->setVisible( true );
+				sizeLineFrame->setVisible( false );
+
+				loadImagePage();
+				loadPositionPage();
+				loadShadowPage();
+				
+				setEnabled( true );
+			}
 			else if ( dynamic_cast<LabelModelLineObject*>(mObject) )
 			{
 				titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.png") );
@@ -333,6 +376,7 @@ void ObjectEditor::onObjectChanged()
 		loadLineFillPage();
 		loadRectSizePage();
 		loadLineSizePage();
+		loadImagePage();
 		loadShadowPage();
 	}
 }
@@ -385,6 +429,21 @@ void ObjectEditor::onFillControlsChanged()
 }
 
 
+void ObjectEditor::onImageFileButtonClicked()
+{
+	QString filename =
+		QFileDialog::getOpenFileName( this->window(),
+					      tr("gLabels - Select image file"),
+					      ".",
+					      tr("Image Files (*.png *.jpg *.bmp);;All files (*)") );
+	if ( !filename.isEmpty() )
+	{
+		mUndoRedoModel->checkpoint( tr("Set image") );
+		mObject->setFilenameNode( TextNode( false, filename ) );
+	}
+}
+
+
 void ObjectEditor::onPositionControlsChanged()
 {
 	if ( !mBlocked )

glabels/ObjectEditor.h

@@ -56,6 +56,7 @@ public:
 	/////////////////////////////////
 private:
 	void hidePages();
+	void loadImagePage();
 	void loadLineFillPage();
 	void loadPositionPage();
 	void loadRectSizePage();
@@ -76,6 +77,7 @@ private slots:
 	void onObjectDestroyed();
 	void onLineControlsChanged();
 	void onFillControlsChanged();
+	void onImageFileButtonClicked();
 	void onPositionControlsChanged();
 	void onRectSizeControlsChanged();
 	void onLineSizeControlsChanged();

glabels/TextNode.cpp

@@ -37,7 +37,7 @@ namespace {
 /// Default Constructor
 ///
 TextNode::TextNode()
-	: mFieldFlag(false), mData("")
+	: mIsField(false), mData("")
 {
 }
 
@@ -45,8 +45,8 @@ TextNode::TextNode()
 ///
 /// Constructor from Data
 ///
-TextNode::TextNode( bool field_flag, const QString &data )
-	: mFieldFlag(field_flag), mData(data)
+TextNode::TextNode( bool isField, const QString &data )
+	: mIsField(isField), mData(data)
 {
 }
 
@@ -54,14 +54,14 @@ TextNode::TextNode( bool field_flag, const QString &data )
 ///
 /// Constructor from Parsing Next Token in Text
 ///
-TextNode::TextNode( const QString &text, int i_start, int &i_next )
+TextNode::TextNode( const QString &text, int iStart, int &iNext )
 {
 	State   state = START;
-	QString literal_text;
-	QString field_name;
-	bool    field_flag = false;
+	QString literalText;
+	QString fieldName;
+	bool    isField = false;
 
-	int i = i_start;
+	int i = iStart;
 
 	while ( state != DONE )
 	{
@@ -84,7 +84,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 				break;
 			default:
 				/* Start a literal text node. */
-				literal_text.append( c );
+				literalText.append( c );
 				i++;
 				state = LITERAL;
 				break;
@@ -105,7 +105,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 				state = DONE;
 				break;
 			default:
-				literal_text.append( c );
+				literalText.append( c );
 				i++;
 				state = LITERAL;
 				break;
@@ -116,26 +116,26 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 			switch (c.unicode()) {
 			case '{':
 				/* "${" indicates the start of a new field node, gather for literal too. */
-				literal_text.append( '$' );
+				literalText.append( '$' );
 				i++;
 				state = DONE;
 				break;
 			case '\n':
 				/* Append "$" to literal text, don't gather newline. */
-				literal_text.append( '$' );
+				literalText.append( '$' );
 				i++;
 				state = DONE;
 				break;
 			case 0:
 				/* Append "$" to literal text, don't gather null. */
-				literal_text.append( '$' );
+				literalText.append( '$' );
 				i++;
 				state = DONE;
 				break;
 			default:
 				/* Append "$" to literal text, gather this character too. */
-				literal_text.append( '$' );
-				literal_text.append( c );
+				literalText.append( '$' );
+				literalText.append( c );
 				i+=2;
 				state = LITERAL;
 				break;
@@ -146,7 +146,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 			switch (c.unicode()) {
 			case '{':
 				/* This is probably the begining of a field node, gather for literal too. */
-				literal_text.append( c );
+				literalText.append( c );
 				i++;
 				state = FIELD;
 				break;
@@ -158,7 +158,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 				break;
 			default:
 				/* The "$" was literal. */
-				literal_text.append( c );
+				literalText.append( c );
 				i++;
 				state = LITERAL;
 				break;
@@ -169,7 +169,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 			switch (c.unicode()) {
 			case '}':
 				/* We now finally know that this node is really field node. */
-				field_flag = true;
+				isField = true;
 				i++;
 				state = DONE;
 				break;
@@ -181,8 +181,8 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 				break;
 			default:
 				/* Gather for field name and literal, just in case. */
-				field_name.append( c );
-				literal_text.append( c );
+				fieldName.append( c );
+				literalText.append( c );
 				i++;
 				state = FIELD;
 				break;
@@ -193,10 +193,10 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 
 	}
 
-	mFieldFlag = field_flag;
-	mData      = field_flag ? field_name : literal_text;
+	mIsField = isField;
+	mData    = isField ? fieldName : literalText;
 
-	i_next = i;
+	iNext = i;
 }
 
 
@@ -205,7 +205,7 @@ TextNode::TextNode( const QString &text, int i_start, int &i_next )
 ///
 bool TextNode::operator==( const TextNode& other )
 {
-	return ( (mFieldFlag == other.mFieldFlag) &&
+	return ( (mIsField == other.mIsField) &&
 		 (mData    == other.mData) );
 }
 
@@ -215,17 +215,17 @@ bool TextNode::operator==( const TextNode& other )
 ///
 bool TextNode::operator!=( const TextNode& other )
 {
-	return ( (mFieldFlag != other.mFieldFlag) ||
+	return ( (mIsField != other.mIsField) ||
 		 (mData    != other.mData) );
 }
 
 
 ///
-/// Field Flag Property Getter
+/// isField? Property Getter
 ///
-bool TextNode::fieldFlag( void ) const
+bool TextNode::isField( void ) const
 {
-	return mFieldFlag;
+	return mIsField;
 }
 
 
@@ -238,47 +238,48 @@ const QString& TextNode::data( void ) const
 }
 
 
-#if TODO
-		public string expand( MergeRecord? record )
+///
+/// Get text, expand if necessary
+///
+QString TextNode::text( merge::Record* record ) const
+{
+	if ( mIsField )
 	{
-			if ( field_flag )
+		if ( !record )
 		{
-
-				if ( record == null )
-				{
-					return "${%s}".printf( data );
+			return QString("${%1}").arg( mData );
 		}
 		else
 		{
-					string? text = record.eval_key( data );
-					if ( text != null )
+			if ( record->contains( mData ) )
 			{
-						return text;
+				return (*record)[ mData ];
 			}
 			else
 			{
 				return "";
 			}
 		}
-
 	}
 	else
 	{
-				return data;
+		return mData;
+	}
+}
+
+
+///
+/// Is it an empty field
+///
+bool TextNode::isEmptyField( merge::Record* record ) const
+{
+	if ( record && mIsField )
+	{
+		if ( record->contains( mData ) )
+		{
+			return ( (*record)[mData].isEmpty() );
 		}
 	}
 
-
-		public bool is_empty_field( MergeRecord? record )
-		{
-			if ( (record !=null) && field_flag )
-			{
-				string? text = record.eval_key( data );
-				return ( (text == null) || (text == "") );
-			}
-			else
-			{
 	return false;
-			}
-		}
-#endif
+}

glabels/TextNode.h

@@ -22,6 +22,7 @@
 #define TextNode_h
 
 #include <QString>
+#include "Merge/Record.h"
 
 
 ///
@@ -36,7 +37,7 @@ struct TextNode
 public:
 	TextNode();
 
-	TextNode( bool field_flag, const QString &data );
+	TextNode( bool isField, const QString &data );
 
 	TextNode( const QString &text, int i_start, int &i_next );
 
@@ -55,9 +56,9 @@ public:
 	/////////////////////////////////
 public:
 	//
-	// Field Flag Property
+	// is field? Property
 	//
-	bool fieldFlag( void ) const;
+	bool isField( void ) const;
 
 	//
 	// Data Property
@@ -65,14 +66,11 @@ public:
 	const QString& data( void ) const;
 
 
-
 	/////////////////////////////////
 	// Methods
 	/////////////////////////////////
-#if TODO
-	string expand( MergeRecord? record );
-	bool is_empty_field( MergeRecord? record );
-#endif
+	QString text( merge::Record* record ) const;
+	bool isEmptyField( merge::Record* record ) const;
 
 
 	/////////////////////////////////
@@ -80,7 +78,7 @@ public:
 	/////////////////////////////////
 private:
 
-	bool    mFieldFlag;
+	bool    mIsField;
 	QString mData;
 
 };

glabels/images.qrc

@@ -4,5 +4,6 @@
 <qresource>
 	<file>images/glabels-label-designer.png</file>
 	<file>images/glabels-logo.png</file>
+	<file>images/checkerboard.png</file>
 </qresource>
 </RCC>

glabels/ui/ObjectEditor.ui

@@ -70,7 +70,7 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="notebook">
      <property name="currentIndex">
-      <number>4</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="textPage">
       <attribute name="title">
@@ -759,7 +759,71 @@
        <string>Image</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_13">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox_9">
+         <property name="title">
+          <string>File</string>
+         </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">
+             <widget class="QLineEdit" name="imageFilenameLineEdit">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>231</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+              <property name="placeholderText">
+               <string>None</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -772,60 +836,6 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="0">
-        <widget class="QGroupBox" name="groupBox_9">
-         <property name="title">
-          <string>File</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_12">
-          <item row="0" column="0">
-           <layout class="QFormLayout" name="formLayout_8">
-            <item row="0" column="0">
-             <widget class="QRadioButton" name="imageFileRadio">
-              <property name="text">
-               <string>File:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QPushButton" name="pushButton_17">
-              <property name="text">
-               <string>Placeholder</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QRadioButton" name="imageKeyRadio">
-              <property name="text">
-               <string>Key:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="FieldButton" name="imageFieldButton">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="lineFillPage">
@@ -1857,54 +1867,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>imageFileRadio</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>47</x>
-     <y>118</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>0</x>
-     <y>118</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imageKeyRadio</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>42</x>
-     <y>151</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>0</x>
-     <y>152</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>imageFieldButton</sender>
-   <signal>keySelected()</signal>
-   <receiver>ObjectEditor</receiver>
-   <slot>onChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>180</x>
-     <y>158</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>4</x>
-     <y>203</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>lineWidthSpin</sender>
    <signal>valueChanged(double)</signal>
@@ -2145,6 +2107,38 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>imageFileButton</sender>
+   <signal>clicked()</signal>
+   <receiver>ObjectEditor</receiver>
+   <slot>onImageFileButtonClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>321</x>
+     <y>119</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>394</x>
+     <y>81</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>imageMergeFieldButton</sender>
+   <signal>keySelected()</signal>
+   <receiver>ObjectEditor</receiver>
+   <slot>onImageKeySelected()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>351</x>
+     <y>147</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>7</x>
+     <y>143</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>onChanged()</slot>
@@ -2155,5 +2149,7 @@
   <slot>onRectSizeControlsChanged()</slot>
   <slot>onShadowControlsChanged()</slot>
   <slot>onLineSizeControlsChanged()</slot>
+  <slot>onImageFileButtonClicked()</slot>
+  <slot>onImageKeySelected()</slot>
  </slots>
 </ui>