started doxygen documentation
authorinsilmaril
Wed Apr 25 16:02:54 2007 +0000 (2007-04-25)
changeset 462494a5b8c131e
parent 461 b0d72eb511c9
child 463 694f5e35e87c
started doxygen documentation
branchobj.cpp
branchobj.h
branchpropwindow.cpp
branchpropwindow.h
branchpropwindow.ui
     1.1 --- a/branchobj.cpp	Wed Apr 25 16:02:54 2007 +0000
     1.2 +++ b/branchobj.cpp	Wed Apr 25 16:02:54 2007 +0000
     1.3 @@ -16,11 +16,6 @@
     1.4  BranchObj* BranchObj::itFirst=NULL;
     1.5  
     1.6  
     1.7 -HeadingObj* BranchObj::getHO()  //FIXME testing only
     1.8 -{
     1.9 -	return heading;
    1.10 -}
    1.11 -
    1.12  BranchObj::BranchObj () :OrnamentedObj()
    1.13  {
    1.14  //    cout << "Const BranchObj ()\n";
    1.15 @@ -232,7 +227,7 @@
    1.16  				// Don't try to find that branch, guess 12 pixels
    1.17  				y=o->getChildPos().y()  -height() + 12; 
    1.18  		}	
    1.19 -		if (o->getOrientation()==OrientLeftOfCenter)
    1.20 +		if (o->getOrientation()==LinkableMapObj::LeftOfCenter)
    1.21  			move ( o->getChildPos().x() - linkwidth, y );
    1.22  		else	
    1.23  			move (o->getChildPos().x() + linkwidth, y );
    1.24 @@ -627,7 +622,7 @@
    1.25  				}		
    1.26  				if (includeImagesHor)
    1.27  				{
    1.28 -					if (orientation==OrientRightOfCenter)
    1.29 +					if (orientation==LinkableMapObj::RightOfCenter)
    1.30  					{
    1.31  						if (-rp.x()-w > 0) 
    1.32  							leftPad=max (leftPad,-rp.x()-w);
    1.33 @@ -648,8 +643,8 @@
    1.34  	}
    1.35  
    1.36  	// Frame thickness
    1.37 -    w+=frame->getBorder();
    1.38 -    h+=frame->getBorder();
    1.39 +    w+=frame->getPadding();
    1.40 +    h+=frame->getPadding();
    1.41  	
    1.42  	// Finally set size
    1.43      bbox.setSize (QSizeF (w,h));
    1.44 @@ -658,7 +653,7 @@
    1.45  void BranchObj::setDockPos()
    1.46  {
    1.47  	// Sets childpos and parpos depending on orientation
    1.48 -	if (getOrientation()==OrientLeftOfCenter )
    1.49 +	if (getOrientation()==LinkableMapObj::LeftOfCenter )
    1.50      {
    1.51  		childPos=QPointF (
    1.52  			ornamentsBBox.bottomLeft().x(), 
    1.53 @@ -791,7 +786,7 @@
    1.54  		attribut ("textColor",QColor(heading->getColor()).name()));
    1.55  
    1.56  	// Save frame
    1.57 -	if (frame->getFrameType()!=NoFrame) 
    1.58 +	if (frame->getFrameType()!=FrameObj::NoFrame) 
    1.59  		s+=frame->saveToDir ();
    1.60  
    1.61  	// save names of flags set
    1.62 @@ -1288,14 +1283,14 @@
    1.63      {
    1.64  		// Align myself depending on orientation and parent, but
    1.65  		// only if I am not a mainbranch or mapcenter itself
    1.66 -		LinkOrient o;
    1.67 +		LinkableMapObj::Orientation o;
    1.68  		o=parObj->getOrientation();
    1.69  		switch (orientation) 
    1.70  		{
    1.71 -			case OrientLeftOfCenter:
    1.72 +			case LinkableMapObj::LeftOfCenter:
    1.73  				move (ref.x() - bbox.width(), ref.y() + (th-bbox.height())/2 );
    1.74  			break;
    1.75 -			case OrientRightOfCenter:	
    1.76 +			case LinkableMapObj::RightOfCenter:	
    1.77  				move (ref.x() , ref.y() + (th-bbox.height())/2  );
    1.78  			break;
    1.79  			default:
    1.80 @@ -1308,7 +1303,7 @@
    1.81  
    1.82      // Set reference point for alignment of childs
    1.83      QPointF ref2;
    1.84 -    if (orientation==OrientLeftOfCenter)
    1.85 +    if (orientation==LinkableMapObj::LeftOfCenter)
    1.86  		ref2.setX(bbox.topLeft().x() - linkwidth);
    1.87      else	
    1.88  		ref2.setX(bbox.topRight().x() + linkwidth);
    1.89 @@ -1526,3 +1521,10 @@
    1.90  	return s;
    1.91  }
    1.92  
    1.93 +
    1.94 +void BranchObj::animate()
    1.95 +{
    1.96 +	//relPos.animate();
    1.97 +	cout << "BO::animate  x,y="<<relPos.x()<<","<<relPos.y()<<endl;
    1.98 +}
    1.99 +
     2.1 --- a/branchobj.h	Wed Apr 25 16:02:54 2007 +0000
     2.2 +++ b/branchobj.h	Wed Apr 25 16:02:54 2007 +0000
     2.3 @@ -7,15 +7,19 @@
     2.4  #include "xlinkobj.h"
     2.5  
     2.6  
     2.7 -enum BranchModification {NewBranch, MovedBranch};
     2.8 -enum HideTmpMode {HideNone, HideExport};
     2.9 +bool isAbove(BranchObj*,BranchObj*);
    2.10  
    2.11 -bool isAbove(BranchObj*,BranchObj*);
    2.12 +/*! \brief A branch visible in the map */
    2.13  
    2.14  /////////////////////////////////////////////////////////////////////////////
    2.15  class BranchObj:public OrnamentedObj {
    2.16  public:
    2.17 -	HeadingObj* getHO();	//FIXME testing
    2.18 +	/*! New branches will get use same color for heading as parent */
    2.19 +	enum BranchModification {NewBranch, MovedBranch};
    2.20 +
    2.21 +	/*! If HideExport is used, this branch and its childs will be hidden in export */
    2.22 +	enum HideTmpMode {HideNone, HideExport};
    2.23 +
    2.24      BranchObj ();
    2.25      BranchObj (QGraphicsScene*);
    2.26      BranchObj (QGraphicsScene*, LinkableMapObj* parent);
    2.27 @@ -119,6 +123,7 @@
    2.28      virtual void select();
    2.29      virtual void unselect();
    2.30  	virtual QString getSelectString();
    2.31 +	virtual void animate();
    2.32  
    2.33  protected:
    2.34  	static BranchObj* itLast;		// iterator for first(), next()
     3.1 --- a/branchpropwindow.cpp	Wed Apr 25 16:02:54 2007 +0000
     3.2 +++ b/branchpropwindow.cpp	Wed Apr 25 16:02:54 2007 +0000
     3.3 @@ -3,7 +3,9 @@
     3.4  #include <QColorDialog>
     3.5  
     3.6  #include "frameobj.h"
     3.7 +#include "settings.h"
     3.8  
     3.9 +extern Settings settings;
    3.10  
    3.11  BranchPropertyWindow::BranchPropertyWindow (QWidget *parent):QDialog(parent)
    3.12  {
    3.13 @@ -20,36 +22,33 @@
    3.14      pix.fill (penColor);
    3.15  	ui.framePenColorButton->setPixmap (pix);
    3.16  	ui.frameBrushColorButton->setPixmap (pix);
    3.17 +}
    3.18  
    3.19 -	connect ( 
    3.20 -		ui.framePenColorButton, SIGNAL (clicked()), 
    3.21 -		this, SLOT (framePenColorClicked()));
    3.22 -	connect ( 
    3.23 -		ui.frameBrushColorButton, SIGNAL (clicked()), 
    3.24 -		this, SLOT (frameBrushColorClicked()));
    3.25 -	connect ( 
    3.26 -		ui.frameTypeCombo, SIGNAL (currentIndexChanged( int)), 
    3.27 -		this, SLOT (frameTypeChanged (int)));
    3.28 -	connect ( 
    3.29 -		ui.hideLinkIfUnselected, SIGNAL (stateChanged( int)), 
    3.30 -		this, SLOT (linkHideUnselectedChanged (int)));
    3.31 +BranchPropertyWindow::~BranchPropertyWindow ()
    3.32 +{
    3.33 +	settings.setValue( "/branchpropertywindow/geometry/size", size() );
    3.34 +	settings.setValue( "/branchpropertywindow/geometry/pos", pos() );
    3.35 +	//settings.setValue( "/branchpropertywindow/showWithMain",showWithMain());	//FIXME add this!
    3.36  }
    3.37  
    3.38  void BranchPropertyWindow::setBranch (BranchObj *bo)
    3.39  {
    3.40 +	disconnectSignals();
    3.41  	branch=bo;
    3.42  	if (bo) 
    3.43  	{
    3.44  		ui.tabWidget->setEnabled (true);
    3.45  
    3.46  		// Frame
    3.47 -		FrameType t=branch->getFrameType();
    3.48 -		if (t==NoFrame)
    3.49 +		FrameObj::FrameType t=branch->getFrameType();
    3.50 +		if (t==FrameObj::NoFrame)
    3.51  		{
    3.52  			ui.frameTypeCombo->setCurrentIndex (0);
    3.53  			penColor=Qt::white;
    3.54  			brushColor=Qt::white;
    3.55  			ui.colorGroupBox->setEnabled (false);
    3.56 +			ui.framePaddingSpinBox->setEnabled (false);
    3.57 +			ui.frameWidthSpinBox->setEnabled (false);
    3.58  		} else	
    3.59  		{
    3.60  			penColor=bo->getFramePenColor();
    3.61 @@ -60,13 +59,17 @@
    3.62  			pix.fill (brushColor);
    3.63  			ui.frameBrushColorButton->setPixmap (pix);
    3.64  			ui.colorGroupBox->setEnabled (true);
    3.65 +			ui.framePaddingSpinBox->setEnabled (true);
    3.66 +			ui.framePaddingSpinBox->setValue (bo->getFramePadding());
    3.67 +			ui.frameWidthSpinBox->setEnabled (true);
    3.68 +			ui.frameWidthSpinBox->setValue (bo->getFrameBorderWidth());
    3.69  
    3.70  			switch (t)
    3.71  			{
    3.72 -				case Rectangle: 
    3.73 +				case FrameObj::Rectangle: 
    3.74  					ui.frameTypeCombo->setCurrentIndex (1);
    3.75  					break;
    3.76 -				case Ellipse: 
    3.77 +				case FrameObj::Ellipse: 
    3.78  					ui.frameTypeCombo->setCurrentIndex (2);
    3.79  					break;
    3.80  				default: 
    3.81 @@ -79,6 +82,19 @@
    3.82  			ui.hideLinkIfUnselected->setCheckState (Qt::Checked);
    3.83  		else	
    3.84  			ui.hideLinkIfUnselected->setCheckState (Qt::Unchecked);
    3.85 +
    3.86 +		// Layout
    3.87 +		if (branch->getIncludeImagesVer())
    3.88 +			ui.incImgVer->setCheckState (Qt::Checked);
    3.89 +		else	
    3.90 +			ui.incImgVer->setCheckState (Qt::Unchecked);
    3.91 +		if (branch->getIncludeImagesHor())
    3.92 +			ui.incImgHor->setCheckState (Qt::Checked);
    3.93 +		else	
    3.94 +			ui.incImgHor->setCheckState (Qt::Unchecked);
    3.95 +
    3.96 +		// Finally activate signals
    3.97 +		connectSignals();
    3.98  	} else
    3.99  	{
   3.100  		ui.tabWidget->setEnabled (false);
   3.101 @@ -100,9 +116,9 @@
   3.102  	if (mapEditor)
   3.103  		switch (i)
   3.104  		{
   3.105 -			case 0: mapEditor->setFrameType (NoFrame); break;
   3.106 -			case 1: mapEditor->setFrameType (Rectangle); break;
   3.107 -			case 2: mapEditor->setFrameType (Ellipse); break;
   3.108 +			case 0: mapEditor->setFrameType (FrameObj::NoFrame); break;
   3.109 +			case 1: mapEditor->setFrameType (FrameObj::Rectangle); break;
   3.110 +			case 2: mapEditor->setFrameType (FrameObj::Ellipse); break;
   3.111  		}
   3.112  }
   3.113  
   3.114 @@ -132,9 +148,82 @@
   3.115  	}	
   3.116  }
   3.117  
   3.118 +void BranchPropertyWindow::framePaddingChanged(int i)
   3.119 +{
   3.120 +	if (mapEditor) mapEditor->setFramePadding (i);
   3.121 +}
   3.122 +
   3.123 +void BranchPropertyWindow::frameBorderWidthChanged(int i)
   3.124 +{
   3.125 +	if (mapEditor) mapEditor->setFrameBorderWidth(i);
   3.126 +}
   3.127 +
   3.128  void BranchPropertyWindow::linkHideUnselectedChanged (int i)
   3.129  {
   3.130  	if (!branch) return;
   3.131 -	branch->setHideLinkUnselected(i);
   3.132 +	mapEditor->setHideLinkUnselected(i);
   3.133  }
   3.134  
   3.135 +void BranchPropertyWindow::incImgVerChanged (int  i)
   3.136 +{
   3.137 +	if (mapEditor) mapEditor->setIncludeImagesVer (i);
   3.138 +}
   3.139 +
   3.140 +void BranchPropertyWindow::incImgHorChanged (int  i)
   3.141 +{
   3.142 +	if (mapEditor) mapEditor->setIncludeImagesHor (i);
   3.143 +}
   3.144 +
   3.145 +void BranchPropertyWindow::connectSignals()
   3.146 +{
   3.147 +	// Frame
   3.148 +	connect ( 
   3.149 +		ui.framePenColorButton, SIGNAL (clicked()), 
   3.150 +		this, SLOT (framePenColorClicked()));
   3.151 +	connect ( 
   3.152 +		ui.framePaddingSpinBox, SIGNAL (valueChanged( int)), 
   3.153 +		this, SLOT (framePaddingChanged (int)));
   3.154 +	connect ( 
   3.155 +		ui.frameWidthSpinBox, SIGNAL (valueChanged( int)), 
   3.156 +		this, SLOT (frameBorderWidthChanged (int)));
   3.157 +	connect ( 
   3.158 +		ui.frameBrushColorButton, SIGNAL (clicked()), 
   3.159 +		this, SLOT (frameBrushColorClicked()));
   3.160 +	connect ( 
   3.161 +		ui.frameTypeCombo, SIGNAL (currentIndexChanged( int)), 
   3.162 +		this, SLOT (frameTypeChanged (int)));
   3.163 +
   3.164 +
   3.165 +	// Link	
   3.166 +	connect ( 
   3.167 +		ui.hideLinkIfUnselected, SIGNAL (stateChanged( int)), 
   3.168 +		this, SLOT (linkHideUnselectedChanged (int)));
   3.169 +
   3.170 +	// Layout	
   3.171 +	connect ( 
   3.172 +		ui.incImgVer, SIGNAL (stateChanged( int)), 
   3.173 +		this, SLOT (incImgVerChanged (int)));
   3.174 +	connect ( 
   3.175 +		ui.incImgHor, SIGNAL (stateChanged( int)), 
   3.176 +		this, SLOT (incImgHorChanged (int)));
   3.177 +}
   3.178 +
   3.179 +
   3.180 +void BranchPropertyWindow::disconnectSignals()
   3.181 +{
   3.182 +	// Frame
   3.183 +	disconnect ( ui.frameTypeCombo, 0,0,0);
   3.184 +	disconnect ( ui.framePenColorButton, 0,0,0);
   3.185 +	disconnect ( ui.framePaddingSpinBox, 0,0,0);
   3.186 +	disconnect ( ui.frameWidthSpinBox, 0,0,0);
   3.187 +	disconnect ( ui.frameBrushColorButton, 0,0,0);
   3.188 +
   3.189 +	// Link	
   3.190 +	disconnect ( ui.hideLinkIfUnselected, 0,0,0);
   3.191 +
   3.192 +	// Layout	
   3.193 +	disconnect ( ui.incImgVer, 0,0,0);
   3.194 +	disconnect ( ui.incImgHor, 0,0,0);
   3.195 +}
   3.196 +
   3.197 +
     4.1 --- a/branchpropwindow.h	Wed Apr 25 16:02:54 2007 +0000
     4.2 +++ b/branchpropwindow.h	Wed Apr 25 16:02:54 2007 +0000
     4.3 @@ -11,6 +11,7 @@
     4.4  	Q_OBJECT
     4.5  public:
     4.6  	BranchPropertyWindow (QWidget *parent=0);
     4.7 +	~BranchPropertyWindow ();
     4.8  	void setBranch (BranchObj *);
     4.9  	void setMapEditor (MapEditor *);
    4.10  
    4.11 @@ -18,15 +19,22 @@
    4.12  	void frameTypeChanged (int);
    4.13  	void framePenColorClicked ();
    4.14  	void frameBrushColorClicked ();
    4.15 +	void framePaddingChanged(int);
    4.16 +	void frameBorderWidthChanged(int);
    4.17  	void linkHideUnselectedChanged (int);
    4.18 +	void incImgVerChanged (int);
    4.19 +	void incImgHorChanged (int);
    4.20  
    4.21  private:
    4.22 +	void connectSignals();
    4.23 +	void disconnectSignals();
    4.24 +	
    4.25  	Ui::BranchPropertyWindow ui;
    4.26  
    4.27  	BranchObj *branch;
    4.28  	MapEditor *mapEditor;
    4.29  
    4.30 -	QColor penColor;	// FIXME replace this with Palette
    4.31 +	QColor penColor;
    4.32  	QColor brushColor;
    4.33  };
    4.34  
     5.1 --- a/branchpropwindow.ui	Wed Apr 25 16:02:54 2007 +0000
     5.2 +++ b/branchpropwindow.ui	Wed Apr 25 16:02:54 2007 +0000
     5.3 @@ -5,20 +5,14 @@
     5.4     <rect>
     5.5      <x>0</x>
     5.6      <y>0</y>
     5.7 -    <width>395</width>
     5.8 -    <height>282</height>
     5.9 +    <width>255</width>
    5.10 +    <height>327</height>
    5.11     </rect>
    5.12    </property>
    5.13    <property name="windowTitle" >
    5.14     <string>Branch Property Editor</string>
    5.15    </property>
    5.16    <layout class="QVBoxLayout" >
    5.17 -   <property name="margin" >
    5.18 -    <number>9</number>
    5.19 -   </property>
    5.20 -   <property name="spacing" >
    5.21 -    <number>6</number>
    5.22 -   </property>
    5.23     <item>
    5.24      <widget class="QTabWidget" name="tabWidget" >
    5.25       <property name="currentIndex" >
    5.26 @@ -29,45 +23,120 @@
    5.27         <string>Frame</string>
    5.28        </attribute>
    5.29        <layout class="QVBoxLayout" >
    5.30 -       <property name="margin" >
    5.31 -        <number>9</number>
    5.32 -       </property>
    5.33         <property name="spacing" >
    5.34          <number>6</number>
    5.35         </property>
    5.36 +       <property name="leftMargin" >
    5.37 +        <number>9</number>
    5.38 +       </property>
    5.39 +       <property name="topMargin" >
    5.40 +        <number>9</number>
    5.41 +       </property>
    5.42 +       <property name="rightMargin" >
    5.43 +        <number>9</number>
    5.44 +       </property>
    5.45 +       <property name="bottomMargin" >
    5.46 +        <number>9</number>
    5.47 +       </property>
    5.48 +       <item>
    5.49 +        <widget class="QGroupBox" name="groupBox" >
    5.50 +         <property name="title" >
    5.51 +          <string>Geometry</string>
    5.52 +         </property>
    5.53 +         <layout class="QGridLayout" >
    5.54 +          <item row="0" column="0" colspan="4" >
    5.55 +           <widget class="QComboBox" name="frameTypeCombo" >
    5.56 +            <property name="sizePolicy" >
    5.57 +             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
    5.58 +              <horstretch>0</horstretch>
    5.59 +              <verstretch>0</verstretch>
    5.60 +             </sizepolicy>
    5.61 +            </property>
    5.62 +            <item>
    5.63 +             <property name="text" >
    5.64 +              <string>No Frame</string>
    5.65 +             </property>
    5.66 +            </item>
    5.67 +            <item>
    5.68 +             <property name="text" >
    5.69 +              <string>Rectangle</string>
    5.70 +             </property>
    5.71 +            </item>
    5.72 +            <item>
    5.73 +             <property name="text" >
    5.74 +              <string>Ellipse</string>
    5.75 +             </property>
    5.76 +            </item>
    5.77 +           </widget>
    5.78 +          </item>
    5.79 +          <item row="1" column="3" >
    5.80 +           <spacer>
    5.81 +            <property name="orientation" >
    5.82 +             <enum>Qt::Horizontal</enum>
    5.83 +            </property>
    5.84 +            <property name="sizeHint" >
    5.85 +             <size>
    5.86 +              <width>40</width>
    5.87 +              <height>20</height>
    5.88 +             </size>
    5.89 +            </property>
    5.90 +           </spacer>
    5.91 +          </item>
    5.92 +          <item row="1" column="1" colspan="2" >
    5.93 +           <widget class="QLabel" name="label_3" >
    5.94 +            <property name="text" >
    5.95 +             <string>Padding</string>
    5.96 +            </property>
    5.97 +           </widget>
    5.98 +          </item>
    5.99 +          <item row="2" column="1" colspan="2" >
   5.100 +           <widget class="QLabel" name="label_4" >
   5.101 +            <property name="text" >
   5.102 +             <string>Borderline width</string>
   5.103 +            </property>
   5.104 +           </widget>
   5.105 +          </item>
   5.106 +          <item row="1" column="0" >
   5.107 +           <widget class="QSpinBox" name="framePaddingSpinBox" >
   5.108 +            <property name="maximum" >
   5.109 +             <number>50</number>
   5.110 +            </property>
   5.111 +           </widget>
   5.112 +          </item>
   5.113 +          <item row="2" column="0" >
   5.114 +           <widget class="QSpinBox" name="frameWidthSpinBox" >
   5.115 +            <property name="minimum" >
   5.116 +             <number>1</number>
   5.117 +            </property>
   5.118 +            <property name="maximum" >
   5.119 +             <number>20</number>
   5.120 +            </property>
   5.121 +           </widget>
   5.122 +          </item>
   5.123 +         </layout>
   5.124 +        </widget>
   5.125 +       </item>
   5.126         <item>
   5.127          <layout class="QVBoxLayout" >
   5.128 -         <property name="margin" >
   5.129 -          <number>0</number>
   5.130 -         </property>
   5.131           <property name="spacing" >
   5.132            <number>6</number>
   5.133           </property>
   5.134 -         <item>
   5.135 -          <widget class="QComboBox" name="frameTypeCombo" >
   5.136 -           <item>
   5.137 -            <property name="text" >
   5.138 -             <string>No Frame</string>
   5.139 -            </property>
   5.140 -           </item>
   5.141 -           <item>
   5.142 -            <property name="text" >
   5.143 -             <string>Rectangle</string>
   5.144 -            </property>
   5.145 -           </item>
   5.146 -           <item>
   5.147 -            <property name="text" >
   5.148 -             <string>Ellipse</string>
   5.149 -            </property>
   5.150 -           </item>
   5.151 -          </widget>
   5.152 -         </item>
   5.153 +         <property name="leftMargin" >
   5.154 +          <number>0</number>
   5.155 +         </property>
   5.156 +         <property name="topMargin" >
   5.157 +          <number>0</number>
   5.158 +         </property>
   5.159 +         <property name="rightMargin" >
   5.160 +          <number>0</number>
   5.161 +         </property>
   5.162 +         <property name="bottomMargin" >
   5.163 +          <number>0</number>
   5.164 +         </property>
   5.165           <item>
   5.166            <widget class="QGroupBox" name="colorGroupBox" >
   5.167             <property name="sizePolicy" >
   5.168 -            <sizepolicy>
   5.169 -             <hsizetype>7</hsizetype>
   5.170 -             <vsizetype>5</vsizetype>
   5.171 +            <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
   5.172               <horstretch>0</horstretch>
   5.173               <verstretch>0</verstretch>
   5.174              </sizepolicy>
   5.175 @@ -76,10 +145,22 @@
   5.176              <string>Colors</string>
   5.177             </property>
   5.178             <layout class="QGridLayout" >
   5.179 -            <property name="margin" >
   5.180 +            <property name="leftMargin" >
   5.181               <number>7</number>
   5.182              </property>
   5.183 -            <property name="spacing" >
   5.184 +            <property name="topMargin" >
   5.185 +             <number>7</number>
   5.186 +            </property>
   5.187 +            <property name="rightMargin" >
   5.188 +             <number>7</number>
   5.189 +            </property>
   5.190 +            <property name="bottomMargin" >
   5.191 +             <number>7</number>
   5.192 +            </property>
   5.193 +            <property name="horizontalSpacing" >
   5.194 +             <number>6</number>
   5.195 +            </property>
   5.196 +            <property name="verticalSpacing" >
   5.197               <number>6</number>
   5.198              </property>
   5.199              <item row="0" column="0" >
   5.200 @@ -98,9 +179,7 @@
   5.201              <item row="0" column="1" >
   5.202               <widget class="QLabel" name="penColorLabelDesc" >
   5.203                <property name="sizePolicy" >
   5.204 -               <sizepolicy>
   5.205 -                <hsizetype>7</hsizetype>
   5.206 -                <vsizetype>5</vsizetype>
   5.207 +               <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
   5.208                  <horstretch>0</horstretch>
   5.209                  <verstretch>0</verstretch>
   5.210                 </sizepolicy>
   5.211 @@ -156,23 +235,70 @@
   5.212         </item>
   5.213        </layout>
   5.214       </widget>
   5.215 +     <widget class="QWidget" name="Layout" >
   5.216 +      <attribute name="title" >
   5.217 +       <string>Layout</string>
   5.218 +      </attribute>
   5.219 +      <layout class="QVBoxLayout" >
   5.220 +       <item>
   5.221 +        <layout class="QVBoxLayout" >
   5.222 +         <item>
   5.223 +          <widget class="QCheckBox" name="incImgHor" >
   5.224 +           <property name="text" >
   5.225 +            <string>Include images horizontally</string>
   5.226 +           </property>
   5.227 +          </widget>
   5.228 +         </item>
   5.229 +         <item>
   5.230 +          <widget class="QCheckBox" name="incImgVer" >
   5.231 +           <property name="text" >
   5.232 +            <string>Include images vertically</string>
   5.233 +           </property>
   5.234 +          </widget>
   5.235 +         </item>
   5.236 +        </layout>
   5.237 +       </item>
   5.238 +       <item>
   5.239 +        <spacer>
   5.240 +         <property name="orientation" >
   5.241 +          <enum>Qt::Vertical</enum>
   5.242 +         </property>
   5.243 +         <property name="sizeHint" >
   5.244 +          <size>
   5.245 +           <width>20</width>
   5.246 +           <height>40</height>
   5.247 +          </size>
   5.248 +         </property>
   5.249 +        </spacer>
   5.250 +       </item>
   5.251 +      </layout>
   5.252 +     </widget>
   5.253       <widget class="QWidget" name="tab_2" >
   5.254        <attribute name="title" >
   5.255         <string>Link</string>
   5.256        </attribute>
   5.257 -      <widget class="QCheckBox" name="hideLinkIfUnselected" >
   5.258 -       <property name="geometry" >
   5.259 -        <rect>
   5.260 -         <x>20</x>
   5.261 -         <y>10</y>
   5.262 -         <width>231</width>
   5.263 -         <height>21</height>
   5.264 -        </rect>
   5.265 -       </property>
   5.266 -       <property name="text" >
   5.267 -        <string>Hide link if unselected</string>
   5.268 -       </property>
   5.269 -      </widget>
   5.270 +      <layout class="QVBoxLayout" >
   5.271 +       <item>
   5.272 +        <widget class="QCheckBox" name="hideLinkIfUnselected" >
   5.273 +         <property name="text" >
   5.274 +          <string>Hide link if unselected</string>
   5.275 +         </property>
   5.276 +        </widget>
   5.277 +       </item>
   5.278 +       <item>
   5.279 +        <spacer>
   5.280 +         <property name="orientation" >
   5.281 +          <enum>Qt::Vertical</enum>
   5.282 +         </property>
   5.283 +         <property name="sizeHint" >
   5.284 +          <size>
   5.285 +           <width>20</width>
   5.286 +           <height>40</height>
   5.287 +          </size>
   5.288 +         </property>
   5.289 +        </spacer>
   5.290 +       </item>
   5.291 +      </layout>
   5.292       </widget>
   5.293      </widget>
   5.294     </item>
   5.295 @@ -191,11 +317,20 @@
   5.296     </item>
   5.297     <item>
   5.298      <layout class="QHBoxLayout" >
   5.299 -     <property name="margin" >
   5.300 +     <property name="spacing" >
   5.301 +      <number>6</number>
   5.302 +     </property>
   5.303 +     <property name="leftMargin" >
   5.304        <number>0</number>
   5.305       </property>
   5.306 -     <property name="spacing" >
   5.307 -      <number>6</number>
   5.308 +     <property name="topMargin" >
   5.309 +      <number>0</number>
   5.310 +     </property>
   5.311 +     <property name="rightMargin" >
   5.312 +      <number>0</number>
   5.313 +     </property>
   5.314 +     <property name="bottomMargin" >
   5.315 +      <number>0</number>
   5.316       </property>
   5.317       <item>
   5.318        <spacer>