Finished hooking up barcode style controls in object editor.

glabels/BarcodeBackends.cpp

@@ -29,16 +29,25 @@ namespace glabels
 	//
 	BarcodeBackends::BackendMap BarcodeBackends::mBackendIdMap;
 	BarcodeBackends::BackendMap BarcodeBackends::mBackendNameMap;
-
-	BarcodeBackends::StyleMap BarcodeBackends::mStyleIdMap;
-	BarcodeBackends::StyleMap BarcodeBackends::mStyleNameMap;
-
 	QList<QString> BarcodeBackends::mBackendNameList;
-	QList<QString> BarcodeBackends::mNameList;
 
+	QList<BarcodeStyle> BarcodeBackends::mStyleList;
+	
 
 	BarcodeBackends::BarcodeBackends()
 	{
+		registerStyle( "code39", "", tr("Code 39"),
+		               true, true, true, true, "1234567890", true, 10 );
+
+		registerStyle( "code39ext", "", tr("Code 39 Extended"),
+		               true, true, true, true, "1234567890", true, 10 );
+
+		registerStyle( "upc-a", "", tr("UPC-A"),
+		               true, false, true, false, "12345678901", false, 11 );
+
+		registerStyle( "ean-13", "", tr("EAN-13"),
+		               true, false, true, false, "123456789012", false, 12 );
+
 		registerStyle( "postnet", "", tr("POSTNET (any)"),
 		               false, false, true, false, "12345-6789-12", false, 11 );
 
@@ -57,23 +66,12 @@ namespace glabels
 		registerStyle( "onecode", "", tr("USPS Intelligent Mail"),
 		               false, false, true, false, "12345678901234567890", false, 20 );
 
-		registerStyle( "code39", "", tr("Code 39"),
-		               true, true, true, true, "1234567890", true, 10 );
-
-		registerStyle( "code39ext", "", tr("Code 39 Extended"),
-		               true, true, true, true, "1234567890", true, 10 );
-
-		registerStyle( "upc-A", "", tr("UPC-A"),
-		               true, false, true, false, "12345678901", false, 11 );
-
-		registerStyle( "ean-13", "", tr("EAN-13"),
-		               true, false, true, false, "123456789012", false, 12 );
-
 		registerStyle( "datamatrix", "", tr("DataMatrix"),
 		               false, false, true, false, "1234567890AB", false, 12 );
 
 		registerStyle( "qrcode", "", tr("QRCode"),
 		               false, false, true, false, "1234567890AB", false, 12 );
+
 	}
 
 
@@ -88,65 +86,15 @@ namespace glabels
 	}
 
 
-	QString BarcodeBackends::BackendIdToName( const QString& backendId )
+	const QList<BarcodeStyle>& BarcodeBackends::styleList()
 	{
-		BackendMap::iterator i = mBackendIdMap.find( backendId );
+		return mStyleList;
-		if ( i != mBackendIdMap.end()  )
-		{
-			return i.value();
-		}
-		
-		return "";
 	}
 
 
-	QString BarcodeBackends::BackendNameToId( const QString& backendName )
+	const BarcodeStyle& BarcodeBackends::defaultStyle()
 	{
-		BackendMap::iterator i = mBackendNameMap.find( backendName );
+		return mStyleList[0];
-		if ( i != mBackendNameMap.end()  )
-		{
-			return i.value();
-		}
-		
-		return "";
-	}
-
-
-	const QList<QString>& BarcodeBackends::getBackendNameList()
-	{
-		return mBackendNameList;
-	}
-
-
-	const QList<QString>& BarcodeBackends::getNameList()
-	{
-		return mNameList;
-	}
-
-
-	BarcodeStyle BarcodeBackends::lookupStyleFromId( const QString& id )
-	{
-		StyleMap::iterator i = mStyleIdMap.find( id );
-		if ( i != mStyleIdMap.end()  )
-		{
-			return i.value();
-		}
-		
-		return BarcodeStyle( QString("code39"), QString(""), tr("Code 39"),
-		                     true, true, true, true, QString("1234567890"), true, 10 );
-	}
-
-
-	BarcodeStyle BarcodeBackends::lookupStyleFromName( const QString& name )
-	{
-		StyleMap::iterator i = mStyleNameMap.find( name );
-		if ( i != mStyleNameMap.end()  )
-		{
-			return i.value();
-		}
-		
-		return BarcodeStyle( QString("code39"), QString(""), tr("Code 39"),
-		                     true, true, true, true, QString("1234567890"), true, 10 );
 	}
 
 
