1.1 --- a/mainwindow.cpp	Wed Mar 01 14:39:04 2006 +0000
     1.2 +++ b/mainwindow.cpp	Wed Mar 01 14:39:05 2006 +0000
     1.3 @@ -390,7 +390,7 @@
     1.4  	connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
     1.5  	a->addTo (importMenu);
     1.6  
     1.7 -	a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager"), 0, this, "importMM" );
     1.8 +	a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager")+QString("..."), 0, this, "importMM" );
     1.9  	connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
    1.10  	a->addTo (importMenu);
    1.11  
    1.12 @@ -404,7 +404,7 @@
    1.13      menu->insertSeparator();
    1.14  
    1.15  
    1.16 -    a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" );
    1.17 +    a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
    1.18      connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
    1.19      a->addTo( tb );
    1.20      a->addTo( menu );
    1.21 @@ -1127,9 +1127,7 @@
    1.22  
    1.23  	branchContextMenu->insertSeparator();	
    1.24  	actionFormatIncludeImagesVer->addTo( branchContextMenu );
    1.25 -    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) 
    1.26 -		// FIXME not implemented yet 
    1.27 -		actionFormatIncludeImagesHor->addTo( branchContextMenu );
    1.28 +	actionFormatIncludeImagesHor->addTo( branchContextMenu );
    1.29  	actionFormatHideLinkUnselected->addTo( branchContextMenu );
    1.30  
    1.31  	// Context Menu for links in a branch menu

     2.1 --- a/mapeditor.cpp	Wed Mar 01 14:39:04 2006 +0000
     2.2 +++ b/mapeditor.cpp	Wed Mar 01 14:39:05 2006 +0000
     2.3 @@ -3017,6 +3017,7 @@
     2.4  void MapEditor::testFunction()
     2.5  {
     2.6  	cout << "MapEditor::testFunction() called\n";
     2.7 +	adjustCanvasSize();
     2.8  
     2.9  	/*
    2.10  	if (selection && (typeid(*selection) == typeid(BranchObj)))

     3.1 --- a/mapobj.cpp	Wed Mar 01 14:39:04 2006 +0000
     3.2 +++ b/mapobj.cpp	Wed Mar 01 14:39:05 2006 +0000
     3.3 @@ -70,6 +70,11 @@
     3.4      return bbox.height();
     3.5  }
     3.6  
     3.7 +QPoint MapObj::getAbsPos() 
     3.8 +{
     3.9 +    return absPos;
    3.10 +}
    3.11 +
    3.12  QString MapObj::getPos()
    3.13  {
    3.14  	return qpointToString(absPos);

     4.1 --- a/mapobj.h	Wed Mar 01 14:39:04 2006 +0000
     4.2 +++ b/mapobj.h	Wed Mar 01 14:39:05 2006 +0000
     4.3 @@ -29,6 +29,7 @@
     4.4      virtual int y();
     4.5  	virtual int width();
     4.6  	virtual int height();
     4.7 +	virtual QPoint getAbsPos();
     4.8  	virtual QString getPos();					// Return position as string (x,y)
     4.9      virtual void move (double x,double y);      // move to absolute Position
    4.10      virtual void moveBy (double x,double y);    // move to relative Position

     5.1 --- a/ornamentedobj.cpp	Wed Mar 01 14:39:04 2006 +0000
     5.2 +++ b/ornamentedobj.cpp	Wed Mar 01 14:39:05 2006 +0000
     5.3 @@ -65,6 +65,8 @@
     5.4  	systemFlags->copy (other->systemFlags);
     5.5  	standardFlags->copy (other->standardFlags);
     5.6  
     5.7 +	ornamentsBBox=other->ornamentsBBox;
     5.8 +
     5.9  }
    5.10  
    5.11  QString OrnamentedObj::getHeading()
    5.12 @@ -91,15 +93,23 @@
    5.13  	double d=frame->getBorder()/2;
    5.14  	double x=absPos.x();
    5.15  	double y=absPos.y();
    5.16 -	systemFlags-> move (x + d, y + d );
    5.17 +
    5.18 +	double ox,oy;	// Offset due to padding
    5.19 +
    5.20 +	ox=leftPad + d;
    5.21 +	oy=topPad + d;
    5.22 +	
    5.23 +	systemFlags-> move (ox +x , oy + y );
    5.24  
    5.25  	// vertical align heading to bottom
    5.26 -	int h=max (systemFlags->getBBox().height(), standardFlags->getBBox().height());
    5.27 -	h=max (h,heading->getHeight());
    5.28 -    heading->move (x + d + systemFlags->getBBox().width(),
    5.29 -					y + d  + h - heading->getHeight() 
    5.30 +    heading->move (ox + x + systemFlags->getBBox().width(),
    5.31 +				   oy + y + ornamentsBBox.height() - heading->getHeight() 
    5.32  					);
    5.33 -	standardFlags->move (x + heading->getWidth() + systemFlags->getBBox().width() + d , y + d  );
    5.34 +	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
    5.35 +
    5.36 +	ornamentsBBox.moveTopLeft ( QPoint (ox+x, oy+y));
    5.37 +	clickBox.moveTopLeft (QPoint (ox + x, oy + y));
    5.38 +
    5.39  }
    5.40  
    5.41  void OrnamentedObj::move (double x, double y)

     6.1 --- a/ornamentedobj.h	Wed Mar 01 14:39:04 2006 +0000
     6.2 +++ b/ornamentedobj.h	Wed Mar 01 14:39:05 2006 +0000
     6.3 @@ -42,6 +42,7 @@
     6.4  	NoteObj note;					// Notes
     6.5  	FlagRowObj *systemFlags;		// System Flags
     6.6  	FlagRowObj *standardFlags;		// Standard Flags
     6.7 +	QRect ornamentsBBox;			// bbox of flags and heading
     6.8  	
     6.9  };
    6.10  

     7.1 --- a/tex/vym.changelog	Wed Mar 01 14:39:04 2006 +0000
     7.2 +++ b/tex/vym.changelog	Wed Mar 01 14:39:05 2006 +0000
     7.3 @@ -1,3 +1,9 @@
     7.4 +-------------------------------------------------------------------
     7.5 +Wed Mar  1 15:38:11 CET 2006 - uwedr
     7.6 +
     7.7 +- Version: 1.7.10
     7.8 +- Feature: Include Images Horizontalls
     7.9 +
    7.10  -------------------------------------------------------------------
    7.11  Tue Feb 21 17:17:48 CET 2006 - uwedr
    7.12  

     8.1 --- a/version.h	Wed Mar 01 14:39:04 2006 +0000
     8.2 +++ b/version.h	Wed Mar 01 14:39:05 2006 +0000
     8.3 @@ -3,6 +3,6 @@
     8.4  
     8.5  #define __VYM "VYM"
     8.6  #define __VYM_VERSION "1.7.10"
     8.7 -#define __BUILD_DATE "February 22, 2006"
     8.8 +#define __BUILD_DATE "March 1, 2006"
     8.9  
    8.10  #endif