# HG changeset patch
# User insilmaril
# Date 1120809996 0
# Node ID e0f6a21cc6d6733deed8f2b5ca69f124c28e9762
# Parent  09edde7ae30e2a33d95b123ad5dffe2f8f2b6c6a
corrected vym.tex

diff -r 09edde7ae30e -r e0f6a21cc6d6 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 09edde7ae30e -r e0f6a21cc6d6 floatimageobj.cpp
--- a/floatimageobj.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/floatimageobj.cpp	Fri Jul 08 08:06:36 2005 +0000
@@ -66,7 +66,6 @@
 
 int FloatImageObj::z ()
 {
-<<<<<<< floatimageobj.cpp
 	return qRound (icon->z());
 }
 
@@ -77,9 +76,6 @@
   positionBBox();
   filetype="PNG";
   filename="noname.png";
-=======
-	return qRound (icon->z());
->>>>>>> 1.2
 }
 
 bool FloatImageObj::load (const QString &fn)
diff -r 09edde7ae30e -r e0f6a21cc6d6 mapeditor.cpp
--- a/mapeditor.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/mapeditor.cpp	Fri Jul 08 08:06:36 2005 +0000
@@ -576,33 +576,14 @@
 
 void MapEditor::saveState()
 {
-<<<<<<< mapeditor.cpp
-	saveState (CompleteMap,NULL,"");
-=======
 	saveState (CompleteMap,NULL,"");
 }
 
 void MapEditor::saveState(LinkableMapObj *undoSel)
 {
 	saveState (PartOfMap,undoSel,"");
->>>>>>> 1.16
 }
 
-<<<<<<< mapeditor.cpp
-void MapEditor::saveState(LinkableMapObj *undoSel)
-=======
-void MapEditor::saveState(const QString & c)
->>>>>>> 1.16
-{
-<<<<<<< mapeditor.cpp
-	saveState (PartOfMap,undoSel,"");
-}
-=======
-	saveState (UndoCommand,NULL,c);
-}
->>>>>>> 1.16
-
-<<<<<<< mapeditor.cpp
 void MapEditor::saveState(const QString & c)
 {
 	saveState (UndoCommand,NULL,c);
@@ -616,58 +597,6 @@
 		backupXML="";
 	}	
 	else if (savemode==PartOfMap && undoSel)