@@ -175,11 +123,7 @@ namespace glabels
 		                    QString(defaultDigits),
 		                    canFreeForm, preferedN );
 
-		QString fqName = QString(backendId) + QString(".") + name; // Name may not be unique
+		mStyleList.append( style );
-
-		mNameList.append( name );
-		mStyleIdMap.insert( id, style );
-		mStyleNameMap.insert( fqName, style );
 	}
 
 } // namespace glabels

glabels/BarcodeBackends.h

@@ -54,14 +54,8 @@ namespace glabels
 		// Public Methods
 		/////////////////////////////////
 	public:
-		static QString BackendIdToName( const QString& backendId );
+		static const QList<BarcodeStyle>& styleList();
-		static QString BackendNameToId( const QString& backendName );
+		static const BarcodeStyle& defaultStyle();
-
-		static const QList<QString>& getBackendNameList();
-		static const QList<QString>& getNameList();
-
-		static BarcodeStyle lookupStyleFromId( const QString& id );
-		static BarcodeStyle lookupStyleFromName( const QString& name );
 
 
 		/////////////////////////////////
@@ -88,13 +82,9 @@ namespace glabels
 		typedef QMap<QString,QString> BackendMap;
 		static BackendMap mBackendIdMap;
 		static BackendMap mBackendNameMap;
-
-		typedef QMap<QString,BarcodeStyle> StyleMap;
-		static StyleMap mStyleIdMap;
-		static StyleMap mStyleNameMap;
-
 		static QList<QString> mBackendNameList;
-		static QList<QString> mNameList;
+
+		static QList<BarcodeStyle> mStyleList;
 
 	};
 

glabels/BarcodeMenu.cpp

@@ -23,6 +23,8 @@
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -32,12 +34,11 @@ namespace glabels
 	///
 	BarcodeMenu::BarcodeMenu()
 	{
-		foreach ( QString name, BarcodeBackends::getNameList() )
+		foreach ( const BarcodeStyle& bcStyle, BarcodeBackends::styleList() )
 		{
-			BarcodeStyle bcStyle = BarcodeBackends::lookupStyleFromName( name );
-
 			BarcodeMenuItem* bcMenuItem = new BarcodeMenuItem( bcStyle );
-			connect( bcMenuItem, SIGNAL(activated()), this, SLOT(onMenuItemActivated) );
+			connect( bcMenuItem, SIGNAL(activated(const BarcodeStyle&)),
+			         this, SLOT(onMenuItemActivated(const BarcodeStyle&)) );
 
 			addAction( bcMenuItem );
 		}
@@ -56,11 +57,11 @@ namespace glabels
 	///
 	/// onMenuItemActivated slot
 	///
-	void BarcodeMenu::onMenuItemActivated( BarcodeStyle bcStyle )
+	void BarcodeMenu::onMenuItemActivated( const BarcodeStyle& bcStyle )
 	{
 		mBcStyle = bcStyle;
 
-		emit styleChanged();
+		emit selectionChanged();
 	}
 
 } // namespace glabels

glabels/BarcodeMenu.h

@@ -48,7 +48,7 @@ namespace glabels
 		// Signals
 		/////////////////////////////////
 	signals:
-		void styleChanged();
+		void selectionChanged();
 
 
 		/////////////////////////////////
@@ -62,7 +62,7 @@ namespace glabels
 		// Slots
 		/////////////////////////////////
 	private slots:
-		void onMenuItemActivated( BarcodeStyle bcStyle );
+		void onMenuItemActivated( const BarcodeStyle& bcStyle );
 
 
 		/////////////////////////////////

glabels/BarcodeMenuButton.cpp

@@ -23,6 +23,8 @@
 #include "BarcodeBackends.h"
 #include "BarcodeMenuItem.h"
 
+#include <QtDebug>
+
 
 namespace glabels
 {
@@ -36,10 +38,10 @@ namespace glabels
 		mMenu = new BarcodeMenu();
 		setMenu( mMenu );
 
-		mBcStyle = BarcodeBackends::lookupStyleFromId( "" ); // Default style
+		mBcStyle = BarcodeBackends::defaultStyle();
 		setText( mBcStyle.name() );
 
-		connect( mMenu, SIGNAL(styleChanged()), this, SLOT(onMenuStyleChanged()) );
+		connect( mMenu, SIGNAL(selectionChanged()), this, SLOT(onMenuSelectionChanged()) );
 	}
 
 
