hideLinkInExport for Branches (Floats still missing). Floats are now OrnamentedObj.
1.1 Binary file demos/todo.vym has changed
2.1 --- a/main.cpp Tue Mar 14 14:27:04 2006 +0000
2.2 +++ b/main.cpp Tue Mar 14 14:27:08 2006 +0000
2.3 @@ -51,6 +51,7 @@
2.4 QAction *actionEditFATE2URL;
2.5 QAction *actionEditOpenVymLink;
2.6 QAction *actionEditVymLink;
2.7 +QAction *actionEditToggleHideExport;
2.8 QAction *actionEditDeleteVymLink;
2.9 QAction *actionEditMapInfo;
2.10 QAction *actionEditHeading;
2.11 @@ -127,32 +128,10 @@
2.12 {
2.13 QApplication app(argc,argv);
2.14
2.15 - QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
2.16 - factory->setPixmap("vym_48x48", QPixmap(vym_48x48_xpm));
2.17 - factory->setPixmap("vym_128x128", QPixmap(vym_128x128_xpm));
2.18 - qInitNetworkProtocols();
2.19 -
2.20 - // Use /usr/share/vym or /usr/local/share/vym or . ?
2.21 - QDir vymBaseDir;
2.22 - vymBaseDir.setPath ("/usr/share/vym");
2.23 - if (!vymBaseDir.exists())
2.24 - vymBaseDir.setPath ("/usr/local/share/vym");
2.25 - if (!vymBaseDir.exists())
2.26 - vymBaseDir.setPath(vymBaseDir.currentDirPath() );
2.27 -
2.28 - // Initialize translations
2.29 - QTranslator translator (0);
2.30 - translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang");
2.31 - app.installTranslator( &translator );
2.32 -
2.33 - // Initializing the row of system flags
2.34 - // is done in first call to MapEditor(),
2.35 - // because we need at least one canvas first
2.36 - systemFlagsDefault=NULL;
2.37 - standardFlagsDefault=NULL;
2.38
2.39 // Reading and initializing options commandline options
2.40 options.add ("version", SwitchOption, "v","version");
2.41 + options.add ("local", SwitchOption, "l", "local");
2.42 options.add ("help", SwitchOption, "h", "help");
2.43 options.add ("quit", SwitchOption, "q", "quit");
2.44 options.add ("test", StringOption, "t", "test");
2.45 @@ -178,6 +157,20 @@
2.46 return 0;
2.47 }
2.48
2.49 + // Use /usr/share/vym or /usr/local/share/vym or . ?
2.50 + QDir vymBaseDir;
2.51 + if (options.isOn ("local"))
2.52 + {
2.53 + vymBaseDir.setPath (vymBaseDir.currentDirPath());
2.54 + }else
2.55 + {
2.56 + vymBaseDir.setPath ("/usr/share/vym");
2.57 + if (!vymBaseDir.exists())
2.58 + vymBaseDir.setPath ("/usr/local/share/vym");
2.59 + if (!vymBaseDir.exists())
2.60 + vymBaseDir.setPath(vymBaseDir.currentDirPath() );
2.61 + }
2.62 +
2.63 if (options.isOn ("help"))
2.64 {
2.65 cout << options.getHelpText()<<endl;
2.66 @@ -190,6 +183,23 @@
2.67 cout << "Testing: "<<options.getArg("test")<< endl;
2.68 }
2.69
2.70 +
2.71 + QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
2.72 + factory->setPixmap("vym_128x128", QPixmap(vym_128x128_xpm));
2.73 + qInitNetworkProtocols();
2.74 +
2.75 +
2.76 + // Initialize translations
2.77 + QTranslator translator (0);
2.78 + translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang");
2.79 + app.installTranslator( &translator );
2.80 +
2.81 + // Initializing the row of system flags
2.82 + // is done in first call to MapEditor(),
2.83 + // because we need at least one canvas first
2.84 + systemFlagsDefault=NULL;
2.85 + standardFlagsDefault=NULL;
2.86 +
2.87 // Initialize window of TextEditor
2.88 textEditor = new TextEditor();
2.89 textEditor->setIcon (QPixmap (vym_editor_xpm));
3.1 --- a/mainwindow.cpp Tue Mar 14 14:27:04 2006 +0000
3.2 +++ b/mainwindow.cpp Tue Mar 14 14:27:08 2006 +0000
3.3 @@ -107,6 +107,7 @@
3.4 extern QAction *actionEditOpenVymLink;
3.5 extern QAction *actionEditVymLink;
3.6 extern QAction *actionEditDeleteVymLink;
3.7 +extern QAction *actionEditToggleHideExport;
3.8 extern QAction *actionEditMapInfo;
3.9 extern QAction *actionEditHeading;
3.10 extern QAction *actionEditDelete;
3.11 @@ -391,7 +392,7 @@
3.12 connect( a, SIGNAL( activated() ), this, SLOT( fileImportKDEBookmarks() ) );
3.13 a->addTo (importMenu);
3.14
3.15 - a = new QAction( tr( "Import")+" "+tr("Mind Manager" ), QPixmap(), tr("Mind Manager")+QString("..."), 0, this, "importMM" );
3.16 + a = new QAction( tr( "Import")+" Mind Manager" , QPixmap(), "Mind Manager...", 0, this, "importMM" );
3.17 connect( a, SIGNAL( activated() ), this, SLOT( fileImportMM() ) );
3.18 a->addTo (importMenu);
3.19
3.20 @@ -556,6 +557,13 @@
3.21 a->setEnabled (false);
3.22 actionEditDeleteVymLink=a;
3.23
3.24 + a = new QAction( tr( "Hide object in exports" ), QPixmap("icons/flag-hideexport.png"), tr( "Hide in exports" ), 0, this, "hideExport" );
3.25 + connect( a, SIGNAL( activated() ), this, SLOT( editToggleHideExport() ) );
3.26 + a->setToggleAction(true);
3.27 + a->addTo( tb );
3.28 + a->setEnabled (false);
3.29 + actionEditToggleHideExport=a;
3.30 +
3.31 a = new QAction( tr( "Edit Map Info" ), QPixmap(), tr( "Edit Map Info"+QString("...") ), 0, this, "editMapInfo" );
3.32 connect( a, SIGNAL( activated() ), this, SLOT( editMapInfo() ) );
3.33 a->setEnabled (true);
3.34 @@ -889,6 +897,11 @@
3.35 fo->setToolTip(tr("subtree is temporary scrolled","Systemflag"));
3.36 systemFlagsDefault->addFlag (fo);
3.37
3.38 + fo->load(QPixmap("icons/flag-hideexport.png"));
3.39 + fo->setName("hideInExport");
3.40 + fo->setToolTip(tr("Hide object in exported maps","Systemflag"));
3.41 + systemFlagsDefault->addFlag (fo);
3.42 +
3.43 // Create Standard Flags
3.44 standardFlagsDefault = new FlagRowObj ();
3.45 standardFlagsDefault->setVisibility (false);
3.46 @@ -984,6 +997,7 @@
3.47 fo->setName("lifebelt");
3.48 fo->setToolTip(tr("This will help","Standardflag"));
3.49 standardFlagsDefault->addFlag (fo);
3.50 +
3.51 delete (fo);
3.52
3.53 standardFlagsDefault->makeToolbar(this, "Standard Flags");
3.54 @@ -1171,35 +1185,39 @@
3.55 floatimageContextMenu->insertSeparator();
3.56 actionFormatHideLinkUnselected->addTo( floatimageContextMenu );
3.57
3.58 - exportMenu->insertItem ( tr("Export as Image"),exportImageFormatMenu);
3.59 + exportMenu->insertItem ( tr("Export as")+" Image",exportImageFormatMenu);
3.60
3.61 a = new QAction( tr( "Export in Open Document Format used e.g. in Open Office " ), QPixmap(), "Open Office"+QString("..."), 0, this, "exportOOPresentation" );
3.62 connect( a, SIGNAL( activated() ), this, SLOT( fileExportOOPresentation() ) );
3.63 a->addTo (exportMenu);
3.64
3.65 - a = new QAction( tr( "Export as webpage (XHTML)" ), QPixmap(), "Webpage (XHTML)...", ALT + Key_X, this, "exportXHTML" );
3.66 + a = new QAction( tr( "Export as")+" webpage (XHTML)" , QPixmap(), "Webpage (XHTML)...", ALT + Key_X, this, "exportXHTML" );
3.67 connect( a, SIGNAL( activated() ), this, SLOT( fileExportXHTML() ) );
3.68 a->addTo( exportMenu );
3.69
3.70 - a = new QAction( tr( "Export as ASCII")+" "+tr("(still experimental)" ), QPixmap(), "Text (ASCII)...", 0, this, "exportASCII" );
3.71 + a = new QAction( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" ), QPixmap(), "Text (ASCII)...", 0, this, "exportASCII" );
3.72 connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
3.73 a->addTo( exportMenu );
3.74
3.75 - a = new QAction( tr( "Export as Taskjuggler")+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
3.76 + a = new QAction( tr( "Export as")+" "+tr("KDE Bookmarks" ), QPixmap(), tr("KDE Bookmarks"), 0, this, "importKDEBookmarks" );
3.77 + connect( a, SIGNAL( activated() ), this, SLOT( fileExportKDEBookmarks() ) );
3.78 + a->addTo (exportMenu);
3.79 +
3.80 + a = new QAction( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ), QPixmap(), "Taskjuggler...", 0, this, "exportTJ" );
3.81 connect( a, SIGNAL( activated() ), this, SLOT( fileExportTaskjuggler() ) );
3.82 a->addTo( exportMenu );
3.83
3.84 - a = new QAction( tr( "Export as LaTeX")+" "+tr("(still experimental)" ), QPixmap(), "LaTeX...", 0, this, "exportLaTeX" );
3.85 + a = new QAction( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" ), QPixmap(), "LaTeX...", 0, this, "exportLaTeX" );
3.86 connect( a, SIGNAL( activated() ), this, SLOT( fileExportLaTeX() ) );
3.87 a->addTo( exportMenu );
3.88
3.89 - a = new QAction( tr( "Export as XML" ), QPixmap(), "XML...", 0, this, "exportXML" );
3.90 + a = new QAction( tr( "Export as")+" XML" , QPixmap(), "XML...", 0, this, "exportXML" );
3.91 connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
3.92 a->addTo( exportMenu );
3.93
3.94 if (settings.readBoolEntry( "/vym/mainwindow/showTestMenu",false))
3.95 {
3.96 - a = new QAction( tr( "Export as HTML" ), QPixmap(), "HTML...", 0, this, "exportHTML");
3.97 + a = new QAction( tr( "Export as")+" HTML" , QPixmap(), "HTML...", 0, this, "exportHTML");
3.98 connect( a, SIGNAL( activated() ), this, SLOT( fileExportHTML() ) );
3.99 a->addTo( exportMenu );
3.100 }
3.101 @@ -1931,6 +1949,16 @@
3.102 }
3.103 }
3.104
3.105 +void Main::fileExportKDEBookmarks()
3.106 +{
3.107 + ExportKDEBookmarks ex;
3.108 + if (currentMapEditor())
3.109 + {
3.110 + ex.setMapCenter (currentMapEditor()->getMapCenter() );
3.111 + ex.doExport();
3.112 + }
3.113 +}
3.114 +
3.115 void Main::fileExportTaskjuggler()
3.116 {
3.117 ExportTaskjuggler ex;
3.118 @@ -1938,7 +1966,7 @@
3.119 {
3.120 ex.setMapCenter (currentMapEditor()->getMapCenter() );
3.121 ex.setCaption ( __VYM " - "+tr("Export to")+" Taskjuggler"+tr("(still experimental)"));
3.122 - ex.addFilter ("Taskjuggler (*.tj)");
3.123 + ex.addFilter ("Taskjuggler (*.tjp)");
3.124 if (ex.execDialog()) ex.doExport();
3.125 }
3.126 }
3.127 @@ -2194,6 +2222,12 @@
3.128 currentMapEditor()->deleteVymLink();
3.129 }
3.130
3.131 +void Main::editToggleHideExport()
3.132 +{
3.133 + if (currentMapEditor())
3.134 + currentMapEditor()->toggleHideExport();
3.135 +}
3.136 +
3.137 void Main::editMapInfo()
3.138 {
3.139 if (currentMapEditor())
4.1 --- a/mainwindow.h Tue Mar 14 14:27:04 2006 +0000
4.2 +++ b/mainwindow.h Tue Mar 14 14:27:08 2006 +0000
4.3 @@ -74,6 +74,7 @@
4.4 void fileExportImage(int);
4.5 void fileExportASCII();
4.6 void fileExportLaTeX();
4.7 + void fileExportKDEBookmarks();
4.8 void fileExportTaskjuggler();
4.9 void fileExportOOPresentation();
4.10 void fileCloseMap();
4.11 @@ -100,6 +101,7 @@
4.12 void editOpenVymLink();
4.13 private slots:
4.14 void editDeleteVymLink();
4.15 + void editToggleHideExport();
4.16 void editMapInfo();
4.17 void editMoveUp();
4.18 void editMoveDown();
5.1 --- a/mapeditor.cpp Tue Mar 14 14:27:04 2006 +0000
5.2 +++ b/mapeditor.cpp Tue Mar 14 14:27:08 2006 +0000
5.3 @@ -66,6 +66,7 @@
5.4 extern QAction *actionEditOpenVymLink;
5.5 extern QAction *actionEditVymLink;
5.6 extern QAction *actionEditDeleteVymLink;
5.7 +extern QAction *actionEditToggleHideExport;
5.8 extern QAction *actionEditHeading;
5.9 extern QAction *actionEditDelete;
5.10 extern QAction *actionEditAddBranch;
5.11 @@ -801,6 +802,7 @@
5.12 reader.setErrorHandler( &handler );
5.13 handler.setMapEditor( this );
5.14 handler.setTmpDir (filePath.left(filePath.findRev("/",-1))); // needed to load files with rel. path
5.15 + handler.setInputFile (file.name());
5.16 handler.setLoadMode (lmode);
5.17 blockSaveState=true;
5.18 bool ok = reader.parse( source );
5.19 @@ -2073,7 +2075,7 @@
5.20 {
5.21 saveState(selection); //TODO undoCommand
5.22 BranchObj *bo=(BranchObj*)selection;
5.23 - bo->setColor(actColor, false); // color links, color childs
5.24 + bo->setColor(actColor); // color branch
5.25 }
5.26 }
5.27 }
5.28 @@ -2087,7 +2089,7 @@
5.29 {
5.30 saveState(selection); //TODO undoCommand
5.31 BranchObj *bo=(BranchObj*)selection;
5.32 - bo->setColor(actColor, true); // color links, color childs
5.33 + bo->setColorChilds(actColor); // color links, color childs
5.34 }
5.35 }
5.36 }
5.37 @@ -2295,6 +2297,23 @@
5.38 }
5.39 }
5.40
5.41 +void MapEditor::toggleHideExport()
5.42 +{
5.43 + if (selection && (typeid(*selection) == typeid(BranchObj) ||
5.44 + typeid(*selection) == typeid(MapCenterObj)) //||
5.45 +// (typeid(*selection)==typeid(FloatImageObj))
5.46 + )
5.47 + {
5.48 + saveState(); //TODO undoCommand
5.49 + BranchObj *bo=(BranchObj*)selection;
5.50 + bo->setHideInExport(actionEditToggleHideExport->isOn());
5.51 + updateActions();
5.52 + mapCenter->reposition();
5.53 + adjustCanvasSize();
5.54 + canvas()->update();
5.55 + }
5.56 +}
5.57 +
5.58 QString MapEditor::getVymLink()
5.59 {
5.60 if (selection && (typeid(*selection) == typeid(BranchObj) ||
5.61 @@ -2463,6 +2482,8 @@
5.62 actionEditOpenVymLink->setEnabled (true);
5.63 actionEditDeleteVymLink->setEnabled (true);
5.64 }
5.65 + actionEditToggleHideExport->setEnabled (true);
5.66 + actionEditToggleHideExport->setOn (bo->hideInExport() );
5.67
5.68 actionEditCopy->setEnabled (true);
5.69 actionEditCut->setEnabled (true);
5.70 @@ -2499,10 +2520,11 @@
5.71 actionEditOpenURL->setEnabled (false);
5.72 actionEditOpenVymLink->setEnabled (false);
5.73 actionEditDeleteVymLink->setEnabled (false);
5.74 + actionEditToggleHideExport->setEnabled (false);
5.75
5.76 actionEditCopy->setEnabled (true);
5.77 actionEditCut->setEnabled (true);
5.78 - actionEditPaste->setEnabled (false); //FIXME
5.79 + actionEditPaste->setEnabled (false);
5.80 for (a=actionListBranches.first();a;a=actionListBranches.next())
5.81 a->setEnabled(false);
5.82 actionEditDelete->setEnabled (true);
5.83 @@ -2835,7 +2857,7 @@
5.84 dst->addBranch();
5.85 bo=dst->getLastBranch();
5.86 bo->setHeading (fi->fileName() );
5.87 - bo->setColor (QColor("blue"),false);
5.88 + bo->setColor (QColor("blue"));
5.89 bo->toggleScroll();
5.90 if ( !d.cd(fi->fileName()) )
5.91 QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory %1").arg(fi->fileName()));
5.92 @@ -2858,7 +2880,7 @@
5.93 dst->addBranch();
5.94 bo=dst->getLastBranch();
5.95 bo->setHeading (fi->fileName() );
5.96 - bo->setColor (QColor("black"),false);
5.97 + bo->setColor (QColor("black"));
5.98 if (fi->fileName().right(4) == ".vym" )
5.99 bo->setVymLink (fi->filePath());
5.100
5.101 @@ -3094,6 +3116,8 @@
5.102 } else
5.103 if (foname=="note")
5.104 mainWindow->windowToggleNoteEditor();
5.105 + else
5.106 + if (foname=="hideInExport") toggleHideExport();
5.107 }
5.108 }
5.109
5.110 @@ -3295,12 +3319,12 @@
5.111 {
5.112 if (e->state() & QMouseEvent::ShiftButton)
5.113 {
5.114 - ((BranchObj*)selection)->setColor (((BranchObj*)(dst))->getColor(),false);
5.115 + ((BranchObj*)selection)->setColor (((BranchObj*)(dst))->getColor());
5.116 ((BranchObj*)selection)->setLinkColor ();
5.117 }
5.118 else
5.119 {
5.120 - ((BranchObj*)selection)->setColor (((BranchObj*)(dst))->getColor(),true);
5.121 + ((BranchObj*)selection)->setColorChilds (((BranchObj*)(dst))->getColor());
5.122 ((BranchObj*)selection)->setLinkColor ();
5.123 }
5.124 }
6.1 --- a/mapeditor.h Tue Mar 14 14:27:04 2006 +0000
6.2 +++ b/mapeditor.h Tue Mar 14 14:27:08 2006 +0000
6.3 @@ -128,6 +128,7 @@
6.4 void editVymLink(); // edit link to another map
6.5 void deleteVymLink(); // delete link to another map
6.6 QString getVymLink(); // return path to map
6.7 + void toggleHideExport(); // toggle the export flag
6.8 void removeBranchHere(); // remove but keep childs
6.9 void removeChilds(); // remove childs
6.10 void editMapInfo(); // dialog to enter author, ...
7.1 --- a/ornamentedobj.cpp Tue Mar 14 14:27:04 2006 +0000
7.2 +++ b/ornamentedobj.cpp Tue Mar 14 14:27:08 2006 +0000
7.3 @@ -53,13 +53,19 @@
7.4 standardFlags=new FlagRowObj(canvas);
7.5 standardFlags->clone(standardFlagsDefault);
7.6 standardFlags->setName ("standardFlags");
7.7 +
7.8 + hideExport=false;
7.9 +
7.10 + url="";
7.11 + vymLink="";
7.12 +
7.13 }
7.14
7.15 void OrnamentedObj::copy (OrnamentedObj* other)
7.16 {
7.17 LinkableMapObj::copy(other);
7.18 heading->copy(other->heading);
7.19 - setColor (other->heading->getColor(),false);
7.20 + setColor (other->heading->getColor());
7.21
7.22 note.copy (other->note);
7.23 systemFlags->copy (other->systemFlags);
7.24 @@ -67,6 +73,9 @@
7.25
7.26 ornamentsBBox=other->ornamentsBBox;
7.27
7.28 + hideExport=other->hideExport;
7.29 + url=other->url;
7.30 + vymLink=other->vymLink;
7.31 }
7.32
7.33 QString OrnamentedObj::getHeading()
7.34 @@ -82,6 +91,12 @@
7.35 LinkableMapObj::setLinkColor (mapEditor->getDefLinkColor());
7.36 }
7.37
7.38 +void OrnamentedObj::setColor (QColor col)
7.39 +{
7.40 + heading->setColor(col);
7.41 + setLinkColor();
7.42 +}
7.43 +
7.44 QColor OrnamentedObj::getColor ()
7.45 {
7.46 return heading->getColor();
7.47 @@ -195,6 +210,59 @@
7.48 return note.getNoteOpenDoc();
7.49 }
7.50
7.51 +void OrnamentedObj::setURL(QString s)
7.52 +{
7.53 + url=s;
7.54 + if (!url.isEmpty())
7.55 + systemFlags->activate("url");
7.56 + else
7.57 + systemFlags->deactivate("url");
7.58 + calcBBoxSize(); // recalculate bbox
7.59 + positionBBox(); // rearrange contents
7.60 + forceReposition();
7.61 +}
7.62 +
7.63 +QString OrnamentedObj::getURL()
7.64 +{
7.65 + return url;
7.66 +}
7.67 +
7.68 +void OrnamentedObj::setVymLink(QString s)
7.69 +{
7.70 + if (!s.isEmpty())
7.71 + {
7.72 + // We need the relative (from loading)
7.73 + // or absolute path (from User event)
7.74 + // and build the absolute path.
7.75 + // Note: If we have relative, use path of
7.76 + // current map to build absolute path
7.77 + QDir d(s);
7.78 + if (!d.path().startsWith ("/"))
7.79 + {
7.80 + QString p=mapEditor->getDestPath();
7.81 + int i=p.findRev("/",-1);
7.82 + d.setPath(p.left(i)+"/"+s);
7.83 + d.convertToAbs();
7.84 + }
7.85 + vymLink=d.path();
7.86 + systemFlags->activate("vymLink");
7.87 + }
7.88 + else
7.89 + {
7.90 + systemFlags->deactivate("vymLink");
7.91 + vymLink="";
7.92 + }
7.93 + calcBBoxSize(); // recalculate bbox
7.94 + positionBBox(); // rearrange contents
7.95 + forceReposition();
7.96 +}
7.97 +
7.98 +QString OrnamentedObj::getVymLink()
7.99 +{
7.100 + return vymLink;
7.101 +}
7.102 +
7.103 +
7.104 void OrnamentedObj::toggleStandardFlag(QString f, bool exclusive)
7.105 {
7.106 standardFlags->toggle(f,exclusive);
7.107 @@ -239,3 +307,46 @@
7.108 }
7.109 }
7.110
7.111 +void OrnamentedObj::setHideInExport(bool b)
7.112 +{
7.113 + hideExport=b;
7.114 + if (b)
7.115 + systemFlags->activate("hideInExport");
7.116 + else
7.117 + systemFlags->deactivate("hideInExport");
7.118 + calcBBoxSize();
7.119 + positionBBox();
7.120 + requestReposition();
7.121 +}
7.122 +
7.123 +bool OrnamentedObj::hideInExport()
7.124 +{
7.125 + return hideExport;
7.126 +}
7.127 +
7.128 +QString OrnamentedObj::getOrnAttr()
7.129 +{
7.130 + QString posAttr;
7.131 + if (depth==0 || depth==1) posAttr=
7.132 + attribut("absPosX",QString().setNum(absPos.x(),10)) +
7.133 + attribut("absPosY",QString().setNum(absPos.y(),10));
7.134 + else
7.135 + posAttr="";
7.136 +
7.137 + QString urlAttr;
7.138 + if (!url.isEmpty())
7.139 + urlAttr=attribut ("url",url);
7.140 +
7.141 + QString vymLinkAttr;
7.142 + if (!vymLink.isEmpty())
7.143 + vymLinkAttr=attribut ("vymLink",convertToRel(mapEditor->getDestPath(),vymLink) );
7.144 +
7.145 + QString hideExpAttr;
7.146 + if (hideExport)
7.147 + hideExpAttr= attribut("hideInExport","true");
7.148 + else
7.149 + hideExpAttr="";
7.150 +
7.151 + return posAttr +urlAttr +vymLinkAttr +getLinkAttr() +hideExpAttr;
7.152 +}
7.153 +
8.1 --- a/ornamentedobj.h Tue Mar 14 14:27:04 2006 +0000
8.2 +++ b/ornamentedobj.h Tue Mar 14 14:27:08 2006 +0000
8.3 @@ -12,13 +12,9 @@
8.4 virtual void init ();
8.5 virtual void copy (OrnamentedObj*);
8.6
8.7 - virtual void setHeading (QString s)=0; // set the heading, pure virtual
8.8 - // to take care of fontsize
8.9 virtual QString getHeading(); // returns the heading
8.10 virtual void setLinkColor(); // sets color according to colorhint, overloaded
8.11 - virtual void setVisibility(bool,int)=0; // set visibility
8.12 - virtual void setVisibility(bool)=0; // set vis. for w
8.13 - virtual void setColor(QColor,bool)=0; // set the color of text and link
8.14 + virtual void setColor(QColor); // set the color of text and link
8.15 QColor getColor (); // get color of heading
8.16 virtual void positionContents();
8.17 virtual void move (double,double);
8.18 @@ -32,11 +28,19 @@
8.19 virtual QString getNote(); // returns note (HTML)
8.20 virtual QString getNoteASCII(); // returns note (ASCII)
8.21 virtual QString getNoteOpenDoc(); // returns note (OpenDoc)
8.22 + virtual void setURL (QString);
8.23 + virtual QString getURL ();
8.24 + virtual void setVymLink (QString);
8.25 + virtual QString getVymLink ();
8.26 +
8.27 virtual void toggleStandardFlag(QString, bool);
8.28 virtual void activateStandardFlag(QString);
8.29 virtual QString getSystemFlagName (const QPoint &p);
8.30 virtual bool isActiveFlag(const QString&); // check if flag is set
8.31 virtual void updateNoteFlag();
8.32 + virtual void setHideInExport(bool); // set export of object (and childs)
8.33 + virtual bool hideInExport();
8.34 + virtual QString getOrnAttr(); // get attributes for saveToDir
8.35
8.36 protected:
8.37 HeadingObj *heading; // Heading
8.38 @@ -44,6 +48,9 @@
8.39 FlagRowObj *systemFlags; // System Flags
8.40 FlagRowObj *standardFlags; // Standard Flags
8.41 QRect ornamentsBBox; // bbox of flags and heading
8.42 + QString url; // url to external doc
8.43 + QString vymLink; // path to another map
8.44 + bool hideExport; // hide in exports if set
8.45 };
8.46
8.47 #endif
9.1 --- a/version.h Tue Mar 14 14:27:04 2006 +0000
9.2 +++ b/version.h Tue Mar 14 14:27:08 2006 +0000
9.3 @@ -2,7 +2,7 @@
9.4 #define VERSION_H
9.5
9.6 #define __VYM "VYM"
9.7 -#define __VYM_VERSION "1.7.10"
9.8 -#define __BUILD_DATE "March 8, 2006"
9.9 +#define __VYM_VERSION "1.7.11"
9.10 +#define __BUILD_DATE "March 14, 2006"
9.11
9.12 #endif
10.1 --- a/vym.pro Tue Mar 14 14:27:04 2006 +0000
10.2 +++ b/vym.pro Tue Mar 14 14:27:08 2006 +0000
10.3 @@ -79,6 +79,7 @@
10.4 TRANSLATIONS += lang/vym_de.ts
10.5 TRANSLATIONS += lang/vym_en.ts
10.6 TRANSLATIONS += lang/vym_es.ts
10.7 +TRANSLATIONS += lang/vym_it.ts
10.8
10.9
10.10