-=======
-void MapEditor::saveState(const SaveMode &savemode, LinkableMapObj *undoSel, const QString &undoCom)
-{
-	if (savemode==UndoCommand)
->>>>>>> 1.16
-	{
-<<<<<<< mapeditor.cpp
-		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
-		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
-	} else
-	{
-		undoCommand="undoMap ()";
-		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),NULL);
-	}
-	/* FIXME testing
-	cout << "ME::saveState()\n";
-	cout << "  undoCom="<<undoCommand<<endl;
-	*/
-}
-
-void MapEditor::parseAtom(const QString &s)
-{
-	API api;
-	QString c,p,p0;
-	api.parseCommand (s,c,p);
-	api.getString(p,p0);
-	/* FIXME testing
-	cout <<"ME::parseAtom  s="<<s<<endl;
-	cout <<"ME::parseAtom  c="<<c<<endl;
-	cout <<"ME::parseAtom  p="<<p<<endl;
-	*/
-
-	// External commands
-	if (c==QString("moveBranchUp"))
-		moveBranchUp();
-	else if (c=="moveBranchDown")
-		moveBranchDown();
-	else if (c=="setHeading")
-		setHeading (p0);
-	// Internal commands, used for undo etc.	
-	else if (c==QString("undoMap"))
-		undoXML("");
-	else if (c==QString("undoPart"))
-		undoXML(p0);
-	else if (c=="select")
-		select (p0);
-	else
-=======
-		undoCommand=undoCom;
-		backupXML="";
-	}	
-	else if (savemode==PartOfMap && undoSel)
 	{
 		undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
 		backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
@@ -709,7 +638,6 @@
 	else if (c=="select")
 		select (p0);
 	else
->>>>>>> 1.16
 	{
 		cout << "MapEditor::parseAtom: Error!\n";
 		cout << "  Command unknown: \""<<c<<"\""<<endl;
@@ -2522,21 +2450,12 @@
 
 			actionEditCopy->setEnabled (true);	
 			actionEditCut->setEnabled (true);	
-<<<<<<< mapeditor.cpp
 			if (clipboardME->getMapCenter()->countBranches()>0 || clipboardME->getMapCenter()->countFloatImages()>0)
 				actionEditPaste->setEnabled (true);	
 			else	
 				actionEditPaste->setEnabled (false);	
 			for (a=actionListBranches.first();a;a=actionListBranches.next())
 				a->setEnabled(true);
-=======
-			if (clipboardME->getMapCenter()->countBranches()>0)
-				actionEditPaste->setEnabled (true);	
-			else	
-				actionEditPaste->setEnabled (false);	
-			for (a=actionListBranches.first();a;a=actionListBranches.next())
-				a->setEnabled(true);
->>>>>>> 1.16
 			actionEditDelete->setEnabled (true);
 			actionEditToggleFloatExport->setEnabled (false);
 			switch (selection->getFrameType())
diff -r 09edde7ae30e -r e0f6a21cc6d6 mapeditor.h
--- a/mapeditor.h	Fri Jul 08 07:24:43 2005 +0000
+++ b/mapeditor.h	Fri Jul 08 08:06:36 2005 +0000
@@ -35,19 +35,12 @@
 							// create subdirs in dir
     QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
     void saveState();		// save actual state to backup
-<<<<<<< mapeditor.h
     void saveState(LinkableMapObj *);
     void saveState(const QString &);
     void saveState(const SaveMode&, LinkableMapObj *, const QString &);
     void parseAtom(const QString &);	
 
     void addFloatImage(const QPixmap &img);
-=======
-    void saveState(LinkableMapObj *);
-    void saveState(const QString &);
-    void saveState(const SaveMode&, LinkableMapObj *, const QString &);
-    void parseAtom(const QString &);	
->>>>>>> 1.10
 
   private slots:
     void finishedLineEditNoSave();
diff -r 09edde7ae30e -r e0f6a21cc6d6 tex/vym.tex
--- a/tex/vym.tex	Fri Jul 08 07:24:43 2005 +0000
+++ b/tex/vym.tex	Fri Jul 08 08:06:36 2005 +0000
@@ -747,11 +747,12 @@
 {\tt vym@insilmaril.de}.
 
 \subsection{Past}
+\input{vym.changelog}
 \begin{center}
 \begin{longtable}{|lcp{8cm}l|} \hline
 Version	&	&	Comment								& Date	\\ \hline \hline \endhead
 	\hline \endfoot
-1.6.8	& - &	Dramatic in speedup in some operations 
+1.6.8	& - &	Dramatic speedup in some operations 
 				(e.g. move branch up/down) due to extended 
 				undo engine							& 2005-06-07 \\ 
 1.6.7	& - &	Changed default pdf-reader for Mac OSX & 2005-05-27 \\ 
diff -r 09edde7ae30e -r e0f6a21cc6d6 texteditor.cpp
--- a/texteditor.cpp	Fri Jul 08 07:24:43 2005 +0000
+++ b/texteditor.cpp	Fri Jul 08 08:06:36 2005 +0000
@@ -115,14 +115,10 @@
 		actionSettingsFonthintDefault->setOn (false);
 		e->setCurrentFont (varFont);
 	}	
-<<<<<<< texteditor.cpp
 	filenameHint="";
 
 	// Save settings in vymrc
 	settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
-=======
-	filenameHint="";
->>>>>>> 1.4
 }
 
 
diff -r 09edde7ae30e -r e0f6a21cc6d6 version.h
--- a/version.h	Fri Jul 08 07:24:43 2005 +0000
+++ b/version.h	Fri Jul 08 08:06:36 2005 +0000
@@ -1,12 +1,7 @@
 #ifndef VERSION_H 
 #define VERSION_H
 
-<<<<<<< version.h
 #define __VYM_VERSION__ "1.6.9"
 #define __BUILD_DATE__ "July 04, 2005"
-=======
-#define __VYM_VERSION__ "1.6.8"
-#define __BUILD_DATE__ "June 14, 2005"
->>>>>>> 1.16
 
 #endif