1.1 Binary file demos/todo.vym has changed
2.1 --- a/floatimageobj.cpp Fri Jul 08 07:24:43 2005 +0000
2.2 +++ b/floatimageobj.cpp Fri Jul 08 08:06:36 2005 +0000
2.3 @@ -66,7 +66,6 @@
2.4
2.5 int FloatImageObj::z ()
2.6 {
2.7 -<<<<<<< floatimageobj.cpp
2.8 return qRound (icon->z());
2.9 }
2.10
2.11 @@ -77,9 +76,6 @@
2.12 positionBBox();
2.13 filetype="PNG";
2.14 filename="noname.png";
2.15 -=======
2.16 - return qRound (icon->z());
2.17 ->>>>>>> 1.2
2.18 }
2.19
2.20 bool FloatImageObj::load (const QString &fn)
3.1 --- a/mapeditor.cpp Fri Jul 08 07:24:43 2005 +0000
3.2 +++ b/mapeditor.cpp Fri Jul 08 08:06:36 2005 +0000
3.3 @@ -576,33 +576,14 @@
3.4
3.5 void MapEditor::saveState()
3.6 {
3.7 -<<<<<<< mapeditor.cpp
3.8 - saveState (CompleteMap,NULL,"");
3.9 -=======
3.10 saveState (CompleteMap,NULL,"");
3.11 }
3.12
3.13 void MapEditor::saveState(LinkableMapObj *undoSel)
3.14 {
3.15 saveState (PartOfMap,undoSel,"");
3.16 ->>>>>>> 1.16
3.17 }
3.18
3.19 -<<<<<<< mapeditor.cpp
3.20 -void MapEditor::saveState(LinkableMapObj *undoSel)
3.21 -=======
3.22 -void MapEditor::saveState(const QString & c)
3.23 ->>>>>>> 1.16
3.24 -{
3.25 -<<<<<<< mapeditor.cpp
3.26 - saveState (PartOfMap,undoSel,"");
3.27 -}
3.28 -=======
3.29 - saveState (UndoCommand,NULL,c);
3.30 -}
3.31 ->>>>>>> 1.16
3.32 -
3.33 -<<<<<<< mapeditor.cpp
3.34 void MapEditor::saveState(const QString & c)
3.35 {
3.36 saveState (UndoCommand,NULL,c);
3.37 @@ -616,58 +597,6 @@
3.38 backupXML="";
3.39 }
3.40 else if (savemode==PartOfMap && undoSel)
3.41 -=======
3.42 -void MapEditor::saveState(const SaveMode &savemode, LinkableMapObj *undoSel, const QString &undoCom)
3.43 -{
3.44 - if (savemode==UndoCommand)
3.45 ->>>>>>> 1.16
3.46 - {
3.47 -<<<<<<< mapeditor.cpp
3.48 - undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
3.49 - backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
3.50 - } else
3.51 - {
3.52 - undoCommand="undoMap ()";
3.53 - backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),NULL);
3.54 - }
3.55 - /* FIXME testing
3.56 - cout << "ME::saveState()\n";
3.57 - cout << " undoCom="<<undoCommand<<endl;
3.58 - */
3.59 -}
3.60 -
3.61 -void MapEditor::parseAtom(const QString &s)
3.62 -{
3.63 - API api;
3.64 - QString c,p,p0;
3.65 - api.parseCommand (s,c,p);
3.66 - api.getString(p,p0);
3.67 - /* FIXME testing
3.68 - cout <<"ME::parseAtom s="<<s<<endl;
3.69 - cout <<"ME::parseAtom c="<<c<<endl;
3.70 - cout <<"ME::parseAtom p="<<p<<endl;
3.71 - */
3.72 -
3.73 - // External commands
3.74 - if (c==QString("moveBranchUp"))
3.75 - moveBranchUp();
3.76 - else if (c=="moveBranchDown")
3.77 - moveBranchDown();
3.78 - else if (c=="setHeading")
3.79 - setHeading (p0);
3.80 - // Internal commands, used for undo etc.
3.81 - else if (c==QString("undoMap"))
3.82 - undoXML("");
3.83 - else if (c==QString("undoPart"))
3.84 - undoXML(p0);
3.85 - else if (c=="select")
3.86 - select (p0);
3.87 - else
3.88 -=======
3.89 - undoCommand=undoCom;
3.90 - backupXML="";
3.91 - }
3.92 - else if (savemode==PartOfMap && undoSel)
3.93 {
3.94 undoCommand="undoPart (\""+undoSel->getSelectString()+"\")";
3.95 backupXML=saveToDir (bakMapDir,mapName+"-",false, QPoint (),undoSel);
3.96 @@ -709,7 +638,6 @@
3.97 else if (c=="select")
3.98 select (p0);
3.99 else
3.100 ->>>>>>> 1.16
3.101 {
3.102 cout << "MapEditor::parseAtom: Error!\n";
3.103 cout << " Command unknown: \""<<c<<"\""<<endl;
3.104 @@ -2522,21 +2450,12 @@
3.105
3.106 actionEditCopy->setEnabled (true);
3.107 actionEditCut->setEnabled (true);
3.108 -<<<<<<< mapeditor.cpp
3.109 if (clipboardME->getMapCenter()->countBranches()>0 || clipboardME->getMapCenter()->countFloatImages()>0)
3.110 actionEditPaste->setEnabled (true);
3.111 else
3.112 actionEditPaste->setEnabled (false);
3.113 for (a=actionListBranches.first();a;a=actionListBranches.next())
3.114 a->setEnabled(true);
3.115 -=======
3.116 - if (clipboardME->getMapCenter()->countBranches()>0)
3.117 - actionEditPaste->setEnabled (true);
3.118 - else
3.119 - actionEditPaste->setEnabled (false);
3.120 - for (a=actionListBranches.first();a;a=actionListBranches.next())
3.121 - a->setEnabled(true);
3.122 ->>>>>>> 1.16
3.123 actionEditDelete->setEnabled (true);
3.124 actionEditToggleFloatExport->setEnabled (false);
3.125 switch (selection->getFrameType())
4.1 --- a/mapeditor.h Fri Jul 08 07:24:43 2005 +0000
4.2 +++ b/mapeditor.h Fri Jul 08 08:06:36 2005 +0000
4.3 @@ -35,19 +35,12 @@
4.4 // create subdirs in dir
4.5 QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
4.6 void saveState(); // save actual state to backup
4.7 -<<<<<<< mapeditor.h
4.8 void saveState(LinkableMapObj *);
4.9 void saveState(const QString &);
4.10 void saveState(const SaveMode&, LinkableMapObj *, const QString &);
4.11 void parseAtom(const QString &);
4.12
4.13 void addFloatImage(const QPixmap &img);
4.14 -=======
4.15 - void saveState(LinkableMapObj *);
4.16 - void saveState(const QString &);
4.17 - void saveState(const SaveMode&, LinkableMapObj *, const QString &);
4.18 - void parseAtom(const QString &);
4.19 ->>>>>>> 1.10
4.20
4.21 private slots:
4.22 void finishedLineEditNoSave();
5.1 --- a/tex/vym.tex Fri Jul 08 07:24:43 2005 +0000
5.2 +++ b/tex/vym.tex Fri Jul 08 08:06:36 2005 +0000
5.3 @@ -747,11 +747,12 @@
5.4 {\tt vym@insilmaril.de}.
5.5
5.6 \subsection{Past}
5.7 +\input{vym.changelog}
5.8 \begin{center}
5.9 \begin{longtable}{|lcp{8cm}l|} \hline
5.10 Version & & Comment & Date \\ \hline \hline \endhead
5.11 \hline \endfoot
5.12 -1.6.8 & - & Dramatic in speedup in some operations
5.13 +1.6.8 & - & Dramatic speedup in some operations
5.14 (e.g. move branch up/down) due to extended
5.15 undo engine & 2005-06-07 \\
5.16 1.6.7 & - & Changed default pdf-reader for Mac OSX & 2005-05-27 \\
6.1 --- a/texteditor.cpp Fri Jul 08 07:24:43 2005 +0000
6.2 +++ b/texteditor.cpp Fri Jul 08 08:06:36 2005 +0000
6.3 @@ -115,14 +115,10 @@
6.4 actionSettingsFonthintDefault->setOn (false);
6.5 e->setCurrentFont (varFont);
6.6 }
6.7 -<<<<<<< texteditor.cpp
6.8 filenameHint="";
6.9
6.10 // Save settings in vymrc
6.11 settings.writeEntry("/vym/mainwindow/printerName",printer->printerName());
6.12 -=======
6.13 - filenameHint="";
6.14 ->>>>>>> 1.4
6.15 }
6.16
6.17
7.1 --- a/version.h Fri Jul 08 07:24:43 2005 +0000
7.2 +++ b/version.h Fri Jul 08 08:06:36 2005 +0000
7.3 @@ -1,12 +1,7 @@
7.4 #ifndef VERSION_H
7.5 #define VERSION_H
7.6
7.7 -<<<<<<< version.h
7.8 #define __VYM_VERSION__ "1.6.9"
7.9 #define __BUILD_DATE__ "July 04, 2005"
7.10 -=======
7.11 -#define __VYM_VERSION__ "1.6.8"
7.12 -#define __BUILD_DATE__ "June 14, 2005"
7.13 ->>>>>>> 1.16
7.14
7.15 #endif