# HG changeset patch
# User insilmaril
# Date 1141223945 0
# Node ID 38ad83f1d4ce8a83182e75c207355c2f8656933a
# Parent  5e684bfe5bb1b527c6eaf27737ba9da61bc2ddfb
1.7.10  includeImagesHorizontally implemented

diff -r 5e684bfe5bb1 -r 38ad83f1d4ce mainwindow.cpp
--- a/mainwindow.cpp	Wed Mar 01 14:39:04 2006 +0000
+++ b/mainwindow.cpp	Wed Mar 01 14:39:05 2006 +0000
@@ -390,7 +390,7 @@
 	connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
 	a->addTo (importMenu);
 
-	a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager"), 0, this, "importMM" );
+	a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager")+QString("..."), 0, this, "importMM" );
 	connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
 	a->addTo (importMenu);
 
@@ -404,7 +404,7 @@
     menu->insertSeparator();
 
 
-    a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print..." ), CTRL + Key_P, this, "filePrint" );
+    a = new QAction( tr( "Print" ), QPixmap( fileprint_xpm ), tr( "&Print")+QString("..."), CTRL + Key_P, this, "filePrint" );
     connect( a, SIGNAL( activated() ), this, SLOT( filePrint() ) );
     a->addTo( tb );
     a->addTo( menu );
@@ -1127,9 +1127,7 @@
 
 	branchContextMenu->insertSeparator();	
 	actionFormatIncludeImagesVer->addTo( branchContextMenu );
-    if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false)) 
-		// FIXME not implemented yet 
-		actionFormatIncludeImagesHor->addTo( branchContextMenu );
+	actionFormatIncludeImagesHor->addTo( branchContextMenu );
 	actionFormatHideLinkUnselected->addTo( branchContextMenu );
 
 	// Context Menu for links in a branch menu
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce mapeditor.cpp
--- a/mapeditor.cpp	Wed Mar 01 14:39:04 2006 +0000
+++ b/mapeditor.cpp	Wed Mar 01 14:39:05 2006 +0000
@@ -3017,6 +3017,7 @@
 void MapEditor::testFunction()
 {
 	cout << "MapEditor::testFunction() called\n";
+	adjustCanvasSize();
 
 	/*
 	if (selection && (typeid(*selection) == typeid(BranchObj)))
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce mapobj.cpp
--- a/mapobj.cpp	Wed Mar 01 14:39:04 2006 +0000
+++ b/mapobj.cpp	Wed Mar 01 14:39:05 2006 +0000
@@ -70,6 +70,11 @@
     return bbox.height();
 }
 
+QPoint MapObj::getAbsPos() 
+{
+    return absPos;
+}
+
 QString MapObj::getPos()
 {
 	return qpointToString(absPos);
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce mapobj.h
--- a/mapobj.h	Wed Mar 01 14:39:04 2006 +0000
+++ b/mapobj.h	Wed Mar 01 14:39:05 2006 +0000
@@ -29,6 +29,7 @@
     virtual int y();
 	virtual int width();
 	virtual int height();
+	virtual QPoint getAbsPos();
 	virtual QString getPos();					// Return position as string (x,y)
     virtual void move (double x,double y);      // move to absolute Position
     virtual void moveBy (double x,double y);    // move to relative Position
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce ornamentedobj.cpp
--- a/ornamentedobj.cpp	Wed Mar 01 14:39:04 2006 +0000
+++ b/ornamentedobj.cpp	Wed Mar 01 14:39:05 2006 +0000
@@ -65,6 +65,8 @@
 	systemFlags->copy (other->systemFlags);
 	standardFlags->copy (other->standardFlags);
 
+	ornamentsBBox=other->ornamentsBBox;
+
 }
 
 QString OrnamentedObj::getHeading()
@@ -91,15 +93,23 @@
 	double d=frame->getBorder()/2;
 	double x=absPos.x();
 	double y=absPos.y();
-	systemFlags-> move (x + d, y + d );
+
+	double ox,oy;	// Offset due to padding
+
+	ox=leftPad + d;
+	oy=topPad + d;
+	
+	systemFlags-> move (ox +x , oy + y );
 
 	// vertical align heading to bottom
-	int h=max (systemFlags->getBBox().height(), standardFlags->getBBox().height());
-	h=max (h,heading->getHeight());
-    heading->move (x + d + systemFlags->getBBox().width(),
-					y + d  + h - heading->getHeight() 
+    heading->move (ox + x + systemFlags->getBBox().width(),
+				   oy + y + ornamentsBBox.height() - heading->getHeight() 
 					);
-	standardFlags->move (x + heading->getWidth() + systemFlags->getBBox().width() + d , y + d  );
+	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
+
+	ornamentsBBox.moveTopLeft ( QPoint (ox+x, oy+y));
+	clickBox.moveTopLeft (QPoint (ox + x, oy + y));
+
 }
 
 void OrnamentedObj::move (double x, double y)
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce ornamentedobj.h
--- a/ornamentedobj.h	Wed Mar 01 14:39:04 2006 +0000
+++ b/ornamentedobj.h	Wed Mar 01 14:39:05 2006 +0000
@@ -42,6 +42,7 @@
 	NoteObj note;					// Notes
 	FlagRowObj *systemFlags;		// System Flags
 	FlagRowObj *standardFlags;		// Standard Flags
+	QRect ornamentsBBox;			// bbox of flags and heading
 	
 };
 
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce tex/vym.changelog
--- a/tex/vym.changelog	Wed Mar 01 14:39:04 2006 +0000
+++ b/tex/vym.changelog	Wed Mar 01 14:39:05 2006 +0000
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  1 15:38:11 CET 2006 - uwedr
+
+- Version: 1.7.10
+- Feature: Include Images Horizontalls
+
 -------------------------------------------------------------------
 Tue Feb 21 17:17:48 CET 2006 - uwedr
 
diff -r 5e684bfe5bb1 -r 38ad83f1d4ce version.h
--- a/version.h	Wed Mar 01 14:39:04 2006 +0000
+++ b/version.h	Wed Mar 01 14:39:05 2006 +0000
@@ -3,6 +3,6 @@
 
 #define __VYM "VYM"
 #define __VYM_VERSION "1.7.10"
-#define __BUILD_DATE "February 22, 2006"
+#define __BUILD_DATE "March 1, 2006"
 
 #endif