@@ -52,15 +54,25 @@ namespace glabels
 	}
 
 
+	///
+	/// bcStyle setter
+	///
+	void BarcodeMenuButton::setBcStyle( const BarcodeStyle& bcStyle )
+	{
+		mBcStyle = bcStyle;
+		setText( mBcStyle.name() );
+	}
+
+
 	///
 	/// onMenuStyleChanged slot
 	///
-	void BarcodeMenuButton::onMenuStyleChanged()
+	void BarcodeMenuButton::onMenuSelectionChanged()
 	{
 		mBcStyle = mMenu->bcStyle();
 		setText( mBcStyle.name() );
 
-		emit styleChanged();
+		emit selectionChanged();
 	}
 
 } // namespace glabels

glabels/BarcodeMenuButton.h

@@ -49,7 +49,7 @@ namespace glabels
 		// Signals
 		/////////////////////////////////
 	signals:
-		void styleChanged();
+		void selectionChanged();
 
 
 		/////////////////////////////////
@@ -57,13 +57,14 @@ namespace glabels
 		/////////////////////////////////
 	public:
 		BarcodeStyle bcStyle() const;
+		void setBcStyle( const BarcodeStyle& bcStyle );
 
 
 		/////////////////////////////////
 		// Slots
 		/////////////////////////////////
 	private slots:
-		void onMenuStyleChanged();
+		void onMenuSelectionChanged();
 
 
 		/////////////////////////////////

glabels/BarcodeMenuItem.cpp

@@ -20,6 +20,8 @@
 
 #include "BarcodeMenuItem.h"
 
+#include <QtDebug>
+
 
 namespace glabels
 {

glabels/LabelModelBarcodeObject.cpp

@@ -44,6 +44,8 @@ namespace glabels
 	{
 		const QColor emptyFillColor = QColor( 128, 128, 128, 128 );
 		const Distance pad = Distance::pt(4);
+		const Distance minW = Distance::pt(18);
+		const Distance minH = Distance::pt(18);
 	}
 
 
@@ -63,7 +65,7 @@ namespace glabels
 		mHandles << new HandleSouthWest( this );
 		mHandles << new HandleWest( this );
 
-		mBcStyle        = BarcodeBackends::lookupStyleFromId( "code39" );
+		mBcStyle        = BarcodeBackends::defaultStyle();
 		mBcTextFlag     = mBcStyle.canText();
 		mBcChecksumFlag = mBcStyle.canChecksum();
 		mBcFormatDigits = mBcStyle.preferedN();
@@ -315,6 +317,12 @@ namespace glabels
 			delete mEditorBarcode;
 		}
 		mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
+		if ( !mEditorBarcode )
+		{
+			qWarning() << "Invalid barcode style" << mBcStyle.id() << "using \"code39\".";
+			mBcStyle = BarcodeBackends::defaultStyle();
+			mEditorBarcode = glbarcode::Factory::createBarcode( mBcStyle.id().toStdString() );
+		}
 		mEditorBarcode->setChecksum(mBcChecksumFlag);
 		mEditorBarcode->setShowText(mBcTextFlag);
 
@@ -325,6 +333,11 @@ namespace glabels
 			mW = Distance::pt( mEditorBarcode->width() );
 			mH = Distance::pt( mEditorBarcode->height() );
 		}
+		else
+		{
+			mW = max( mW, minW );
+			mH = max( mH, minH );
+		}
 
 		QPainterPath path;
 		path.addRect( 0, 0, mW.pt(), mH.pt() );

glabels/ObjectEditor.cpp

@@ -249,8 +249,24 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			barcodeShowTextCheck->setChecked( mObject->bcTextFlag() );
+			BarcodeStyle bcStyle = mObject->bcStyle();
-			barcodeChecksumCheck->setChecked( mObject->bcChecksumFlag() );
+
+			barcodeShowTextCheck->setEnabled( bcStyle.textOptional() );
+			barcodeChecksumCheck->setEnabled( bcStyle.checksumOptional() );
+
+			// May need to adjust current text flag, if style changed
+			bool textFlag = (mObject->bcTextFlag() && bcStyle.canText())
+				||  (bcStyle.canText() && !bcStyle.textOptional());
+			mObject->setBcTextFlag( textFlag );
+
+			// May need to adjust current checksum flag, if style changed
+			bool csFlag = (mObject->bcChecksumFlag() && bcStyle.canChecksum())
+				||  (bcStyle.canChecksum() && !bcStyle.checksumOptional());
+			mObject->setBcChecksumFlag( csFlag );
+
+			barcodeStyleButton->setBcStyle( bcStyle );
+			barcodeShowTextCheck->setChecked( textFlag );
+			barcodeChecksumCheck->setChecked( csFlag );
 			barcodeColorButton->setColorNode( mObject->bcColorNode() );
 			barcodeDataEdit->setText( mObject->bcData() );
 
