1.1 --- a/linkablemapobj.cpp Mon Dec 07 21:56:46 2009 +0000
1.2 +++ b/linkablemapobj.cpp Thu Dec 10 17:04:48 2009 +0000
1.3 @@ -436,7 +436,7 @@
1.4 // updateLinkGeometry is called from move, but called from constructor we don't
1.5 // have parents yet...
1.6
1.7 -//cout <<"LMO::updateLinkGeometry: "<<treeItem->getHeadingStd()<<" "<<parObj<<endl;
1.8 + //cout <<"LMO::updateLinkGeometry: "<<treeItem->getHeadingStd()<<" "<<parObj<<endl;
1.9 if (!parObj)
1.10 {
1.11 // If I am a mapcenter, set childPos to middle of MapCenterObj
2.1 --- a/macros/macro-7.vys Mon Dec 07 21:56:46 2009 +0000
2.2 +++ b/macros/macro-7.vys Thu Dec 10 17:04:48 2009 +0000
2.3 @@ -1,3 +1,2 @@
2.4 # Macro F7
2.5 colorSubtree ("#0000ff");
2.6 -toggleFlag ("info");
3.1 --- a/mainwindow.cpp Mon Dec 07 21:56:46 2009 +0000
3.2 +++ b/mainwindow.cpp Thu Dec 10 17:04:48 2009 +0000
3.3 @@ -24,7 +24,7 @@
3.4 #include "warningdialog.h"
3.5 #include "xlinkitem.h"
3.6
3.7 -#include <modeltest.h> // FIXME-3
3.8 +//#include <modeltest.h> // FIXME-3
3.9
3.10 #if defined(Q_OS_WIN32)
3.11 // Define only this structure as opposed to
3.12 @@ -58,7 +58,6 @@
3.13 QMenu* branchRemoveContextMenu;
3.14 QMenu* branchLinksContextMenu;
3.15 QMenu* branchXLinksContextMenuEdit;
3.16 -QMenu* branchXLinksContextMenuFollow;
3.17 QMenu* floatimageContextMenu;
3.18 QMenu* canvasContextMenu;
3.19 QMenu* fileLastMapsMenu;
3.20 @@ -1627,8 +1626,6 @@
3.21 // This will be populated "on demand" in MapEditor::updateActions
3.22 branchContextMenu->addSeparator();
3.23 branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
3.24 - branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
3.25 - connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
3.26 connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
3.27
3.28
3.29 @@ -1760,7 +1757,7 @@
3.30 VymModel *vm=new VymModel;
3.31
3.32 /////////////////////////////////////
3.33 - new ModelTest(vm, this); //FIXME-3
3.34 +// new ModelTest(vm, this); //FIXME-3
3.35 /////////////////////////////////////
3.36
3.37 VymView *vv=new VymView (vm);
3.38 @@ -2977,14 +2974,6 @@
3.39 if (m) m->saveFloatImage();
3.40 }
3.41
3.42 -void Main::editFollowXLink(QAction *a)
3.43 -{
3.44 -
3.45 - VymModel *m=currentModel();
3.46 - if (m)
3.47 - m->followXLink(branchXLinksContextMenuFollow->actions().indexOf(a));
3.48 -}
3.49 -
3.50 void Main::editEditXLink(QAction *a)
3.51 {
3.52 VymModel *m=currentModel();
3.53 @@ -3461,7 +3450,6 @@
3.54 {
3.55 // Take care of xlinks
3.56 branchXLinksContextMenuEdit->clear();
3.57 - branchXLinksContextMenuFollow->clear();
3.58 if (selbi->xlinkCount()>0)
3.59 {
3.60 BranchItem *bi;
3.61 @@ -3474,7 +3462,6 @@
3.62 s=bi->getHeading();
3.63 if (s.length()>xLinkMenuWidth)
3.64 s=s.left(xLinkMenuWidth)+"...";
3.65 - branchXLinksContextMenuFollow->addAction (s);
3.66 branchXLinksContextMenuEdit->addAction (s);
3.67 }
3.68 }
4.1 --- a/mainwindow.h Mon Dec 07 21:56:46 2009 +0000
4.2 +++ b/mainwindow.h Thu Dec 10 17:04:48 2009 +0000
4.3 @@ -164,7 +164,6 @@
4.4 void editDeleteSelection();
4.5 void editLoadImage();
4.6 void editSaveImage();
4.7 - void editFollowXLink (QAction *);
4.8 void editEditXLink (QAction *);
4.9
4.10 void formatSelectColor();
5.1 --- a/mapeditor.cpp Mon Dec 07 21:56:46 2009 +0000
5.2 +++ b/mapeditor.cpp Thu Dec 10 17:04:48 2009 +0000
5.3 @@ -23,11 +23,6 @@
5.4 extern bool debug;
5.5
5.6 extern QMenu* branchContextMenu;
5.7 -extern QMenu* branchAddContextMenu;
5.8 -extern QMenu* branchRemoveContextMenu;
5.9 -extern QMenu* branchLinksContextMenu;
5.10 -extern QMenu* branchXLinksContextMenuEdit;
5.11 -extern QMenu* branchXLinksContextMenuFollow;
5.12 extern QMenu* floatimageContextMenu;
5.13 extern QMenu* canvasContextMenu;
5.14
6.1 --- a/parser.cpp Mon Dec 07 21:56:46 2009 +0000
6.2 +++ b/parser.cpp Thu Dec 10 17:04:48 2009 +0000
6.3 @@ -294,7 +294,7 @@
6.4 {
6.5 int start=current;
6.6 if (current<0) runScript();
6.7 - if (current>=script.length()-1) return false;
6.8 + if (current+1>=script.length()) return false;
6.9
6.10 bool inBracket=false;
6.11 while (true)
6.12 @@ -316,7 +316,7 @@
6.13 while (script.at(current)!='\n')
6.14 {
6.15 current++;
6.16 - if (current>=script.length())
6.17 + if (current+1>=script.length())
6.18 return false;
6.19 }
6.20 start=current;
6.21 @@ -331,7 +331,7 @@
6.22 }
6.23
6.24 // Check for end of script
6.25 - if (current==script.length() )
6.26 + if (current+1>=script.length() )
6.27 {
6.28 if (inBracket)
6.29 {
7.1 --- a/version.h Mon Dec 07 21:56:46 2009 +0000
7.2 +++ b/version.h Thu Dec 10 17:04:48 2009 +0000
7.3 @@ -7,7 +7,7 @@
7.4 #define __VYM_VERSION "1.13.0"
7.5 //#define __VYM_CODENAME "Codename: RC-1"
7.6 #define __VYM_CODENAME "Codename: development version, not for production!"
7.7 -#define __VYM_BUILD_DATE "2009-12-07"
7.8 +#define __VYM_BUILD_DATE "2009-12-10"
7.9
7.10
7.11 bool checkVersion(const QString &);
8.1 --- a/vym.pro Mon Dec 07 21:56:46 2009 +0000
8.2 +++ b/vym.pro Thu Dec 10 17:04:48 2009 +0000
8.3 @@ -6,8 +6,6 @@
8.4 CONFIG += qdbus
8.5
8.6 # Only needed with Qt < 4.6
8.7 -include (/data/qtanimationframework-2.3-opensource/src/gui-animation.pri)
8.8 -include (/data/qtanimationframework-2.3-opensource/src/corelib-animation.pri)
8.9 include (/data/qtanimationframework-2.3-opensource/src/qtanimationframework.pri)
8.10
8.11 TRANSLATIONS += lang/vym_de.ts
9.1 --- a/vymmodel.cpp Mon Dec 07 21:56:46 2009 +0000
9.2 +++ b/vymmodel.cpp Thu Dec 10 17:04:48 2009 +0000
9.3 @@ -2339,11 +2339,20 @@
9.4 if (branch && dst)
9.5 {
9.6 unselect();
9.7 -
9.8 +
9.9 emit (layoutAboutToBeChanged() );
9.10 BranchItem *branchpi=(BranchItem*)branch->parent();
9.11 // Remove at current position
9.12 int n=branch->childNum();
9.13 +
9.14 +/* FIXME-4 seg since 20091207, if ModelTest active. strange.
9.15 + // error occured if relinking branch to empty mainbranch
9.16 + cout<<"VM::relinkBranch:\n";
9.17 + cout<<" b="<<branch->getHeadingStd()<<endl;
9.18 + cout<<" dst="<<dst->getHeadingStd()<<endl;
9.19 + cout<<" pos="<<pos<<endl;
9.20 + cout<<" n1="<<n<<endl;
9.21 +*/
9.22 beginRemoveRows (index(branchpi),n,n);
9.23 branchpi->removeChild (n);
9.24 endRemoveRows();