# HG changeset patch # User insilmaril # Date 1152015056 0 # Node ID 84f76a3876d78b4c3e427154552079a879aeee17 # Parent db50e4164311e1c833bae8b4b9b085f25aab622c fixed recent maps and xlinks diff -r db50e4164311 -r 84f76a3876d7 branchobj.cpp --- a/branchobj.cpp Wed Jun 14 14:43:18 2006 +0000 +++ b/branchobj.cpp Tue Jul 04 12:10:56 2006 +0000 @@ -791,6 +791,11 @@ // save names of flags set s+=standardFlags->saveToDir(tmpdir,prefix,0); + // Save FloatImages + FloatImageObj *fio; + for (fio=floatimage.first(); fio; fio=floatimage.next() ) + s+=fio->saveToDir (tmpdir,prefix,offset); + // save note if (!note.isEmpty() ) s+=note.saveToDir(); @@ -800,11 +805,6 @@ for (bo=branch.first(); bo; bo=branch.next() ) s+=bo->saveToDir(tmpdir,prefix,offset); - // Save FloatImages - FloatImageObj *fio; - for (fio=floatimage.first(); fio; fio=floatimage.next() ) - s+=fio->saveToDir (tmpdir,prefix,offset); - // Save XLinks XLinkObj *xlo; //FIXME exponential increase in xlinks... diff -r db50e4164311 -r 84f76a3876d7 demos/todo.vym Binary file demos/todo.vym has changed diff -r db50e4164311 -r 84f76a3876d7 main.cpp --- a/main.cpp Wed Jun 14 14:43:18 2006 +0000 +++ b/main.cpp Tue Jul 04 12:10:56 2006 +0000 @@ -113,8 +113,8 @@ QMenu* branchContextMenu; QMenu* branchAddContextMenu; QMenu* branchRemoveContextMenu; -QMenu* branchLinksContextMenu; -QMenu* branchLinksContextMenuDup; +QMenu* branchLinksContextMenuEdit; +QMenu* branchLinksContextMenuFollow; QMenu* floatimageContextMenu; QMenu* saveImageFormatMenu; QMenu* canvasContextMenu; diff -r db50e4164311 -r 84f76a3876d7 mainwindow.cpp --- a/mainwindow.cpp Wed Jun 14 14:43:18 2006 +0000 +++ b/mainwindow.cpp Tue Jul 04 12:10:56 2006 +0000 @@ -129,8 +129,8 @@ extern QMenu* branchContextMenu; extern QMenu* branchAddContextMenu; extern QMenu* branchRemoveContextMenu; -extern QMenu* branchLinksContextMenu; -extern QMenu* branchLinksContextMenuDup; +extern QMenu* branchLinksContextMenuEdit; +extern QMenu* branchLinksContextMenuFollow; extern QMenu* floatimageContextMenu; extern QMenu* saveImageFormatMenu; extern QMenu* canvasContextMenu; @@ -505,23 +505,23 @@ a = new QAction(tr( "Edit heading" ),this); a->setStatusTip ( tr( "edit Heading" )); a->setShortcut ( Qt::Key_Enter); - a->setShortcutContext (Qt::ApplicationShortcut); + a->setShortcutContext (Qt::WindowShortcut); addAction (a); connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) ); actionListBranches.append(a); a = new QAction( tr( "Edit heading" ), this); a->setStatusTip (tr( "edit Heading" )); a->setShortcut (Qt::Key_Return ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) ); actionListBranches.append(a); editMenu->addAction (a); - a->setShortcutContext (Qt::ApplicationShortcut); - addAction (a); actionEditHeading=a; a = new QAction( tr( "Edit heading" ), this); a->setStatusTip (tr( "edit Heading" )); a->setShortcut ( Qt::Key_F2 ); - a->setShortcutContext (Qt::ApplicationShortcut); + a->setShortcutContext (Qt::WindowShortcut); addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) ); actionListBranches.append(a); @@ -530,19 +530,21 @@ a = new QAction( tr( "Delete Selection" ),this); a->setStatusTip (tr( "Delete Selection" )); a->setShortcut ( Qt::Key_Delete); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editDeleteSelection() ) ); - a->setEnabled (false); actionEditDelete=a; // Shortcut to add branch alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this); alt->setStatusTip ( tr( "Add a branch as child of selection" )); alt->setShortcut (Qt::Key_A); + alt->setShortcutContext (Qt::WindowShortcut); + addAction (alt); connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) ); a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this); a->setStatusTip ( tr( "Add a branch as child of selection" )); a->setShortcut (Qt::Key_Insert); -// a->setEnabled (false); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) ); actionListBranches.append(a); #if defined (Q_OS_MACX) @@ -559,6 +561,8 @@ a = new QAction(tr( "Add branch (insert)" ), this); a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" )); a->setShortcut (Qt::ALT + Qt::Key_Insert ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) ); a->setEnabled (false); actionListBranches.append(a); @@ -566,6 +570,8 @@ a = new QAction(tr( "Add branch (insert)" ),this); a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" )); a->setShortcut ( Qt::ALT + Qt::Key_A ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchHere() ) ); actionListBranches.append(a); @@ -573,6 +579,8 @@ a = new QAction(tr( "Add branch above" ), this); a->setStatusTip ( tr( "Add a branch above selection" )); a->setShortcut (Qt::SHIFT+Qt::Key_Insert ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) ); a->setEnabled (false); actionListBranches.append(a); @@ -580,6 +588,8 @@ a = new QAction(tr( "Add branch above" ), this); a->setStatusTip ( tr( "Add a branch above selection" )); a->setShortcut (Qt::SHIFT+Qt::Key_A ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchAbove() ) ); actionListBranches.append(a); @@ -587,6 +597,8 @@ a = new QAction(tr( "Add branch below" ), this); a->setStatusTip ( tr( "Add a branch below selection" )); a->setShortcut (Qt::CTRL +Qt::Key_Insert ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) ); a->setEnabled (false); actionListBranches.append(a); @@ -594,6 +606,8 @@ a = new QAction(tr( "Add branch below" ), this); a->setStatusTip ( tr( "Add a branch below selection" )); a->setShortcut (Qt::CTRL +Qt::Key_A ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editNewBranchBelow() ) ); actionListBranches.append(a); @@ -778,22 +792,32 @@ a = new QAction(tr( "Select upper branch" ), this); a->setStatusTip ( tr( "Select upper branch" )); a->setShortcut (Qt::Key_Up ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editUpperBranch() ) ); a = new QAction( tr( "Select lower branch" ),this); a->setStatusTip (tr( "Select lower branch" )); a->setShortcut ( Qt::Key_Down ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editLowerBranch() ) ); a = new QAction(tr( "Select left branch" ), this); a->setStatusTip ( tr( "Select left branch" )); a->setShortcut (Qt::Key_Left ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editLeftBranch() ) ); a = new QAction( tr( "Select child branch" ), this); a->setStatusTip (tr( "Select right branch" )); a->setShortcut (Qt::Key_Right); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editRightBranch() ) ); a = new QAction( tr( "Select first branch" ), this); a->setStatusTip (tr( "Select first branch" )); a->setShortcut (Qt::Key_Home ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); a->setEnabled (false); editMenu->addAction (a); actionListBranches.append(a); @@ -802,6 +826,8 @@ a = new QAction( tr( "Select last branch" ),this); a->setStatusTip (tr( "Select last branch" )); a->setShortcut ( Qt::Key_End ); + a->setShortcutContext (Qt::WindowShortcut); + addAction (a); connect( a, SIGNAL( activated() ), this, SLOT( editLastBranch() ) ); a->setEnabled (false); editMenu->addAction (a); @@ -1519,15 +1545,10 @@ // Context Menu for links in a branch menu // This will be populated "on demand" in MapEditor::updateActions branchContextMenu->addSeparator(); - /* FIXME not yet ported from QT3 - branchLinksContextMenu =new Q3PopupMenu (this); - branchLinksContextMenuDup =new Q3PopupMenu (this); - branchContextMenu->insertItem (tr("Edit XLink"),branchLinksContextMenuDup); - connect( branchLinksContextMenuDup, SIGNAL( activated(int) ), this, SLOT( editEditXLink(int ) ) ); - - branchContextMenu->insertItem (tr("Goto XLink"),branchLinksContextMenu); - connect( branchLinksContextMenu, SIGNAL( activated(int) ), this, SLOT( editFollowXLink(int ) ) ); - */ + branchLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink")); + branchLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink")); + connect( branchLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) ); + connect( branchLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) ); // Context menu for floatimage floatimageContextMenu =new QMenu (this); @@ -1580,7 +1601,7 @@ lastMaps.append(s); } setupLastMapsMenu(); -// connect( lastMapsMenu, SIGNAL( activated(int) ), this, SLOT( fileLoadLast(int ) ) ); + connect( fileLastMapsMenu, SIGNAL( triggered(QAction *) ), this, SLOT( fileLoadLast(QAction*) ) ); } void Main::setupLastMapsMenu() @@ -1607,11 +1628,8 @@ // build Menu from lastMaps string list fileLastMapsMenu->clear(); - /* FIXME add actions instead of strings in QT4 for (it = lastMaps.begin(); it != lastMaps.end(); ++it ) fileLastMapsMenu->addAction (*it ); - */ - } void Main::hideEvent (QHideEvent * ) @@ -1952,9 +1970,9 @@ fileLoad (NewMap); } -void Main::fileLoadLast(int i) +void Main::fileLoadLast(QAction *a) { - fileLoad(QString(*lastMaps.at(fileLastMapsMenu->indexOf (i)) ),NewMap); + fileLoad(lastMaps.at(fileLastMapsMenu->actions().indexOf(a)) ,NewMap); } void Main::fileSave(const SaveMode &savemode) @@ -2793,16 +2811,17 @@ currentMapEditor()->saveFloatImage(item); } -void Main::editFollowXLink(int item) +void Main::editFollowXLink(QAction *a) +{ + + if (currentMapEditor()) + currentMapEditor()->followXLink(branchLinksContextMenuFollow->actions().indexOf(a)); +} + +void Main::editEditXLink(QAction *a) { if (currentMapEditor()) - currentMapEditor()->followXLink(branchLinksContextMenu->indexOf(item)); -} - -void Main::editEditXLink(int item) -{ - if (currentMapEditor()) - currentMapEditor()->editXLink(branchLinksContextMenuDup->indexOf(item)); + currentMapEditor()->editXLink(branchLinksContextMenuEdit->actions().indexOf(a)); } void Main::formatSelectColor() diff -r db50e4164311 -r 84f76a3876d7 mainwindow.h --- a/mainwindow.h Wed Jun 14 14:43:18 2006 +0000 +++ b/mainwindow.h Tue Jul 04 12:10:56 2006 +0000 @@ -64,7 +64,7 @@ ErrorCode fileLoad(QString ,const LoadMode &); void fileLoad(const LoadMode &); void fileLoad(); - void fileLoadLast(int); + void fileLoadLast(QAction *); void fileSave(const SaveMode & ); void fileSave(); void fileSaveAs(const SaveMode &); @@ -131,8 +131,8 @@ void editLastBranch(); void editLoadImage(); void editSaveImage(int); - void editFollowXLink (int); - void editEditXLink (int); + void editFollowXLink (QAction *); + void editEditXLink (QAction *); void formatSelectColor(); void formatPickColor(); diff -r db50e4164311 -r 84f76a3876d7 mapeditor.cpp --- a/mapeditor.cpp Wed Jun 14 14:43:18 2006 +0000 +++ b/mapeditor.cpp Tue Jul 04 12:10:56 2006 +0000 @@ -130,8 +130,8 @@ extern QMenu* branchContextMenu; extern QMenu* branchAddContextMenu; extern QMenu* branchRemoveContextMenu; -extern QMenu* branchLinksContextMenu; -extern QMenu* branchLinksContextMenuDup; +extern QMenu* branchLinksContextMenuEdit; +extern QMenu* branchLinksContextMenuFollow; extern QMenu* floatimageContextMenu; extern QMenu* saveImageFormatMenu; extern QMenu* canvasContextMenu; @@ -2517,7 +2517,6 @@ void MapEditor::updateActions() { -return; //FIXME testing QAction *a; if (getLinkColorHint()==HeadingColor) actionFormatLinkColorHint->setOn(true); @@ -2560,17 +2559,14 @@ // Take care of links if (bo->countXLinks()==0) { - branchLinksContextMenu->clear(); - branchLinksContextMenu->insertItem ("No xLink available"); - branchLinksContextMenuDup->clear(); - branchLinksContextMenuDup->insertItem ("No xLink available"); - + branchLinksContextMenuEdit->clear(); + branchLinksContextMenuFollow->clear(); } else { BranchObj *bot; QString s; - branchLinksContextMenu->clear(); - branchLinksContextMenuDup->clear(); + branchLinksContextMenuEdit->clear(); + branchLinksContextMenuFollow->clear(); for (int i=0; i<=bo->countXLinks();i++) { bot=bo->XLinkTargetAt(i); @@ -2579,8 +2575,8 @@ s=bot->getHeading(); if (s.length()>25) s=s.left(25)+"..."; - branchLinksContextMenu->insertItem (s); - branchLinksContextMenuDup->insertItem (s); + branchLinksContextMenuFollow->addAction (s); + branchLinksContextMenuEdit->addAction (s); } } } @@ -3070,6 +3066,7 @@ void MapEditor::editXLink(int i) { + qDebug ("ko."); if (selection && (typeid(*selection) == typeid(BranchObj)) || (typeid(*selection) == typeid(MapCenterObj)) ) diff -r db50e4164311 -r 84f76a3876d7 tex/vym.changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tex/vym.changelog Tue Jul 04 12:10:56 2006 +0000 @@ -0,0 +1,759 @@ +------------------------------------------------------------------- +Tue Jul 4 12:32:28 CEST 2006 - uwedr + +- Feature: Moved floats in XML Export, e.g. XHTML shows floatimages at + beginning of export now + +------------------------------------------------------------------- +Thu June 1i 16:53:29 CEST 2006 - uwedr + +- Version: 1.7.18 +- Feature: Opening of tabs in Firefox or Mozilla +- Feature: Documentation is up to date now +- Bugfix: No more duplicate xLinks +- Bugfix: Saving original filename of floatimages finally works +- Bugfix: Positioning of floatimages while adjusting canvas size (also + optimized code a bit) + +------------------------------------------------------------------- +Tue May 9 10:05:52 CEST 2006 - uwedr + +- Version: 1.7.17 +- Bugfix: Right click e.g. on URL Flag opened URL _and_ context menu +- Bugfix: Deleting selection works also if Delkey is disabled. + +------------------------------------------------------------------- +Mon May 8 10:29:25 CEST 2006 - uwedr + +- Bugfix: Exclusive flags did not work properly. +- Bugfix: Wrong icon in texteditor for text underline +- Bugfix: Changed screenshots in docu to represent new look +- Bugfix: Fixed z-plane of floatimage. Images did hide flags. + +------------------------------------------------------------------- +Mon Apr 24 11:59:22 CEST 2006 - uwedr + +- Bugfix: wrong paths in XHTML export (#168033), caused by wrong + vymBaseDir + +------------------------------------------------------------------- +Mon Apr 10 13:23:02 CEST 2006 - uwedr + +- Feature: More icons + +------------------------------------------------------------------- +Fri Mar 31 14:18:38 CEST 2006 - uwe + +- Feature: New environment variable VYMHOME + +------------------------------------------------------------------- +Thu Mar 30 11:00:21 CEST 2006 - uwedr + +- Version: 1.7.15 +- Feature: New icons. Icons and flags are not longer linked statically. + +------------------------------------------------------------------- +Tue Mar 28 21:54:31 CEST 2006 - uwe + +- Version: 1.7.13 +- Feature: Konqueror can open URLs in new tabs now. + +------------------------------------------------------------------- +Thu Mar 23 13:26:46 CET 2006 - uwedr + +- Version: 1.7.12 +- Bugfix: Problem with vymlinks pointing to higher directories (#159770) +- Bugfix: All exports support hiding of objects now +- Bugfix: exportDir in XHTML export is correctly saved in map and + defaults to current directory + +------------------------------------------------------------------- +Wed Mar 15 11:43:02 CET 2006 - uwedr + +- Version: 1.7.11 +- Bugfix: Workaround QT problem, where QT writes invalid XML code by not + escaping & in fontnames +- Feature: Hide Export Flag lets you hide objects in exports +- Feature: Floatimages now are basically ornamented objects. They could + have e.g. an URL later +- Feature: On error the XML Parser shows the line which is causing the + error + +------------------------------------------------------------------- +Wed Mar 8 13:58:40 CET 2006 - uwedr + +- Bugfix: Images preview in filedialog works again. Seemed to be a QT + issue when multiple fileselections were allowed. + +------------------------------------------------------------------- +Mon Mar 6 15:02:57 CET 2006 - uwedr + +- Feature: Added export to Taskjuggler. xslt by Matt. + +------------------------------------------------------------------- +Wed Mar 1 22:29:47 CET 2006 - uwe + +- Bugfix: Canvas Size corrected when flag is toggled + +------------------------------------------------------------------- +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 + +- Feature: rudimentary import mmaps + +------------------------------------------------------------------- +Tue Feb 14 21:10:26 CET 2006 - uwe + +- Version 1.7.9 +- Feature: Import KDE bookmarks +- Feature: Own class xsltproc for doing xml transformations + +------------------------------------------------------------------- +Tue Jan 31 16:54:52 CET 2006 - uwedr + +- Version 1.7.8 +- Bugfix: Hide Include Images Horizontally (not implemented yet) +- Bugfix: Include Images Vertically was not read from saved file + +------------------------------------------------------------------- +Tue Jan 25 16:07:53 CET 2006 - uwedr + +- Version 1.7.7 +- Feature: Export to Open Office 2.x (Open Document) basically works +- Feature: Export to XHTML uses smaller icon for URLs now + +------------------------------------------------------------------- +Wed Jan 18 13:29:52 CET 2006 - uwedr + +- Feature: Multiple File selection while loading maps and images + +------------------------------------------------------------------- +Tue Jan 3 12:20:08 CET 2006 - uwe + +- Feature: Small optimization in zip/unzip functions + +------------------------------------------------------------------- +Mon Jan 2 21:03:05 CET 2006 - uwe + +- Feature: FATE support for URLs + +------------------------------------------------------------------- +Wed Dec 28 12:09:59 CET 2005 - uwe + +- Version 1.7.6 +- Feature: Added idAttr to BranchObj::saveToDir +- Bugfix: FloatObjects now use hideLinkIfUnselected, no more drawing + errors, if FO is selected (undefined link) +- Bugfix: FloatImages don't get lost during save after they have been + relinked to new parent +- Bugfix: Editing heading of mapcenter now also corrects position + +------------------------------------------------------------------- +Mon Oct 10 13:18:29 CEST 2005 - uwedr + +- Bugfix: Copy/Paste was currently not possible for images. Now + completly rewrote mechanism. Instead of invisible map now XML import + is used (Multiple clipboards should be not difficult now) + +------------------------------------------------------------------- +Mon Oct 3 10:33:09 CEST 2005 - uwe + +- Bugfix: Added small fix from Khaled Ahmed needed for display of + arabic languages + +------------------------------------------------------------------- +Mon Sep 12 21:39:38 CEST 2005 - uwedr + +- Version 1.7.5 +- Feature: Currently 15 levels of undo (GUI to set value still missing) +- Feature: Experimental LaTeX Export (without headers and opions so far) + +------------------------------------------------------------------- +Sun Sep 5 10:26:15 CEST 2005 - uwedr + +- Version 1.7.4 +- Feature: Link of a branch can be hidden, if object is not selected +- Bugfix: Zoomed map no longer "jumps around" when branch is selected + or moved. +- Bugfix: TextEditor now has grey background again, if it is empty +- Bugfix: BranchObj no longer need to connect to TextEditor, BranchObj + is no longer a QOBJECT + +------------------------------------------------------------------- +Thu Sep 1 12:26:24 CEST 2005 - uwedr + +- Bugfix: Some minor changes so that translations use arguments now + instead of several calls to tr() + +------------------------------------------------------------------- +Tue Aug 30 13:38:31 CEST 2005 - uwedr + +- Bugfix: Fixed pasting vymlinks: Pasting a branch to a target in + another map caused vym to go into an endless loop, if the vymlink of the + branch pointed to the new map. +- Bugfix: Invisible floatimages (which have a scrolled parent) no longer + can be selected + +------------------------------------------------------------------- +Fri Aug 19 09:12:49 CEST 2005 - uwedr + +- Feature: added debian subdirectory created by Steffen Joeris +- Feature: added license to new aboutwindow + +------------------------------------------------------------------- +Tue Aug 16 19:22:56 CEST 2005 - jhilmer + +- Bugfix: Fixed link handling in aboutdialog. + +------------------------------------------------------------------- +Tue Aug 16 12:25:09 CEST 2005 - uwedr + +- Feature: Added keyboard shortcut to reset zoom factor +- Bugfix: Added "..." to menu entries leading to another dialog +- Bugfix: The setting option "Delete Key" is working again +- Bugfix: A branch moved from left side to right had wrong orienation + +------------------------------------------------------------------- +Tue Aug 2 09:59:24 CEST 2005 - uwedr + +- Bugfix: Heading sizes now correct after moving e.g. mainbranch to + a branch + +------------------------------------------------------------------- +Mon Aug 1 22:40:29 CEST 2005 - jhilmer + +- Bugfix: Problems with closing of note editor when text was modified. +- Feature: Added subscript and superscript to note editor + +------------------------------------------------------------------- +Thu Jul 28 11:57:38 CEST 2005 + +- Version 1.7.3 +- Bugfix: Frames didn't become invisible if scrolled + +------------------------------------------------------------------- +Thu Jul 28 11:57:38 CEST 2005 + +- Version 1.7.2 +- Bugfix: if selection changed before undo, undo worked on wrong + branch +- included math.h again to enable compiling with gcc4 + +------------------------------------------------------------------- +Mi Jul 27 17:27:14 CEST 2005 + +- Bugfix: if selection changed before undo, undo worked on wrong branch + +------------------------------------------------------------------- +Mon Jul 25 22:22:21 CEST 2005 + +- Bugfix: changed MapEditor::undo and ::saveState to also save selection + +------------------------------------------------------------------- +Di Jul 19 16:42:31 CEST 2005 + +- Version: 1.7.1 +- Feature: Drag and Drop also for .vym and files (Jakob Hilmer) +- Feature: More speedup on moving/relinking branches + +------------------------------------------------------------------- + +Mi Jul 13 11:44:10 CEST 2005 + +- Drag and Drop also for URLs + +------------------------------------------------------------------- +Di Jul 12 20:56:09 CEST 2005 + +- Version: 1.7.0 + +------------------------------------------------------------------- +Mon Jul 4 21:13:42 CEST 2005 + +- Version: 1.6.9 +- Bugfix: TextEditor doesn't get minimized in KDE any longer (KDE-bug?) + +------------------------------------------------------------------- +Tue Jun 14 11:43:44 CEST 2005 + +- Feature: printer name is saved in vymrc now +- Feature: added image drag/drop (by Jakob Hilmer) +- Bugfix: Importing map into new map now has correct (empty) filename + +------------------------------------------------------------------- +2005-06-07 + +- Version: 1.6.8 +- Feature: Dramatic speedup in some operations + (e.g. move branch up/down) due to extended + undo engine +------------------------------------------------------------------- + 2005-05-27 + +- Version: 1.6.7 +- Feature:Changed default pdf-reader for Mac OSX +- Bugfix: xLinks stopped working in 1.6.6 +- Bugfix: drawing error when using modModeCopy +- Bugfix: replaced lrint by qRound for BSD port + +----------------------------------------------------------- + 2005-05-23 + +- Version 1.6.6 +- Feature: Exclusive standard flags + +----------------------------------------------------------- +2005-05-19 + +- Version: 1.6.5 +- Feature: removing a branch and keeping its childs +- Feature: removing childs of a branch +- Feature: insert branch and make selection its child +- Feature: restructured branch context menu + in a basic version (straight line) +- Feature: New shortcuts for use on Mac OS X +- Feature: Importing directories generates vymlinks now +- Bugfix: Changing linkstyle now automatically redraws all + links again +- Bugfix: Paste icon is disabled if clipboard is empty + +----------------------------------------------------------- +2005-04-15 + +- Version: 1.6.4 +- Feature: xLinks (connection between 2 branches) works + in a basic version (straight line) + +----------------------------------------------------------- +2005-03-30 + +- Version: 1.6.3 +- Bugfix: Saving of selection to a vym part (.vyp) +- Bugfix: Closing the noteeditor by closing its window now + also toggles the responding toolbar button. & + +----------------------------------------------------------- +2005-03-24 + +- Version: 1.6.2 +- Feature: Introduced Modifier modes: color, link, copy +- Feature: Linking branches is basically possible, though it can't be + edited/saved yet + +----------------------------------------------------------- +2005-01-30 + +- Version: 1.6.1 +- Feature: Optimized moving of branches: much faster especially + with huge subtrees +- Bugfix: Segfault when loading vym part +- Bugfix: ugly unitialized lines, when temporary drawn link + was moved from a temporary parent back to canvas + +----------------------------------------------------------- +2004-12-14 + +- Version: 1.6.0 +- Feature: Added saving of xhtml settings in map + +----------------------------------------------------------- +2004-12-13 + +- Version: 1.5.2 +- Feature: Added Import of maps with two modes: + add/replace +- Feature: Added export of part of maps +- Feature: Added joining of paragraphs in text editor +- Feature: Optimized undo: Only relevant parts are saved, which + dramatically improves e.g. moving branches up/down in most maps +- Bugfix: QTextEdit generates invalid XML code, which could lead to a + parse error, if font name contains a \& (#62283) +- Bugfix: Wrong order of mainbranches in Export +- Bugfix: zip archive was not deleted before save, which could lead to + much bigger files, e.g. when working on older \vym maps or deleted + images +- Bugfix: Printing in Texteditor +- Bugfix: Wrong URLs in xhtml output +- Bugfix: Segfault fixed at Cursor left/right in empty map + +----------------------------------------------------------- +2004-10-01 + +- Version: 1.5.1 +- Feature: More options in xhtml export: external scripts + +----------------------------------------------------------- +2004-09-26 + +- Version: 1.5.0 +- Public release of all changes since 1.4.1 +- Feature: New function to replace paragraphs in note editor + by linebreaks, this makes pasted text much nicer +- Feature: New option to toggle exporting of of floatimages +- Feature: z-plane of floatimages can be set (manually only) +- Bugfix: Wrong ordering of branches, if mainbranch is exactly left of + center + +----------------------------------------------------------- +2004-09-24 + +- Version: 1.4.7 +- Feature: New Export to XHTML (by Thomas Schraitle) +- Bugfix: vymLink +- Bugfix: spaces and dots in filenames +- Bugfix: Error message if xsltproc is not installed + +----------------------------------------------------------- +2004-09-15 + +- Version: 1.4.6 +- Feature: New file format: notes are saved as part of the .xml file +- Feature: Note Editor supports Rich Text now. +- Feature: Parser now also nows {\tt standardflag} (all letters lowercase) + +----------------------------------------------------------- +2004-08-23 + +- Version: 1.4.5 +- Feature: Correct handling of font size in Heading + +----------------------------------------------------------- +2004-07-29 + +- Version: 1.4.4 +- Selecting with cursor now works between subtrees +- Bugfix: vymLink was set to temporary dir in 1.4.3 + +----------------------------------------------------------- +2004-07-19 + +- Version: 1.4.3 +- Optimisation: Reduced canvas objects by only creating objects for used + flags +- Better visualization of moving branch above/below target +- Find Window informs with dialog, if the search failed +- System Flags are clickable now +- Reworked CSS and XST stylsheets (comments, indent, browser + compatibility) +- vymLinks are shown in statusbar +- current directory is save +- Rewritten load/save to improve multimap handling and unzipped files +- Bugfix: vymLinks don't get deleted when Cancel is pressed +- Bugfix: Fixed a bunch of bugs in XSL for HTML export +- Bugfix: More toolbar buttons disabled, if action not possible +- Bugfix: Renaming .vymfile now works +- Bugfix: mapChanged set when toggling flags +- Bugfix: CTRL-N was used twice +- Bugfix: Del didn't work on floatimage + +----------------------------------------------------------- +- Version: 1.4.2 +- Bugfix: Float image could not be deleted + +----------------------------------------------------------- +2004-05-25 + +- Version: 1.4.1 +- Bugfix: Color of branch not saved +- Bugfix: wrong path at HTML export +- Bugfix: map is not save with special characters in path + +----------------------------------------------------------- +2004-05-17 + +- Version: 1.4.0 +- Ask for confirmation before opening + a map in multiple editors +- Save state of note editor (visible/minimized) +- Export to HTML +- Author and Comment is saved in map +- Stats are shown in Edit MapInfo +- Changes for OS X port (QCursor, QContextMenuEvent) +- Bugfix: Fonts from note editor are save now +- Bugfix: invisible image when parent is scrolled +- Bugfix: Segfault pressing "enter" for floatimage +- Bugfix: Images can't be outside of exported area + anymore. +- Bugfix: Filenames with blanks +- Bugfix: Old maplink is shown when editing maplink +- Bugfix: always show cursor while editing heading + +----------------------------------------------------------- +2004-04-16 + +- Version: 1.3.5 +- Export map to dir +- Export to any of QTs image formats +- Also right side of selection is always visible now. + +----------------------------------------------------------- +2004-04-07 + +- Version: 1.3.4 +- Load last maps in file menu +- save last image path for loading +- Also export standard flags to dir. + +----------------------------------------------------------- +2004-03-26 + +- Version: 1.3.3 +- Enabled
in headings as manual linebreak +- Heading can be copied to URL +- Bugfix: GIFs are automatically converted to PNG now + +----------------------------------------------------------- +2004-03-26 + +- Version: 1.3.2 +- Add and move branches above/below selection, Texteditor copy all, + +----------------------------------------------------------- +2004-03-25 + +- Version: 1.3.1 +- Export to directory, changed naming in .vym + +----------------------------------------------------------- +2004-03-23 + +- Version: 1.3.0 +- Bugfix: Check if map can be saved at all + +----------------------------------------------------------- +2004-03-22 + +- Version: 1.2.12 +- Select image format before saving image + +----------------------------------------------------------- +2004-03-18 + +- Version: 1.2.11 +- Selecting mainbranches by up/down +- Export ASCII (experimental) +- Each map can be saved individually at quit +- Bugfix: Opening VymLink crashes QT +- Bugfix: 50\% less objects on canvas +- Bugfix: Ignoring LANG, now always written as UTF8 + +----------------------------------------------------------- +2004-03-16 + +- Version: 1.2.10 +- Sort Mainbranches by angle to y-axis +- Import directory structure +- Bugfix: Set FrameType of MapCenter while loading map + +----------------------------------------------------------- +2004-03-12 + +- Version: 1.2.9 +- Jump to another vym map +- Mainbranches are alwas ordered clockwise + +----------------------------------------------------------- +2004-03-03 + +- Version: 1.2.8 +- Change frame types in context menu + +----------------------------------------------------------- +2004-02-25 + +- Version: 1.2.7 +- Copy / Paste and save Floatimages + +----------------------------------------------------------- +2004-02-24 + +- Version: 1.2.6 +- Closing vym in KDE now asks for save, too +- Context menu for branches +- Selection is saved in .vym file + +----------------------------------------------------------- +2004-02-18 + +- Version: 1.2.5 +- URLs to external links can be added +- All actions are deactived if not possible + +----------------------------------------------------------- +2004-02-16 + +- Version: 1.2.4 +- Images: Can be loaded, saved, relinked to other parents + +----------------------------------------------------------- +2004-01-27 + +- Version: 1.2.3 +- Zoom: Reset and finer steps shrinking/enlarging + +----------------------------------------------------------- +2004-01-27 + +- Version: 1.2.2 +- Editing of links (style and color) + +----------------------------------------------------------- +2004-01-27 + +- Version: 1.2.1 +- Bugfix: LineEdit when adding branch has correct position again. + +----------------------------------------------------------- +2004-01-23 + +- Version: 1.2.0 +- Scrolled parts are automatically unscrolled when selected and scrolled + again later. +- Bugfix: Save flag is updated when multiple maps are opened +- Bugfix: Moving of branches is faster and more accurat when adding to + mapcenter + +----------------------------------------------------------- +2003-12-04 + +- Version: 1.1.7 +- Bugfix: Remember filename of note in noteeditor + +----------------------------------------------------------- +2003-12-02 + +- Version: 1.1.6 +- Find Text also in Notes. + +----------------------------------------------------------- +2003-11-07 + +- Version: 1.1.5 +- Bugfix: Correct setting and positioning when relinking branches + +----------------------------------------------------------- +2003-11-03 + +- Version: 1.1.4 +- Scroll mode added (folding of subtrees). +- Bugfix: Wrong position of linedit in zoomed view + +----------------------------------------------------------- +2003-10-09 + +- Version: 1.1.3 +- Added clear button in find window, bugfixes + +----------------------------------------------------------- +2003-10-07 + +- Version: 1.1.2 +- Links can be colored with color of heading + +----------------------------------------------------------- +2003-09-26 + +- Version: 1.1.1 +- Improved visualization of linking to new branch + +----------------------------------------------------------- +2003-09-25 + +- Version: 1.1.0 +- Find Function +- Selection always stays in view + +----------------------------------------------------------- +2003-09-18 + +- Version: 1.0.1 +- Find function scrolls to result now +- Bugfix: Adding branch with midmouse +- Bugfix: multiple repositioning of map, when noteeditor was changed + (speedup) +- New Linestyles (still hardcoded) + +----------------------------------------------------------- +2003-09-16 + +- Version: 1.0.0 +- First public stable release + +----------------------------------------------------------- +- Version: 0.9.0 +- added quick color picker (CTRL + Left Mouse) ? + +----------------------------------------------------------- +- Version: 0.8.0 +- added automatic canvas resizer, removed manual resizing of canvas +- added settings option to paste text into new branch +- simplified code +- Added heart flag +- Choose and switch between fixed and variable width fonts +- note editor +- Fixed segfault caused by undo and a call of updateNoteFlag of note + editor +- Added settings menu to configure autoselect and autoedit mode +- autoedit and autoselect mode +- Fixed ugly display problem with QT Palette (Klaas Freitag) +- Reduced temporary directories from 4 to 1 +- Added wordwrap in printing of notes +- New toolbar buttons in texteditor +- Set background color +- Fixed bug: Flags in toolbar not updated when selecting map center + +----------------------------------------------------------- +- Version: 0.7.0 +- No more segfault, when an object is deleted while being edited +- Keep focus constant when zooming in/out +- Export as png graphic +- Keep Center of map where it is while zooming +- Added Standard Flags (Smiley, Hook, Stopsign, ...) +- MDI: Multi Document Interface enables working on several maps + simultanously +- Enabled creating a new map via argument on commandline +- Changed file extension from .mmap to .vym +- noteeditor changes color, if empty or nothing is selected +- Changes in NoteEditor window are recognized by main window, too, thus + preventing loosing data when quitting the program. + +----------------------------------------------------------- +- Version: 0.6.0 +- New rendering engine: Faster, no flickering + +----------------------------------------------------------- +- Version: 0.5.0 +- Changed printing to use maximum space on paper +- Note editor is hidden, too, when mapeditor is minimized +- New (compressed) file format + +----------------------------------------------------------- +- Version: 0.4.0 +- Size of map is saved +- Multi Line Headings +- Reworked Rendering Engine: Much faster now. +- Reworked Undo: Much faster now. +- Enabled moving of map center +- Multi-line headings + +----------------------------------------------------------- +- Version: 0.3.0 +- Introduced Undo +- Fixed some bugs + +----------------------------------------------------------- +- Version: 0.2.0 +- Moving view of map improved: +- New handling (acrobat reader style) +- New mousepointer +- Several tools to color a map + +----------------------------------------------------------- +- Version: 0.1.0 +- Inital version, basic map layout +- Data is stored in XML diff -r db50e4164311 -r 84f76a3876d7 version.h --- a/version.h Wed Jun 14 14:43:18 2006 +0000 +++ b/version.h Tue Jul 04 12:10:56 2006 +0000 @@ -2,7 +2,7 @@ #define VERSION_H #define __VYM "VYM" -#define __VYM_VERSION "1.7.50" -#define __BUILD_DATE "June 12, 2006" +#define __VYM_VERSION "1.8.50" +#define __BUILD_DATE "June 16, 2006" #endif