@@ -702,8 +718,24 @@ namespace glabels
 		{
 			mBlocked = true;
 
-			mObject->setBcTextFlag( barcodeShowTextCheck->isChecked() );
+			BarcodeStyle bcStyle = barcodeStyleButton->bcStyle();
-			mObject->setBcChecksumFlag( barcodeChecksumCheck->isChecked() );
+
+			barcodeShowTextCheck->setEnabled( bcStyle.textOptional() );
+			barcodeChecksumCheck->setEnabled( bcStyle.checksumOptional() );
+
+			// May need to adjust current text flag, if style changed
+			bool textFlag = (barcodeShowTextCheck->isChecked() && bcStyle.canText())
+				||  (bcStyle.canText() && !bcStyle.textOptional());
+			barcodeShowTextCheck->setChecked( textFlag );
+
+			// May need to adjust current checksum flag, if style changed
+			bool csFlag = (barcodeChecksumCheck->isChecked() && bcStyle.canChecksum())
+				||  (bcStyle.canChecksum() && !bcStyle.checksumOptional());
+			barcodeChecksumCheck->setChecked( csFlag );
+
+			mObject->setBcStyle( bcStyle );
+			mObject->setBcTextFlag( textFlag );
+			mObject->setBcChecksumFlag( csFlag );
 			mObject->setBcColorNode( barcodeColorButton->colorNode() );
 			mObject->setBcData( barcodeDataEdit->toPlainText() );
 

glabels/glabels_main.cpp

@@ -18,6 +18,7 @@
  *  along with gLabels-qt.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "BarcodeBackends.h"
 #include "FileUtil.h"
 #include "Db.h"
 #include "LabelModel.h"
@@ -89,6 +90,7 @@ int main( int argc, char **argv )
 	glabels::Settings::init();
 	glabels::Db::init();
 	glabels::merge::Factory::init();
+	glabels::BarcodeBackends::init();
 
 	
 	//

glabels/ui/ObjectEditor.ui

@@ -562,9 +562,6 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="QComboBox" name="barcodeTypeCombo"/>
-            </item>
             <item row="1" column="1">
              <widget class="QCheckBox" name="barcodeShowTextCheck">
               <property name="text">
@@ -610,6 +607,9 @@
               </item>
              </layout>
             </item>
+            <item row="0" column="1">
+             <widget class="glabels::BarcodeMenuButton" name="barcodeStyleButton"/>
+            </item>
            </layout>
           </item>
           <item row="0" column="1">
@@ -1489,6 +1489,14 @@
     <signal>keySelected(QString)</signal>
    </slots>
   </customwidget>
+  <customwidget>
+   <class>glabels::BarcodeMenuButton</class>
+   <extends>QPushButton</extends>
+   <header>BarcodeMenuButton.h</header>
+   <slots>
+    <signal>selectionChanged()</signal>
+   </slots>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>
@@ -2006,22 +2014,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>barcodeTypeCombo</sender>
-   <signal>textChanged(QString)</signal>
-   <receiver>ObjectEditor</receiver>
-   <slot>onBarcodeControlsChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>102</x>
-     <y>116</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>399</x>
-     <y>144</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>barcodeShowTextCheck</sender>
    <signal>toggled(bool)</signal>
@@ -2102,6 +2094,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>barcodeStyleButton</sender>
+   <signal>selectionChanged()</signal>
+   <receiver>ObjectEditor</receiver>
+   <slot>onBarcodeControlsChanged()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>114</x>
+     <y>121</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>5</x>
+     <y>94</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>onChanged()</slot>

translations/glabels_C.ts

@@ -204,7 +204,7 @@
     </message>
     <message>
         <location filename="../glabels/ui/ObjectEditor.ui" line="392"/>
-        <location filename="../glabels/ui/ObjectEditor.ui" line="585"/>
+        <location filename="../glabels/ui/ObjectEditor.ui" line="582"/>
         <location filename="../glabels/ui/ObjectEditor.ui" line="822"/>
         <location filename="../glabels/ui/ObjectEditor.ui" line="914"/>
         <location filename="../glabels/ui/ObjectEditor.ui" line="1351"/>
@@ -232,12 +232,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ui/ObjectEditor.ui" line="571"/>
+        <location filename="../glabels/ui/ObjectEditor.ui" line="568"/>
         <source>Show text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ui/ObjectEditor.ui" line="578"/>
+        <location filename="../glabels/ui/ObjectEditor.ui" line="575"/>
         <source>Checksum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -744,64 +744,62 @@
 <context>
     <name>glabels::BarcodeBackends</name>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="42"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="51"/>
         <source>POSTNET (any)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="45"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="54"/>
         <source>POSTNET-5 (ZIP only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="48"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="57"/>
         <source>POSTNET-9 (ZIP+4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="51"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="60"/>
         <source>POSTNET-11 (DPBC)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="54"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="63"/>
         <source>CEPNET</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="57"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="66"/>
         <source>USPS Intelligent Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="60"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="39"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="135"/>
-        <location filename="../glabels/BarcodeBackends.cpp" line="148"/>
         <source>Code 39</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="63"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="42"/>
         <source>Code 39 Extended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="66"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="45"/>
         <source>UPC-A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="69"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="48"/>
         <source>EAN-13</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="72"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="69"/>
         <source>DataMatrix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/BarcodeBackends.cpp" line="75"/>
+        <location filename="../glabels/BarcodeBackends.cpp" line="72"/>
         <source>QRCode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1117,12 +1115,12 @@
 <context>
     <name>glabels::LabelModelBarcodeObject</name>
     <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="353"/>
+        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="366"/>
         <source>No barcode data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="361"/>
+        <location filename="../glabels/LabelModelBarcodeObject.cpp" line="374"/>
         <source>Invalid barcode data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1800,134 +1798,134 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="335"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="351"/>
         <source>Box object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="356"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="372"/>
         <source>Ellipse object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="377"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="393"/>
         <source>Image object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="397"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="413"/>
         <source>Line object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="418"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="434"/>
         <source>Text object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="437"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="453"/>
         <source>Barcode object properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="522"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="538"/>
         <source>Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="538"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="554"/>
         <source>Fill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="561"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="577"/>
         <source>Image files (*.png *.jpg *.jpeg *.gif *.bmp *.pbm *.pgm *.ppm *.xbm *.xpm *.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="562"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="578"/>
         <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="563"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="579"/>
         <source>PNG - Portable Network Graphics (*.png)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="564"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="580"/>
         <source>BMP - Windows Bitmap (*.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="565"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="581"/>
         <source>GIF - Graphics Interchange Format (*.gif)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="566"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="582"/>
         <source>JPEG - Joint Photographic Experts Group (*.jpg *.jpeg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="567"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="583"/>
         <source>PBM - Portable Bitmap (*.pbm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="568"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="584"/>
         <source>PGM - Portable Graymap (*.pgm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="569"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="585"/>
         <source>PPM - Portable Pixmap (*.ppm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="570"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="586"/>
         <source>SVG - Scalable Vector Graphics (*.svg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="571"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="587"/>
         <source>XBM - X11 Bitmap (*.xbm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="572"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="588"/>
         <source>XPM - X11 Pixmap (*.xpm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="576"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="592"/>
         <source>gLabels - Select image file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="581"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="597"/>
-        <location filename="../glabels/ObjectEditor.cpp" line="593"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="609"/>
         <source>Set image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="604"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="620"/>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="622"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="638"/>
-        <location filename="../glabels/ObjectEditor.cpp" line="656"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="672"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="675"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="691"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/ObjectEditor.cpp" line="733"/>
+        <location filename="../glabels/ObjectEditor.cpp" line="765"/>
         <source>Shadow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1974,12 +1972,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../glabels/glabels_main.cpp" line="78"/>
+        <location filename="../glabels/glabels_main.cpp" line="79"/>
         <source>gLabels Label Designer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/glabels_main.cpp" line="82"/>
+        <location filename="../glabels/glabels_main.cpp" line="83"/>
         <source>gLabels project files to open, optionally.</source>
         <translation type="unfinished"></translation>
     </message>