1.1 --- a/linkablemapobj.h Wed May 02 15:31:18 2007 +0000
1.2 +++ b/linkablemapobj.h Wed May 02 15:31:20 2007 +0000
1.3 @@ -18,7 +18,7 @@
1.4 class LinkableMapObj:public QObject, public MapObj {
1.5 Q_OBJECT
1.6 public:
1.7 - /*! Orientation of an object dependd on the position relative to the parent */
1.8 + /*! Orientation of an object depends on the position relative to the parent */
1.9 enum Orientation {
1.10 UndefinedOrientation, //!< Undefined
1.11 LeftOfCenter, //!< Object is left of center
2.1 --- a/main.cpp Wed May 02 15:31:18 2007 +0000
2.2 +++ b/main.cpp Wed May 02 15:31:20 2007 +0000
2.3 @@ -134,7 +134,6 @@
2.4 // Initialize window of TextEditor
2.5 textEditor = new TextEditor();
2.6 textEditor->setIcon (QPixmap (iconPath+"vym-editor.png"));
2.7 - if (textEditor->showWithMain()) textEditor->show();
2.8
2.9 // Initialize mainwindow
2.10 Main m;
3.1 --- a/mainwindow.cpp Wed May 02 15:31:18 2007 +0000
3.2 +++ b/mainwindow.cpp Wed May 02 15:31:20 2007 +0000
3.3 @@ -92,14 +92,22 @@
3.4
3.5 procBrowser=NULL;
3.6
3.7 - // Initialize history window;
3.8 + // Satellite windows //////////////////////////////////////////
3.9 +
3.10 + // history window
3.11 historyWindow=new HistoryWindow();
3.12 -
3.13 - // Initialize properties window
3.14 + connect (historyWindow, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.15 +
3.16 + // properties window
3.17 branchPropertyWindow = new BranchPropertyWindow();
3.18 - branchPropertyWindow->move (20,20);
3.19 - branchPropertyWindow->resize (settings.value( "/branchpropertywindow/geometry/size",QSize (150,100)).toSize());
3.20 - branchPropertyWindow->move (settings.value( "/branchpropertywindow/geometry/pos", QPoint(20,20)).toPoint());
3.21 + connect (branchPropertyWindow, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.22 +
3.23 + // Connect TextEditor, so that we can update flags if text changes
3.24 + connect (textEditor, SIGNAL (textHasChanged() ), this, SLOT (updateNoteFlag()));
3.25 + connect (textEditor, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.26 +
3.27 + // Connect HistoryWindow, so that we can update flags
3.28 + connect (historyWindow, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.29
3.30
3.31 // Initialize script editor
3.32 @@ -109,6 +117,15 @@
3.33 connect( scriptEditor, SIGNAL( runScript ( QString ) ),
3.34 this, SLOT( runScript( QString ) ) );
3.35
3.36 +
3.37 + // Initialize Find window
3.38 + findWindow=new FindWindow(NULL);
3.39 + findWindow->move (x(),y()+70);
3.40 + connect (findWindow, SIGNAL( findButton(QString) ),
3.41 + this, SLOT(editFind(QString) ) );
3.42 + connect (findWindow, SIGNAL( somethingChanged() ),
3.43 + this, SLOT(editFindChanged() ) );
3.44 +
3.45 // Initialize some settings, which are platform dependant
3.46 QString p,s;
3.47
3.48 @@ -165,23 +182,6 @@
3.49
3.50 restoreState (settings.value("/mainwindow/state",0).toByteArray());
3.51
3.52 - // Satellite windows //////////////////////////////////////////
3.53 -
3.54 - // Initialize Find window
3.55 - findWindow=new FindWindow(NULL);
3.56 - findWindow->move (x(),y()+70);
3.57 - connect (findWindow, SIGNAL( findButton(QString) ),
3.58 - this, SLOT(editFind(QString) ) );
3.59 - connect (findWindow, SIGNAL( somethingChanged() ),
3.60 - this, SLOT(editFindChanged() ) );
3.61 -
3.62 - // Connect TextEditor, so that we can update flags if text changes
3.63 - connect (textEditor, SIGNAL (textHasChanged() ), this, SLOT (updateNoteFlag()));
3.64 - connect (textEditor, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.65 -
3.66 - // Connect HistoryWindow, so that we can update flags
3.67 - connect (historyWindow, SIGNAL (windowClosed() ), this, SLOT (updateActions()));
3.68 -
3.69 updateGeometry();
3.70 }
3.71
3.72 @@ -637,15 +637,15 @@
3.73 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
3.74 actionEditHeading2URL=a;
3.75
3.76 - a = new QAction(tr( "Create URL to Bugzilla","Edit menu" ), this);
3.77 - a->setStatusTip ( tr( "Create URL to Bugzilla" ));
3.78 + a = new QAction(tr( "Create URL to Novell Bugzilla","Edit menu" ), this);
3.79 + a->setStatusTip ( tr( "Create URL to Novell Bugzilla" ));
3.80 a->setEnabled (false);
3.81 actionListBranches.append(a);
3.82 connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
3.83 actionEditBugzilla2URL=a;
3.84
3.85 - a = new QAction(tr( "Create URL to FATE","Edit menu" ), this);
3.86 - a->setStatusTip ( tr( "Create URL to FATE" ));
3.87 + a = new QAction(tr( "Create URL to Novell FATE","Edit menu" ), this);
3.88 + a->setStatusTip ( tr( "Create URL to Novell FATE" ));
3.89 a->setEnabled (false);
3.90 actionListBranches.append(a);
3.91 connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
3.92 @@ -792,9 +792,10 @@
3.93 a->setStatusTip (tr( "Set properties for selection" ));
3.94 a->setShortcut ( Qt::CTRL + Qt::Key_I ); //Property window
3.95 a->setShortcutContext (Qt::WindowShortcut);
3.96 + a->setToggleAction (true);
3.97 addAction (a);
3.98 connect( a, SIGNAL( triggered() ), this, SLOT( windowToggleProperty() ) );
3.99 - actionTogglePropertyWindow=a;
3.100 + actionViewTogglePropertyWindow=a;
3.101 }
3.102
3.103 // Format Actions
3.104 @@ -942,15 +943,12 @@
3.105 viewMenu->addAction (a);
3.106 connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
3.107
3.108 + viewMenu->addSeparator();
3.109
3.110 a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor","View action" ),this);
3.111 a->setStatusTip ( tr( "Show Note Editor" ));
3.112 a->setShortcut ( Qt::CTRL + Qt::Key_E );
3.113 a->setToggleAction(true);
3.114 - if (textEditor->showWithMain())
3.115 - a->setOn(true);
3.116 - else
3.117 - a->setOn(false);
3.118 a->addTo( tb );
3.119 viewMenu->addAction (a);
3.120 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) );
3.121 @@ -965,7 +963,9 @@
3.122 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
3.123 actionViewToggleHistoryWindow=a;
3.124
3.125 - viewMenu->addAction (actionTogglePropertyWindow);
3.126 + viewMenu->addAction (actionViewTogglePropertyWindow);
3.127 +
3.128 + viewMenu->addSeparator();
3.129
3.130 a = new QAction(tr( "Antialiasing","View action" ),this );
3.131 a->setStatusTip ( tr( "Antialiasing" ));
3.132 @@ -1485,7 +1485,7 @@
3.133
3.134 // Context Menu for branch or mapcenter
3.135 branchContextMenu =new QMenu (this);
3.136 - branchContextMenu->addAction (actionTogglePropertyWindow);
3.137 + branchContextMenu->addAction (actionViewTogglePropertyWindow);
3.138 branchContextMenu->addSeparator();
3.139
3.140 // Submenu "Add"
3.141 @@ -1629,7 +1629,7 @@
3.142
3.143 void Main::showEvent (QShowEvent * )
3.144 {
3.145 - if (textEditor->showWithMain()) textEditor->showNormal();
3.146 + //FIXME if (textEditor->showWithMain()) textEditor->showNormal();
3.147 }
3.148
3.149 bool Main::reallyWriteDirectory(const QString &dir)
3.150 @@ -2465,7 +2465,7 @@
3.151 me=(MapEditor*)tabWidget->page(i);
3.152
3.153 // If something changed, ask what to do
3.154 - if (me->isUnsaved())
3.155 + if (me->hasChanged())
3.156 {
3.157 tabWidget->setCurrentPage(i);
3.158 QMessageBox mb( vymName,
3.159 @@ -3263,10 +3263,10 @@
3.160
3.161 void Main::windowToggleNoteEditor()
3.162 {
3.163 - if (textEditor->showWithMain() )
3.164 - windowHideNoteEditor();
3.165 + if (textEditor->isVisible() )
3.166 + textEditor->hide();
3.167 else
3.168 - windowShowNoteEditor();
3.169 + textEditor->show();
3.170 }
3.171
3.172 void Main::windowToggleHistory()
3.173 @@ -3284,6 +3284,7 @@
3.174 branchPropertyWindow->hide();
3.175 else
3.176 branchPropertyWindow->show();
3.177 +
3.178 if(currentMapEditor())
3.179 {
3.180 LinkableMapObj *sel=currentMapEditor()->getSelection();
3.181 @@ -3348,8 +3349,9 @@
3.182 historyWindow->setCaption (tr("History for %1").arg(currentMapEditor()->getFileName()));
3.183
3.184 // updateActions is also called when NoteEditor is closed
3.185 - actionViewToggleNoteEditor->setOn (textEditor->showWithMain());
3.186 - actionViewToggleHistoryWindow->setOn (historyWindow->showWithMain());
3.187 + actionViewToggleNoteEditor->setOn (textEditor->isVisible());
3.188 + actionViewToggleHistoryWindow->setOn (historyWindow->isVisible());
3.189 + actionViewTogglePropertyWindow->setOn (branchPropertyWindow->isVisible());
3.190
3.191 if (me->getMapLinkColorHint()==LinkableMapObj::HeadingColor)
3.192 actionFormatLinkColorHint->setOn(true);
3.193 @@ -3384,7 +3386,7 @@
3.194 actionFormatLinkColor->setIconSet( pix );
3.195
3.196
3.197 - actionFileSave->setEnabled( me->isUnsaved() );
3.198 + actionFileSave->setEnabled( me->hasChanged() );
3.199 if (me->isUndoAvailable())
3.200 actionEditUndo->setEnabled( true);
3.201 else
3.202 @@ -3548,14 +3550,12 @@
3.203
3.204 void Main::windowShowNoteEditor()
3.205 {
3.206 - textEditor->setShowWithMain(true);
3.207 textEditor->show();
3.208 actionViewToggleNoteEditor->setOn (true);
3.209 }
3.210
3.211 void Main::windowHideNoteEditor()
3.212 {
3.213 - textEditor->setShowWithMain(false);
3.214 textEditor->hide();
3.215 actionViewToggleNoteEditor->setOn (false);
3.216 }
4.1 --- a/mainwindow.h Wed May 02 15:31:18 2007 +0000
4.2 +++ b/mainwindow.h Wed May 02 15:31:20 2007 +0000
4.3 @@ -288,7 +288,6 @@
4.4
4.5 QActionGroup *actionGroupFormatFrameTypes;
4.6
4.7 - QAction *actionTogglePropertyWindow;
4.8
4.9 QActionGroup *actionGroupFormatLinkStyles;
4.10 QAction *actionFormatLinkStyleLine;
4.11 @@ -299,6 +298,7 @@
4.12
4.13 QAction *actionViewToggleNoteEditor;
4.14 QAction *actionViewToggleHistoryWindow;
4.15 + QAction *actionViewTogglePropertyWindow;
4.16 QAction *actionViewToggleAntiAlias;
4.17 QAction *actionViewToggleSmoothPixmapTransform;
4.18
5.1 --- a/mapeditor.cpp Wed May 02 15:31:18 2007 +0000
5.2 +++ b/mapeditor.cpp Wed May 02 15:31:20 2007 +0000
5.3 @@ -281,6 +281,93 @@
5.4 return s;
5.5 }
5.6
5.7 +void MapEditor::saveState(const SaveMode &savemode, const QString &undoSelection, const QString &undoCom, const QString &redoSelection, const QString &redoCom, const QString &comment, LinkableMapObj *saveSel)
5.8 +{
5.9 + // Main saveState
5.10 +
5.11 + if (blockSaveState) return;
5.12 +
5.13 + /* TODO remove after testing
5.14 + */
5.15 + if (debug) cout << "ME::saveState() for "<<mapName.ascii()<<endl;
5.16 +
5.17 + int undosAvail=undoSet.readNumEntry ("/history/undosAvail",0);
5.18 + int redosAvail=undoSet.readNumEntry ("/history/redosAvail",0);
5.19 + int curStep=undoSet.readNumEntry ("/history/curStep",0);
5.20 + // Find out current undo directory
5.21 + if (undosAvail<stepsTotal) undosAvail++;
5.22 + curStep++;
5.23 + if (curStep>stepsTotal) curStep=1;
5.24 +
5.25 + QString backupXML="";
5.26 + QString bakMapName=QDir::convertSeparators (QString("history-%1").arg(curStep));
5.27 + QString bakMapDir=QDir::convertSeparators (tmpMapDir +"/"+bakMapName);
5.28 + QString bakMapPath=QDir::convertSeparators(bakMapDir+"/map.xml");
5.29 +
5.30 + // Create bakMapDir if not available
5.31 + QDir d(bakMapDir);
5.32 + if (!d.exists())
5.33 + makeSubDirs (bakMapDir);
5.34 +
5.35 + // Save depending on how much needs to be saved
5.36 + if (saveSel)
5.37 + backupXML=saveToDir (bakMapDir,mapName+"-",false, QPointF (),saveSel);
5.38 +
5.39 + QString undoCommand="";
5.40 + if (savemode==UndoCommand)
5.41 + {
5.42 + undoCommand=undoCom;
5.43 + }
5.44 + else if (savemode==PartOfMap )
5.45 + {
5.46 + undoCommand=undoCom;
5.47 + undoCommand.replace ("PATH",bakMapPath);
5.48 + }
5.49 +
5.50 + if (!backupXML.isEmpty())
5.51 + // Write XML Data to disk
5.52 + saveStringToDisk (QString(bakMapPath),backupXML);
5.53 +
5.54 + // We would have to save all actions in a tree, to keep track of
5.55 + // possible redos after a action. Possible, but we are too lazy: forget about redos.
5.56 + redosAvail=0;
5.57 +
5.58 + // Write the current state to disk
5.59 + undoSet.setEntry ("/history/undosAvail",QString::number(undosAvail));
5.60 + undoSet.setEntry ("/history/redosAvail",QString::number(redosAvail));
5.61 + undoSet.setEntry ("/history/curStep",QString::number(curStep));
5.62 + undoSet.setEntry (QString("/history/step-%1/undoCommand").arg(curStep),undoCommand);
5.63 + undoSet.setEntry (QString("/history/step-%1/undoSelection").arg(curStep),undoSelection);
5.64 + undoSet.setEntry (QString("/history/step-%1/redoCommand").arg(curStep),redoCom);
5.65 + undoSet.setEntry (QString("/history/step-%1/redoSelection").arg(curStep),redoSelection);
5.66 + undoSet.setEntry (QString("/history/step-%1/comment").arg(curStep),comment);
5.67 + undoSet.setEntry (QString("/history/version"),vymVersion);
5.68 + undoSet.writeSettings(histPath);
5.69 +
5.70 + if (debug)
5.71 + {
5.72 + // TODO remove after testing
5.73 + //cout << " into="<< histPath.toStdString()<<endl;
5.74 + cout << " stepsTotal="<<stepsTotal<<
5.75 + ", undosAvail="<<undosAvail<<
5.76 + ", redosAvail="<<redosAvail<<
5.77 + ", curStep="<<curStep<<endl;
5.78 + cout << " ---------------------------"<<endl;
5.79 + cout << " comment="<<comment.toStdString()<<endl;
5.80 + cout << " undoCom="<<undoCommand.toStdString()<<endl;
5.81 + cout << " undoSel="<<undoSelection.toStdString()<<endl;
5.82 + cout << " redoCom="<<redoCom.toStdString()<<endl;
5.83 + cout << " redoSel="<<redoSelection.toStdString()<<endl;
5.84 + if (saveSel) cout << " saveSel="<<saveSel->getSelectString().ascii()<<endl;
5.85 + cout << " ---------------------------"<<endl;
5.86 + }
5.87 +
5.88 + mainWindow->updateHistory (undoSet);
5.89 + setChanged();
5.90 + updateActions();
5.91 +}
5.92 +
5.93 +
5.94 void MapEditor::saveStateChangingPart(LinkableMapObj *undoSel, LinkableMapObj* redoSel, const QString &rc, const QString &comment)
5.95 {
5.96 // save the selected part of the map, Undo will replace part of map
5.97 @@ -355,92 +442,6 @@
5.98 }
5.99
5.100
5.101 -void MapEditor::saveState(const SaveMode &savemode, const QString &undoSelection, const QString &undoCom, const QString &redoSelection, const QString &redoCom, const QString &comment, LinkableMapObj *saveSel)
5.102 -{
5.103 - // Main saveState
5.104 -
5.105 - if (blockSaveState) return;
5.106 -
5.107 - /* TODO remove after testing
5.108 - */
5.109 - if (debug) cout << "ME::saveState() for "<<mapName.ascii()<<endl;
5.110 -
5.111 - int undosAvail=undoSet.readNumEntry ("/history/undosAvail",0);
5.112 - int redosAvail=undoSet.readNumEntry ("/history/redosAvail",0);
5.113 - int curStep=undoSet.readNumEntry ("/history/curStep",0);
5.114 - // Find out current undo directory
5.115 - if (undosAvail<stepsTotal) undosAvail++;
5.116 - curStep++;
5.117 - if (curStep>stepsTotal) curStep=1;
5.118 -
5.119 - QString backupXML="";
5.120 - QString bakMapName=QDir::convertSeparators (QString("history-%1").arg(curStep));
5.121 - QString bakMapDir=QDir::convertSeparators (tmpMapDir +"/"+bakMapName);
5.122 - QString bakMapPath=QDir::convertSeparators(bakMapDir+"/map.xml");
5.123 -
5.124 - // Create bakMapDir if not available
5.125 - QDir d(bakMapDir);
5.126 - if (!d.exists())
5.127 - makeSubDirs (bakMapDir);
5.128 -
5.129 - // Save depending on how much needs to be saved
5.130 - if (saveSel)
5.131 - backupXML=saveToDir (bakMapDir,mapName+"-",false, QPointF (),saveSel);
5.132 -
5.133 - QString undoCommand="";
5.134 - if (savemode==UndoCommand)
5.135 - {
5.136 - undoCommand=undoCom;
5.137 - }
5.138 - else if (savemode==PartOfMap )
5.139 - {
5.140 - undoCommand=undoCom;
5.141 - undoCommand.replace ("PATH",bakMapPath);
5.142 - }
5.143 -
5.144 - if (!backupXML.isEmpty())
5.145 - // Write XML Data to disk
5.146 - saveStringToDisk (QString(bakMapPath),backupXML);
5.147 -
5.148 - // We would have to save all actions in a tree, to keep track of
5.149 - // possible redos after a action. Possible, but we are too lazy: forget about redos.
5.150 - redosAvail=0;
5.151 -
5.152 - // Write the current state to disk
5.153 - undoSet.setEntry ("/history/undosAvail",QString::number(undosAvail));
5.154 - undoSet.setEntry ("/history/redosAvail",QString::number(redosAvail));
5.155 - undoSet.setEntry ("/history/curStep",QString::number(curStep));
5.156 - undoSet.setEntry (QString("/history/step-%1/undoCommand").arg(curStep),undoCommand);
5.157 - undoSet.setEntry (QString("/history/step-%1/undoSelection").arg(curStep),undoSelection);
5.158 - undoSet.setEntry (QString("/history/step-%1/redoCommand").arg(curStep),redoCom);
5.159 - undoSet.setEntry (QString("/history/step-%1/redoSelection").arg(curStep),redoSelection);
5.160 - undoSet.setEntry (QString("/history/step-%1/comment").arg(curStep),comment);
5.161 - undoSet.setEntry (QString("/history/version"),vymVersion);
5.162 - undoSet.writeSettings(histPath);
5.163 -
5.164 - if (debug)
5.165 - {
5.166 - // TODO remove after testing
5.167 - //cout << " into="<< histPath.toStdString()<<endl;
5.168 - cout << " stepsTotal="<<stepsTotal<<
5.169 - ", undosAvail="<<undosAvail<<
5.170 - ", redosAvail="<<redosAvail<<
5.171 - ", curStep="<<curStep<<endl;
5.172 - cout << " ---------------------------"<<endl;
5.173 - cout << " comment="<<comment.toStdString()<<endl;
5.174 - cout << " undoCom="<<undoCommand.toStdString()<<endl;
5.175 - cout << " undoSel="<<undoSelection.toStdString()<<endl;
5.176 - cout << " redoCom="<<redoCom.toStdString()<<endl;
5.177 - cout << " redoSel="<<redoSelection.toStdString()<<endl;
5.178 - if (saveSel) cout << " saveSel="<<saveSel->getSelectString().ascii()<<endl;
5.179 - cout << " ---------------------------"<<endl;
5.180 - }
5.181 -
5.182 - mainWindow->updateHistory (undoSet);
5.183 - setChanged();
5.184 - updateActions();
5.185 -}
5.186 -
5.187 void MapEditor::parseAtom(const QString &atom)
5.188 {
5.189 BranchObj *selb=xelection.getBranch();
5.190 @@ -830,6 +831,50 @@
5.191 s=parser.parString(ok,0);
5.192 if (ok) setFrameType (s);
5.193 }
5.194 + } else if (com=="setFramePenColor")
5.195 + {
5.196 + if ( xelection.type()!=Branch && xelection.type()!= MapCenter && xelection.type()!=FloatImage)
5.197 + {
5.198 + parser.setError (Aborted,"Type of selection does not allow setting of pen color");
5.199 + }
5.200 + else if (parser.checkParamCount(1))
5.201 + {
5.202 + QColor c=parser.parColor(ok,0);
5.203 + if (ok) setFramePenColor (c);
5.204 + }
5.205 + } else if (com=="setFrameBrushColor")
5.206 + {
5.207 + if ( xelection.type()!=Branch && xelection.type()!= MapCenter && xelection.type()!=FloatImage)
5.208 + {
5.209 + parser.setError (Aborted,"Type of selection does not allow setting brush color");
5.210 + }
5.211 + else if (parser.checkParamCount(1))
5.212 + {
5.213 + QColor c=parser.parColor(ok,0);
5.214 + if (ok) setFrameBrushColor (c);
5.215 + }
5.216 + } else if (com=="setFramePadding")
5.217 + {
5.218 + if ( xelection.type()!=Branch && xelection.type()!= MapCenter && xelection.type()!=FloatImage)
5.219 + {
5.220 + parser.setError (Aborted,"Type of selection does not allow setting frame padding");
5.221 + }
5.222 + else if (parser.checkParamCount(1))
5.223 + {
5.224 + x=parser.parInt(ok,0);
5.225 + if (ok) setFramePadding(x);
5.226 + }
5.227 + } else if (com=="setFrameBorderWidth")
5.228 + {
5.229 + if ( xelection.type()!=Branch && xelection.type()!= MapCenter && xelection.type()!=FloatImage)
5.230 + {
5.231 + parser.setError (Aborted,"Type of selection does not allow setting frame border width");
5.232 + }
5.233 + else if (parser.checkParamCount(1))
5.234 + {
5.235 + x=parser.parInt(ok,0);
5.236 + if (ok) setFrameBorderWidth (x);
5.237 + }
5.238 } else if (com=="setMapAuthor")
5.239 {
5.240 if (parser.checkParamCount(1))
5.241 @@ -1084,11 +1129,6 @@
5.242 return mapDefault;
5.243 }
5.244
5.245 -bool MapEditor::isUnsaved()
5.246 -{
5.247 - return mapUnsaved;
5.248 -}
5.249 -
5.250 bool MapEditor::hasChanged()
5.251 {
5.252 return mapChanged;
5.253 @@ -1116,26 +1156,21 @@
5.254 close();
5.255 }
5.256
5.257 -void MapEditor::setFilePath(QString fname)
5.258 +void MapEditor::setFilePath(QString fpath, QString destname)
5.259 {
5.260 - setFilePath (fname,fname);
5.261 -}
5.262 -
5.263 -void MapEditor::setFilePath(QString fname, QString destname)
5.264 -{
5.265 - if (fname.isEmpty() || fname=="")
5.266 + if (fpath.isEmpty() || fpath=="")
5.267 {
5.268 filePath="";
5.269 fileName="";
5.270 destPath="";
5.271 } else
5.272 {
5.273 - filePath=fname; // becomes absolute path
5.274 - fileName=fname; // gets stripped of path
5.275 + filePath=fpath; // becomes absolute path
5.276 + fileName=fpath; // gets stripped of path
5.277 destPath=destname; // needed for vymlinks
5.278
5.279 - // If fname is not an absolute path, complete it
5.280 - filePath=QDir(fname).absPath();
5.281 + // If fpath is not an absolute path, complete it
5.282 + filePath=QDir(fpath).absPath();
5.283 fileDir=filePath.left (1+filePath.findRev ("/"));
5.284
5.285 // Set short name, too. Search from behind:
5.286 @@ -1147,6 +1182,11 @@
5.287 }
5.288 }
5.289
5.290 +void MapEditor::setFilePath(QString fpath)
5.291 +{
5.292 + setFilePath (fpath,fpath);
5.293 +}
5.294 +
5.295 QString MapEditor::getFilePath()
5.296 {
5.297 return filePath;
5.298 @@ -3442,30 +3482,30 @@
5.299 }
5.300 }
5.301
5.302 -void MapEditor::setFramePadding (const int &)
5.303 +void MapEditor::setFramePadding (const int &i)
5.304 {
5.305 BranchObj *bo=xelection.getBranch();
5.306 - /*
5.307 if (bo)
5.308 {
5.309 - saveState (bo, QString("setFrameBrushColor (\"%1\")").arg(bo->getFrameBrushColor().name() ),
5.310 - bo, QString ("setFrameBrushColor (\"%1\")").arg(c.name() ),QString ("set brush color of frame to %1").arg(c.name() ));
5.311 - bo->setFrameBrushColor (c);
5.312 + saveState (bo, QString("setFramePadding (\"%1\")").arg(bo->getFramePadding() ),
5.313 + bo, QString ("setFramePadding (\"%1\")").arg(i),QString ("set brush color of frame to %1").arg(i));
5.314 + bo->setFramePadding (i);
5.315 + mapCenter->reposition();
5.316 + bo->updateLink();
5.317 }
5.318 - */
5.319 }
5.320
5.321 -void MapEditor::setFrameBorderWidth(const int &)
5.322 +void MapEditor::setFrameBorderWidth(const int &i)
5.323 {
5.324 BranchObj *bo=xelection.getBranch();
5.325 - /*
5.326 if (bo)
5.327 {
5.328 - saveState (bo, QString("setFrameBrushColor (\"%1\")").arg(bo->getFrameBrushColor().name() ),
5.329 - bo, QString ("setFrameBrushColor (\"%1\")").arg(c.name() ),QString ("set brush color of frame to %1").arg(c.name() ));
5.330 - bo->setFrameBrushColor (c);
5.331 + saveState (bo, QString("setFrameBorderWidth (\"%1\")").arg(bo->getFrameBorderWidth() ),
5.332 + bo, QString ("setFrameBorderWidth (\"%1\")").arg(i),QString ("set border width of frame to %1").arg(i));
5.333 + bo->setFrameBorderWidth (i);
5.334 + mapCenter->reposition();
5.335 + bo->updateLink();
5.336 }
5.337 - */
5.338 }
5.339
5.340 void MapEditor::setIncludeImagesVer(bool b)
6.1 --- a/mapeditor.h Wed May 02 15:31:18 2007 +0000
6.2 +++ b/mapeditor.h Wed May 02 15:31:20 2007 +0000
6.3 @@ -13,7 +13,7 @@
6.4 #include "settings.h"
6.5
6.6
6.7 -/*! \brief Main widget in vym to display and edit the map */
6.8 +/*! \brief Main widget in vym to display and edit a map */
6.9
6.10 class MapEditor : public QGraphicsView, public xmlObj {
6.11 Q_OBJECT
6.12 @@ -27,33 +27,66 @@
6.13 bool isSaveStateBlocked(); // block while undo/redo or while running scripts
6.14 void setSaveStateBlocked(bool);
6.15
6.16 -private:
6.17 +protected:
6.18 QString getName(const LinkableMapObj*); // Get e.g. heading or filename
6.19 void makeTmpDirs(); // create temporary directories
6.20 - QString saveToDir(const QString&,const QString &,bool, const QPointF &,LinkableMapObj*);
6.21 - void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
6.22 - void saveStateRemovingPart (LinkableMapObj *, const QString &);
6.23 - void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
6.24 - void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
6.25 - void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
6.26 +
6.27 + /*! This function saves all information of the map to disc.
6.28 + saveToDir also calls the functions for all BranchObj and other objects in the map.
6.29 + The structure of the map itself is returned as QString and passed back to Main,
6.30 + where saveToDir is called initially
6.31 + */
6.32 + QString saveToDir (const QString &tmpdir, const QString &prefix, bool writeflags, const QPointF &offset, LinkableMapObj *saveSel);
6.33 +
6.34 +
6.35 + /*! \brief Save the current changes in map
6.36 +
6.37 + Two commands and selections are saved:
6.38 +
6.39 + - undocommand and undoselection to undo the change
6.40 + - redocommand and redoselection to redo the action after an undo
6.41 +
6.42 + Additionally a comment is logged.
6.43 +
6.44 + */
6.45 + void saveState(const SaveMode& savemode, const QString &undoSelection, const QString &undoCommand, const QString &redoSelection, const QString &redoCommand, const QString &comment, LinkableMapObj *saveSelection);
6.46 + /*! Overloaded for convenience */
6.47 + void saveStateChangingPart(LinkableMapObj *undoSelection, LinkableMapObj* redoSelection, const QString &rendoCommand, const QString &comment);
6.48 + /*! Overloaded for convenience */
6.49 + void saveStateRemovingPart(LinkableMapObj *redoSelection, const QString &comment);
6.50 + /*! Overloaded for convenience */
6.51 + void saveState(LinkableMapObj *undoSelection, const QString &undoCommand, LinkableMapObj *redoSelection, const QString &rendoCommand, const QString &comment);
6.52 + /*! Overloaded for convenience */
6.53 + void saveState(const QString &undoSelection, const QString &undoCommand, const QString &redoSelection, const QString &rendoCommand, const QString &comment) ;
6.54 +
6.55 public:
6.56 - void parseAtom (const QString &);
6.57 - void runScript (QString);
6.58 +
6.59 + /* \brief Process one command and its parameters */
6.60 + void parseAtom (const QString &atom);
6.61 +
6.62 + /* \brief Runs the script */
6.63 + void runScript (QString script);
6.64 private:
6.65 void addFloatImageInt(const QPixmap &img);
6.66
6.67 public:
6.68 - bool isDefault(); // false, if map was changed once
6.69 - bool isUnsaved(); // save necessary
6.70 - bool hasChanged(); // undo possible
6.71 - void setChanged(); // called from NoteEditor via LMO
6.72 - void closeMap();
6.73 - void setFilePath (QString);
6.74 - void setFilePath (QString,QString);
6.75 - QString getFilePath (); // Full path e.g. "/home/tux/map.xml"
6.76 - QString getFileName (); // e.g. "map.xml"
6.77 - QString getMapName (); // e.g. "map"
6.78 - QString getDestPath (); // e.g. "/home/tux/map.vym"
6.79 + bool isDefault(); //!< true, if map is still the empty default map
6.80 + bool hasChanged(); //!< true, if something has changed and is not saved yet
6.81 + void setChanged(); //!< called from TextEditor via LinkableMapObj
6.82 + void closeMap(); //!< Closes the map
6.83 +
6.84 + /*! \brief Sets filepath, filename and mapname
6.85 +
6.86 + If the filepath is "/home/tux/map.xml", then the filename will be set
6.87 + to map.xml. The destname is needed for vymLinks, pointing to another map.
6.88 + The destname holds the real name of the file, after it has been compressed, e.g. "map.vym"
6.89 + */
6.90 + void setFilePath (QString filepath,QString destname);
6.91 + void setFilePath (QString); //!< Overloaded for convenience
6.92 + QString getFilePath (); //!< Full path e.g. "/home/tux/map.xml"
6.93 + QString getFileName (); //!< e.g. "map.xml"
6.94 + QString getMapName (); //!< e.g. "map"
6.95 + QString getDestPath (); //!< e.g. "/home/tux/map.vym"
6.96 ErrorCode load (QString, LoadMode ); // newmap, import/replace selection
6.97 public:
6.98 int save(const SaveMode &); // Save map
7.1 --- a/tex/vym.changelog Wed May 02 15:31:18 2007 +0000
7.2 +++ b/tex/vym.changelog Wed May 02 15:31:20 2007 +0000
7.3 @@ -1,6 +1,7 @@
7.4 -------------------------------------------------------------------
7.5 -Fri Apr 24 18:34:48 CEST 2007 - uwe
7.6 +Thu Apr 26 10:34:48 CEST 2007 - uwe
7.7
7.8 +- Feature: Editing of frame attributes in branch property window
7.9 - Feature: autosave
7.10 - Feature: number of undo/redo levels can be changed in settings
7.11 - Feature: branch property window settings are saved
8.1 --- a/tex/vym.tex Wed May 02 15:31:18 2007 +0000
8.2 +++ b/tex/vym.tex Wed May 02 15:31:20 2007 +0000
8.3 @@ -48,41 +48,39 @@
8.4
8.5 \section{Introduction}
8.6 \subsection{What is a \vym map?}
8.7 -A \vym map (in short words {\em map}) is a tree like structure:
8.8 +A \vym map (abbreviated below as {\em map}) is a tree like structure:
8.9 \begin{center}
8.10 \includegraphics[width=12cm]{images/example1.png}
8.11 \end{center}
8.12 -Such maps can be drawn by hand on a paper or flip chart and help to
8.13 -structure your thoughts. While a tree like structure like above can be
8.14 +Such maps can be drawn by hand on a sheet of paper or flip chart and help to
8.15 +structure your thoughts. While a tree like structure like the illustration above can be
8.16 drawn manually \vym offers much more features to work with such maps.
8.17 -\vym is not another drawing software, but a tool to store and modify
8.18 +\vym is not just another drawing software application, but a tool to store and modify
8.19 information in an intuitive way. For example you can reorder parts of
8.20 -the map by pressing a key or add various information like a complete
8.21 +the map by pressing a key or add various pieces of information like a complete
8.22 email by a simple mouse click.
8.23
8.24 -Once you have finished collecting and organizing your ideas, you can
8.25 -easily generate for example a presentation in Open~Office based on a
8.26 -map.
8.27 +Once you have finished collecting and organising your ideas, you can
8.28 +easily generate a variety of outputs including for example a presentation in Open~Office based on a {\em map}.
8.29
8.30 -\subsection{Why should I use maps? Time, Space and your Brain.}
8.31 +\subsection{Why should I use {\em maps}? Time, Space and your Brain.}
8.32 \subsubsection*{Space}
8.33 -A map can concentrate a very complex content on little space e.g. a
8.34 +A {\em map} can concentrate very complex content in a small space such as a
8.35 piece of paper. It helps to use both sides of your brain: the logical
8.36 -side and also your creative side (e.g. by using pictures, colors and
8.37 -keywords in a map, so called {\em anchors}). It is a technique to
8.38 -organize the way you think: It can help you by developing, sorting and
8.39 -memorizing your thoughts.
8.40 +side and also your creative side (e.g. by using pictures, colours and
8.41 +keywords in a map, often called {\em anchors}). It is a technique to help
8.42 +organize the way you think and stimulate your creativity: It can help you by developing, sorting and helping to memorise your ideas.
8.43
8.44 \subsubsection*{Time}
8.45 Because you just use keywords and drawings, it is much faster than good
8.46 -old fashioned notes. Your brain memorizes things by associating them to
8.47 -other things -- a map makes use of those connections and stimulates
8.48 +old fashioned 'notes'. Your brain memorizes things by associating them with
8.49 +other things -- a {\em map} makes use of those connections and stimulates
8.50 new asccociations.
8.51
8.52
8.53 \subsubsection*{Your Brain}
8.54 -In 1960 the Prof. {\sc Roger Sperry} discovered that both hemispheres
8.55 -of the human brain have different tasks (of course both of them
8.56 +In 1960 Prof. {\sc Roger Sperry} discovered that both hemispheres
8.57 +of the human brain undertake different tasks (of course both of them
8.58 basically {\em can} do the same):
8.59 \begin{center}
8.60 \begin{tabular}{|p{5.5cm}|p{5.5cm}|} \hline
8.61 @@ -91,7 +89,7 @@
8.62 \item verbal speech and writing
8.63 \item numbers
8.64 \item logical thinking
8.65 - \item analyzing and details
8.66 + \item analysing and details
8.67 \item science
8.68 \item linear thinking
8.69 \item concept of time
8.70 @@ -108,33 +106,36 @@
8.71 \end{itemize} \\ \hline
8.72 \end{tabular}
8.73 \end{center}
8.74 -In our science oriented society we have learned to mainly rely on our
8.75 -left side of the brain, the "rational" one. In other cultures,
8.76 -especially like the native americans and other "old" cultures, the right
8.77 -side is much more important. Maps are just one way to stimulate the
8.78 -other side and make use of additional ressources we all have.
8.79 +In our science oriented western society we have learned to mainly rely on our
8.80 +left side of the brain, the "rational" one. In other cultures, such as the native americans and other "old" cultures, the right
8.81 +side is much more important. {\em Map} are just one way to stimulate the
8.82 +other side and make use of additional resources we all have.
8.83
8.84
8.85 -\subsection{Where could I use a map?}
8.86 -Here are some examples, how you can use those maps
8.87 +\subsection{Where could I use a {\em map}?}
8.88 +Here are some examples, how you can use those {\em maps}
8.89 \begin{itemize}
8.90 \item to prepare articles, papers, books, talks, \ldots
8.91 \item to sort complex data
8.92 - \item to memorize facts, persons, vocabulary, \ldots
8.93 + \item to memorize facts, peoples names, vocabulary, \ldots
8.94 \item to sort emails, files and bookmarks on your computer
8.95 \item to moderate conferences
8.96 + \item to brainstorm solutions to problems
8.97 + \item to record the tasks when planning a project
8.98 \end{itemize}
8.99
8.100 -\subsection{What you shouldn't do with a map...}
8.101 -A map drawn by somebody shows the way the author thinks. There is
8.102 -no right or wrong in the way it is drawn, so there is no way to criticize
8.103 -it. "It is, what it is" ({\sc F.~Lehmann}).
8.104 +\subsection{What you shouldn't do with a {\em map}...}
8.105 +A {\em map} drawn by somebody shows the way that the author thinks. There is
8.106 +no question of right or wrong in the way it is drawn, so there is no way to criticise
8.107 +it. "It is, what it is" ({\sc F.~Lehmann}).The tool will be of considerable use to the author and only very limited use to anyone else.
8.108 +
8.109 +However, when groups share in creating a {\em map} all of the group will benefit from its use. An example of such use is when a Tutor develops a {\em map} with a group of students during instruction. Another group use is when a Project leader gathers a group of specialists to help {\em map} the tasks that will be required to deliver a project.
8.110
8.111 %\section{Tutorials}
8.112 %TODO
8.113
8.114 \subsection{Internet Ressources}
8.115 -A good starting point to learn more about maps in general is Wikipedia:
8.116 +A good starting point to learn more about Mindmaps in general is Wikipedia:
8.117 \begin{itemize}
8.118 \item English:
8.119 \href{http://en.wikipedia.org/wiki/Mind_map}{http://en.wikipedia.org/wiki/Mind\_map}
8.120 @@ -145,50 +146,48 @@
8.121
8.122
8.123
8.124 -\section{Concept of \vym}
8.125 +\section{The Concept of the \vym application}
8.126 %TODO may add a general introduction here...
8.127 \subsection{Windows: Mapeditor, Noteeditor, and more}
8.128 -\vym uses mainly two windows: an editor for the map itself and another one for
8.129 -notes, which are part of the map. Let's call them {\em mapeditor} and
8.130 -{\em noteeditor}:
8.131 +\vym uses two windows in the main: an editor for the map itself and another one for
8.132 +notes asociated with the branches, which are part of the map. Let's call them {\em mapeditor} and {\em noteeditor}:
8.133 +
8.134 \begin{center}
8.135 \includegraphics[width=8cm]{images/windows.png}
8.136 \end{center}
8.137 -Usually you will work in the {\em mapeditor} by just adding new
8.138 +Most of the time you will work in the {\em mapeditor} by just adding new
8.139 branches, moving around and reordering them. The various ways to do this
8.140 will be explained in \ref{mapeditor}. You can store additional
8.141 information e.g. the content of a email easily in a {\em branch}: Just
8.142 type or copy\&paste it into the {\em noteeditor}. Working with notes is
8.143 explained in \ref{noteeditor}
8.144
8.145 -Another window which can be toggled on or off is the {\em history
8.146 +A third window which can be toggled on or off is the {\em history
8.147 window}. It can be used to see the latest actions performed on a map and
8.148 also to undo and redo actions. Details are in \ref{historywindow}.
8.149
8.150 \subsection{Menus and Context menus}
8.151 -On top of each window you find the menubar. The options you find there
8.152 -are similar to those you are used from other applications. Note that
8.153 +At the top of each window you will find the menubar. The options provided there
8.154 +are similar to those you are probably used to from other applications. Note that
8.155 many (and even more) options are availabe via {\em context menus}. Those
8.156 are available if you right-click onto an object in a map (on Mac~OS~X
8.157 Command-Click).
8.158
8.159 \subsection{Toolbars}
8.160 The toolbars in the mainwindows give quick access to many functions and
8.161 -also visualize the state of an object. For example a part of of the map
8.162 +also display the state of a branch. For example a part of of the map
8.163 can be hidden when the map is exported into an Open~Office presentation.
8.164 -To show this the branch in the map will have a little cloud symbol,
8.165 +To show this the branch in the map will show a little cloud symbol,
8.166 which is also "switched on" in the toolbar.
8.167
8.168 -Note that you can reposition all toolbars by simply grabbing them. For
8.169 -example you can move the flags-toolbar from its original horizontal
8.170 +Note that you can reposition all toolbars by simply grabbing and draging them to a new position. For example you can move the flags-toolbar from its original horizontal
8.171 position on top of the mapeditor to a vertical position on the right
8.172 side. You can even detach it and make it "float" separate from the other
8.173 windows. Or just insert it again at its original position.
8.174
8.175 \subsection{Maps}
8.176 -The map itself has always a {\em mapcenter}. The
8.177 -mapcenter has {\em branches} just like the trunk of a tree. Each branch
8.178 -in turn may have branches again.
8.179 +The {\em map} itself has always a {\em mapcenter}. The
8.180 +mapcenter has {\em branches} radiating out from the centre just like the trunk of a tree. Each branch in turn may have branches again.
8.181 \begin{center}
8.182 \includegraphics[width=10cm]{images/branches.png}
8.183 \end{center}
8.184 @@ -198,7 +197,7 @@
8.185
8.186 The mapcenter and the branches all have a {\em heading}. This is the
8.187 text you see in the mapeditor. Usually it should just be one or a few
8.188 -words, so that one can easily keep track of the whole map.
8.189 +key words, so that one can easily keep track of the whole map.
8.190
8.191
8.192 In the toolbar above the mapeditor you see various symbols.
8.193 @@ -206,12 +205,12 @@
8.194 \includegraphics[width=8cm]{images/default-flags.png}
8.195 \end{center}
8.196 These are called {\em flags} and can be used to mark branches in the
8.197 -map, e.g. if something is important or questionable.
8.198 +{\em map}, e.g. if something is important or questionable.
8.199 There are also more flags set by \vym automatically to show additional
8.200 -information, e.g. when a exists for a particular branch.
8.201 +information, e.g. when a note is attached to a particular branch.
8.202
8.203 By default some of these flags are set exclusively e.g. when the
8.204 -"thumb-up" flag is set, then the "thumb down" is unset and vice
8.205 +"thumb-up" flag is set, then the "thumb down" is reset and vice
8.206 versa. You can change this default behaviour in the settings menu.
8.207
8.208 %TODO add info about toolbars e.g. undo/redo, ...
8.209 @@ -219,24 +218,28 @@
8.210
8.211 \section{Mapeditor} \label {mapeditor}
8.212 \subsection{Start a new map}
8.213 -After \vym is started two windows will open: the mapeditor and the
8.214 -noteditor. Usually you will work in both windows, but at the moment we
8.215 +After \vym is started two windows will open: the {\em mapeditor} and the {\em noteditor}. Usually you will work in both windows, but at the moment we
8.216 will just need the mapeditor.
8.217
8.218 Select the mapcenter "New map" in the middle of the mapeditor by
8.219 -left-clicking with the mouse. It will turn yellow to show that is
8.220 +left-clicking with the mouse. It will be highlighted yellow to show that is
8.221 selected. There are several ways to add a new branch to the center:
8.222 \begin{itemize}
8.223 - \item Using the mouse: Open the context meny by clicking with the
8.224 + \item Using the mouse: Open the context menu by clicking with the
8.225 right mouse button (CTRL-Click on Mac) onto the
8.226 - mapcenter and choose Add \ra Add as child
8.227 + mapcenter and choose Add \ra Add branch as child
8.228 \item Press \key{Ins} or \key{A}
8.229 \end{itemize}
8.230 A new branch will appear and you will be able to type the heading of the
8.231 branch. Finish adding the new branch by pressing \key{Enter}.
8.232 %tipp
8.233 -Sometimes it comes handy to add a new branch above or below the current
8.234 -one. Use \key{Ins} together with \key{Shift} or \key{Ctrl}. It is also
8.235 +Sometimes it comes in handy to be able to add a new branch above or below the current
8.236 +one.
8.237 +\begin{itemize}
8.238 + \item Use \key{Shift} \together with \key{Ins} to add a branch above the selected one or...
8.239 + \item \key{Ctrl} \together with \key{Ins} to add one below.
8.240 +\end{itemize}
8.241 +It is also
8.242 possible to add a branch in such a way, that the current selection
8.243 becomes the child of the new branch, which is like inserting it {\em
8.244 before} the selection. This can be done using the context menu.
8.245 @@ -244,35 +247,34 @@
8.246 \subsection{Navigate through a map}
8.247 \subsubsection*{Select branches}
8.248 To select branches you can use the left button of your mouse or also the
8.249 -arrow keys. Depending on the {\em orientation} of a branch type
8.250 -\key{\la} or \key{\ra} to get nearer to the mapcenter or deeper
8.251 +arrow keys. Depending on the {\em orientation} of a branch tap
8.252 +\key{\la} or \key{\ra} to move nearer to the mapcenter or deeper
8.253 down into the branches. Within a set of branches, let's call them a
8.254 {\em subtree}, you can use \key{\ua} and \key{\da} to go up and down. You can
8.255 -also use \key{Pos1} and \key{End} to select the first and last branch.
8.256 +also use \key{Home} and \key{End} to select the first and last branch.
8.257
8.258
8.259 -\subsubsection*{Zoom a map}
8.260 +\subsubsection*{Panning the view of a map}
8.261 While adding more and more branches the size of the map may become
8.262 -bigger than the mapeditor window. You can use the scrollbars on the
8.263 -right and the bottom of your mapeditor window to scroll, but it is
8.264 -easier to just scroll using the left mouse button: Click onto the {\em
8.265 -canvas} itself, the empty space somewhere between the branches. The
8.266 -mouse pointer will change from an arrow to a hand, now move the visible
8.267 -part of the map to show the desired part.
8.268 +larger than the mapeditor window. You can use the scrollbars on the
8.269 +right and the bottom of your mapeditor window to scroll the view up or down or left or right. It is easier to just scroll using the left mouse button: Click anywhere on the {\em canvas} itself. Choose an empty space somewhere between the branches. The
8.270 +mouse pointer will change from an arrow to a hand, now move or drag the visible
8.271 +map to show the desired part.
8.272
8.273 If you select branches using the arrow keys, the map will scroll
8.274 to ensure that the selected branch is always visible.
8.275
8.276 +\subsubsection*{Zooming the view of a map}
8.277 Working with huge maps, the {\em zoom}-function comes in handy: You can
8.278 use
8.279 \begin{itemize}
8.280 - \item from the menu View \ra Zoom
8.281 + \item from the menu: View \ra Zoom in, View \ra Zoom out, View \ra reset Zoom.
8.282 \item the toolbar buttons
8.283 \begin{center}
8.284 \includegraphics[width=3cm]{images/zoom-buttons.png}
8.285 \end{center}
8.286 \end{itemize}
8.287 -The crossed magnifying lens resets the zoomed view to its original size.
8.288 +Clicking the crossed magnifying lens icon will reset the zoomed view to its original size.
8.289
8.290
8.291 \subsubsection*{Find Function} \label{findwindow}
8.292 @@ -281,31 +283,29 @@
8.293 \begin{center}
8.294 \includegraphics[width=6cm]{images/find-window.png}
8.295 \end{center}
8.296 -The text you enter here will be searched in all the headings and also in
8.297 -notes. Everytime you press the "Find"-button it will look for the next
8.298 -occurence, which then will be selected automatically. If the search
8.299 -fails, there will appear a short message "Nothing found" or a few
8.300 +The find function will search for, the text you enter here, in all the branch headings and also in the associated notes. Everytime you press the "Find"-button it will look for the next occurence, which will then be selected automatically. If the search
8.301 +fails, a short message "Nothing found" will appear for a few
8.302 seconds in the {\em statusbar} on the bottom of the mapeditor.
8.303
8.304 \subsubsection*{Keep the overview -- scroll a part of the map}
8.305 -A very big subtree of a map e.g. a branch with hundreds of childs makes
8.306 +A very big subtree of a map e.g. a branch with hundreds of child branches would make
8.307 it very hard to keep an overview over the whole map. You can hide all
8.308 -the childs of a branch by {\em scrolling} it -- this function is also
8.309 -often called {\em folding}. Think of the whole subtree as painted onto a
8.310 -big newspaper. You can scroll the paper to a small roll, leaving just
8.311 -the headline readable.
8.312 +the children of a branch by {\em scrolling} it -- this function is often called {\em folding}. Think of the whole subtree as painted onto a
8.313 +broadsheet newspaper. You can scroll or fold the paper to a small roll, leaving just
8.314 +the headline visible.
8.315
8.316 -To scroll or unscroll a branch and its childs, press the
8.317 +To scroll or unscroll a branch and its children,
8.318 \begin{itemize}
8.319 - \item \key{Scroll} key or \key{S}
8.320 + \item press either the \key{Scroll Lock} key or the \key{S}
8.321 \item press the middle-mouse button or
8.322 - \item choose the little scroll from the toolbar.
8.323 + \item choose the scroll icon from the toolbar.
8.324 \end{itemize}
8.325 If you select parts of a scrolled branch e.g. using the find function or
8.326 by using the arrow-keys, it will unscroll temporary. This is shown as a
8.327 -scroll with a little hour glass. If the temporary unscrolled part is not
8.328 +scroll with a little hour glass. If the temporary unscrolled part is no
8.329 longer needed, it will be hidden again automatically. It is also
8.330 -possible to unscroll a whole subtree using "Edit\ra Unscroll all childs".
8.331 +possible to unscroll all branches using "Edit\ra Unscroll all scrolled
8.332 +branches".
8.333
8.334 You can also hide parts of the map while exporting it e.g. to a webpage
8.335 or a presentation, see \ref{hideexport} for details.
8.336 @@ -315,6 +315,7 @@
8.337 You can edit the heading by selecting the branch and then
8.338 \begin{itemize}
8.339 \item pressing \key{Enter}
8.340 + \item pressing \key{F2}
8.341 \item double-clicking with left mouse.
8.342 \end{itemize}
8.343 Just type the new heading (or edit the old one) and press \key{Enter}.
8.344 @@ -355,38 +356,37 @@
8.345 %tipp
8.346 There is yet another way to move branches: If you press \key{Shift} or
8.347 \key{Ctrl} while moving with the mouse, the branch will be added above
8.348 -or below the one the mouse pointer is over. This helps also to reorder a
8.349 -map.
8.350 +or below the one the mouse pointer is over. This can also be used to reorder branches in a map.
8.351
8.352 -\subsection{The right side of your brain - colors and images}
8.353 -\subsubsection*{Change color of a heading}
8.354 -You can also use colors to put more information into a map, e.g. use
8.355 -red, green and more colors to prioritize tasks. Again you can
8.356 +\subsection{Colours and Images - Using the right side of your brain}
8.357 +\subsubsection*{Change colour of a heading}
8.358 +You can also use colours to add more information to a map, e.g. use
8.359 +red, green and more colours to prioritize tasks. Again you can
8.360 \begin{itemize}
8.361 - \item use the menu and choose e.g Format \rq Set Color
8.362 + \item use the menu and choose e.g Format \ra Set Color
8.363 \item use the toolbar
8.364 \begin{center}
8.365 - \includegraphics[width=3cm]{images/color-buttons.png}
8.366 + \includegraphics[width=3cm]{images/colour-buttons.png}
8.367 \end{center}
8.368 \end{itemize}
8.369 -The first button (black in the graphic above) shows the actual color.
8.370 -Clicking on it let's you choose another color. You can also "pick"
8.371 -another color by selecting a branch with the desired color and using the
8.372 -"pick color" button. Both of the buttons showing a bucket actually put
8.373 -the current color to the selected branch. While the first one just
8.374 -colors the heading of the selection, the last one also colors all the
8.375 -childs of the selected branch.
8.376 +The first button (black in the graphic above) shows the current colour.
8.377 +Clicking on it let's you choose another colour. You can also "pick"
8.378 +another colour by selecting a branch with the desired colour and using the
8.379 +"pick colour" button. Both of the icons showing a palette actually apply
8.380 +the current colour to the selected branch. While the first one just
8.381 +colours the heading of the selection, the last one also colours all the
8.382 +children of the selected branch.
8.383
8.384 %tipp
8.385 -A very useful function is the "copy color" using the mouse: Select the
8.386 -branch which should get the new color, then press \key{Ctrl} and
8.387 -simultanously click with left-mouse on another branch to copy its color
8.388 -to the first one. Here the childs of the selection also will get the new
8.389 -color, if you just want to color the selection itself, additionally
8.390 +A very useful function is the "copy colour" using the mouse: Select the
8.391 +branch which should get the new colour, then press \key{Ctrl} and
8.392 +simultanously click with left-mouse on another branch to copy its colour
8.393 +to the first one. Here the children of the selection also will get the new
8.394 +colour, if you just want to colour the selection itself, additionally
8.395 press \key{Shift}.
8.396
8.397 \subsubsection*{Use flags}
8.398 -\vym provides various flags. You see them in the toolbar on top of the
8.399 +\vym provides various flags. They are usually displayed in the toolbar on top of the
8.400 mapeditor window. (Note: Like all toolbars you can also move them to the
8.401 left or the right side of the window or even detach them. Just grab the
8.402 very left "dotted" part of the toolbar with your left-mouse button.)
8.403 @@ -395,9 +395,9 @@
8.404 \end{center}
8.405 If you have a branch selected, you can set any number of flags by
8.406 clicking them in the toolbar. The toolbar buttons change their state and
8.407 -always reflect the flags set in the selected branch.
8.408 +always reflect the flags set in the selected branch. So, to remove a flag from a branch, select the branch and then click the highlighted flag on the toolbar.
8.409
8.410 -Presently \vym uses two kinds of flags: {\em System Flags} and {\em
8.411 +At present \vym uses two kinds of flags: {\em System Flags} and {\em
8.412 Standard Flags}. The standard flags are those shown in the toolbar.
8.413 System flags are set by \vym to indicate e.g. that there is additional
8.414 information in a note (more on this in \ref{noteeditor}). Later versions
8.415 @@ -407,14 +407,14 @@
8.416 The easiest way to add an image to a branch is by dragging it e.g. from a
8.417 webbrowser to the mapeditor while a branch is selected there.
8.418
8.419 -You can also add a image to a branch by opening the context menu of the
8.420 -branch choose "Add Image". A
8.421 -dialog window lets you choose the image to load.
8.422 +You can also add an image to a branch by opening the context menu of the
8.423 +branch. Right click the selected branch, choose "Add" then "Add Image". A
8.424 +dialog window enables you choose the image to load.
8.425 \footnote{Supported image types are: PNG, BMP, XBM, XPM and PNM. It may
8.426 also support JPEG, MNG and GIF, if specially configured during
8.427 compilation (as done when \vym is part of SUSE LINUX).}
8.428 -While an image is selected in the dialog, you can see a preview of the
8.429 -image. It is also possible to select multiple images.
8.430 +While an image is selected in the dialog, a preview of the
8.431 +image is displayed. It is also possible to select multiple images.
8.432
8.433 You can position the image anywhere you want, just drag it with left
8.434 mouse. To relink it to another branch, press \key{Shift} while moving
8.435 @@ -422,7 +422,9 @@
8.436
8.437 If you right-click onto an image, a context menu will open which let's
8.438 you first choose one of several image formats. Then a file dialog opens
8.439 -to save the image. Hint: This is used to "export" the image, it will be
8.440 +to save the image.
8.441 +
8.442 +Hint: This is used to "export" the image, it will be
8.443 saved anyway in the map itself! You can also cut and
8.444 copy images, but it is not possible to add objects to an image\footnote{
8.445 Images are regarded as "extra feature". It would make working with
8.446 @@ -442,7 +444,7 @@
8.447 \subsubsection*{Frames}
8.448 A frame can be added to a branch by clicking with the
8.449 right-mouse button. A context menu will open, where you can choose the
8.450 -frame. At the moment just a rectangle resp. "No Frame" will be offered,
8.451 +frame. At the moment just a rectangle is offered. "No Frame" will be offered as the default for branches,
8.452 nevertheless you can use images as frames. Have a look at the demo map
8.453 {\tt todo.vym} as an example, where the mapcenter is a cloud. You can
8.454 use an external drawing program like {\tt gimp} to create an image,
8.455 @@ -455,21 +457,20 @@
8.456 various parts of the map can be changed by
8.457 \begin{itemize}
8.458 \item Selecting Format from the menu
8.459 - \item Right clicking onto the canvas, which will open a context menu
8.460 + \item Right clicking on the canvas, which will open a context menu
8.461 \end{itemize}
8.462
8.463 -\subsubsection*{Background color}
8.464 -The color is set (and also displayed) as "Set background color".
8.465 +\subsubsection*{Background colour}
8.466 +The colour is set (and also displayed) as "Set background colour".
8.467
8.468 -\subsubsection*{Link color}
8.469 -Links connecting branches can be colored in one of the following ways:
8.470 +\subsubsection*{Link colour}
8.471 +Links connecting branches can be coloured in one of two ways:
8.472 \begin{itemize}
8.473 - \item use the color of the heading of the branch the links is
8.474 - \item use {\em one} color for all links. The default color is blue.
8.475 - leading to.
8.476 + \item use the same colour for the heading and for the branch link line.
8.477 + \item use {\em one} colour for all links and choose different colours for the branch headings text. The default colour for branch link lines is blue.
8.478 \end{itemize}
8.479 -The latter can be set with "Set link color". Check or uncheck the "Use
8.480 -color of heading for link" option to choose one of the two designs for
8.481 +The latter can be set with "Set link colour". Check or uncheck the "Use
8.482 +colour of heading for link" option to toggle between the two designs for
8.483 your map.
8.484
8.485 \subsubsection*{Link style}
8.486 @@ -480,8 +481,8 @@
8.487 \item Thick Line
8.488 \item Thick Parabel
8.489 \end{itemize}
8.490 -The "thick" styles only draw links starting at mapcenter thick, the rest
8.491 -of the map is always painted "thin".
8.492 +The "thick" styles only apply to links starting at the mapcenter, link lines for the rest
8.493 +of the map are always painted "thin".
8.494
8.495
8.496 \subsection{Links to other documents and webpages}
8.497 @@ -491,15 +492,13 @@
8.498 \item \vym map, which will be opened in \vym itself
8.499 \end{itemize}
8.500 In addition to the external links there also internal ones, leading from one
8.501 -branch in a map toanother one. Those are called {\em XLinks} and are explained
8.502 +branch in a map to another one. Those are called {\em XLinks} and are explained
8.503 in section~\ref{xlinks}.
8.504
8.505 \subsubsection*{Webbrowser}
8.506 -Modern Webbrowsers like {\tt konqueror} are able to display various
8.507 -types of files, both local or in the internet. To enter the URL of
8.508 -any document, right-click onto a branch or use the Edit Menu
8.509 -and choose "Edit URL". Enter the path to your document (or copy and
8.510 -paste it from your browser). Examples for valid paths are:
8.511 +Modern Webbrowsers like {\tt konqueror and Firefox} are able to display various
8.512 +types of files, both local or on the internet. To enter the URL of
8.513 +any document, right-click onto a branch to open the contextmenu then choose "Edit URL". Enter the path to your document (or copy and paste it from your browser). Examples for valid paths are:
8.514 \begin{verbatim}
8.515 http://www.insilmaril.de/vym/index.html
8.516 file:/usr/share/doc/packages/vym/doc/vym.pdf
8.517 @@ -508,7 +507,7 @@
8.518 clicking on the globe in the toolbar or the context menu an external
8.519 browser\footnote{
8.520 The browser can be changed in the Settings Menu.}
8.521 -will be started.
8.522 +will be launched.
8.523 \begin{center}
8.524 \includegraphics[width=0.5cm]{images/flag-url.png}
8.525 \end{center}
8.526 @@ -517,16 +516,13 @@
8.527
8.528
8.529 \subsubsection*{\vym map}
8.530 -To link to to another map right click on a branch or choose "Edit \ra
8.531 -Enter \vym link". A file dialog opens where you can choose the map. A
8.532 +To link to to another map right click on a branch and choose "Edit \vym link". A file dialog opens where you can choose the map. A
8.533 branch with a link is marked with
8.534 \begin{center}
8.535 \includegraphics[width=0.5cm]{images/flag-vymlink.png}
8.536 \end{center}
8.537 -Clicking this flag in the toolbar or in the context menu of a branch
8.538 -will open the map in another tab (see \ref{tabs} for working with
8.539 -multiple maps). To delete an existing link, just press the "Cancel"
8.540 -button.
8.541 +Clicking this flag beside the branch heading, in the toolbar or in the context menu of a branch will open the map in another tab (see \ref{tabs} for working with
8.542 +multiple maps). To delete an existing link, just right click the branch and select "Delete \vym link".
8.543
8.544 Technical note: Internally \vym uses absolute paths, to avoid opening
8.545 several tabs containing the same map. When a map is saved, this path is
8.546 @@ -554,28 +550,26 @@
8.547 % Scrolling
8.548
8.549 \section{Noteeditor} \label {noteeditor}
8.550 -If you want to save more text in a branch e.g. a complete email, a
8.551 +If you want to attach more text to a branch e.g. a complete email, a
8.552 cooking recipe, or the whole source code of a software project, you can
8.553 use the noteeditor.
8.554 \begin{center}
8.555 \includegraphics[width=8cm]{images/noteeditor.png}
8.556 \end{center}
8.557 -This editor displays text associated to a branch selected in the
8.558 -mapeditor. To visualize that there maybe is no text yet, the noteeditor
8.559 -shows different background colors depending on its state:
8.560 +This editor displays text associated with a branch selected in the mapeditor. The noteeditor
8.561 +shows different background colours depending on whether text is associated with a selected branch.
8.562
8.563 \subsection{States}
8.564 Before you can type or paste text into it, you have
8.565 -to select a branch in the mapeditor. Note that the background color
8.566 +to select a branch in the mapeditor. Note that the background colour
8.567 of the noteeditor indicates its state:
8.568 \begin{itemize}
8.569 - \item black: no branch selected
8.570 \item grey: no text entered yet
8.571 - \item white: text is already available
8.572 + \item white: some text has been entered
8.573 \end{itemize}
8.574 -To show you in the mapeditor itself that there is a note with more
8.575 -information for a particular branch, a little note flag will appear next
8.576 -to the heading of the branch. See the lower branch on the right side:
8.577 +In the mapeditor itself, to signal that there is a note with more
8.578 +information for a particular branch, a little "note" flag will appear next
8.579 +to the heading of the branch. This is illustrated in the lower branch on the right hand side:
8.580 \begin{center}
8.581 \includegraphics[width=8cm]{images/branches-flags.png}
8.582 \end{center}
8.583 @@ -583,7 +577,7 @@
8.584 \subsection{Import and export notes}
8.585 The note is always saved automatically within the \vym map itself.
8.586 Nevertheless sometimes it is nice to import a note from an external file
8.587 -or write it. Use "Map\ra~Import" and "Map\ra~Export" to do so.
8.588 +or write it. In the Note Editor use "File\ra~Import" and "File\ra~Export" to do so.
8.589
8.590 \subsection{Edit and print note}
8.591 Editing works like in any simple texteditor, including undo and redo
8.592 @@ -595,17 +589,17 @@
8.593 wanted, so there you can convert all paragraphs into linebreaks by using
8.594 Edit~\ra~Remove~Paragraphs or \key{ALT-X}.
8.595
8.596 -\subsection{RichText: Colors, paragraphs and formatted text}
8.597 +\subsection{RichText: Colours, paragraphs and formatted text}
8.598 \vym supports formatted text (QT Rich Text) in the noteeditor since
8.599 -version 1.4.7. Colors and text attributes (e.g. italic, bold) can be
8.600 -set with the buttons above the text. The text itself is divided in
8.601 +version 1.4.7. Colours and text attributes (e.g. italic, bold) can be
8.602 +set with the buttons above the text. The text itself is divided into
8.603 paragraphs. For each paragraph the format can be set (e.g. centered,
8.604 right). A paragraph is ended when a \key{Return} is entered. If you just
8.605 want to begin a new line, press \key{CTRL-Return}.
8.606
8.607 -\subsection{Fonts and how to quickly switch them}
8.608 -The noteeditor is ment to be used for simple notes, not really as full
8.609 -featured text editor. Because of many requests \vym supports now
8.610 +\subsection{Fonts and how to switch them quickly}
8.611 +The noteeditor is designed to be used for simple notes, not really as a full
8.612 +featured word processor. Because of many requests \vym now supports
8.613 formatted text in the noteeditor\footnote{
8.614 \vym uses the QRichtText format, which is basically a subset of the
8.615 formatting provided in HTML.}
8.616 @@ -618,12 +612,11 @@
8.617 \begin{center}
8.618 \includegraphics[width=0.5cm]{images/formatfixedfont.png}
8.619 \end{center}
8.620 -In the Settings menu both fonts can be set and also which font should be
8.621 -used for default.
8.622 +In the Settings menu both fonts can be set. The default font can also be toggled between the fixed and variable font by selecting or deselecting the "fixed font is default" menu item.
8.623
8.624 Additionally to the default fonts any font installed on your system can
8.625 be used. Please note, that the chosen font also will be used for HTML
8.626 -exports, so you should only use fonts which are available generally.
8.627 +exports, so if youy VYM mind map could ever be exported to a web or intranet page you should only use fonts which are available generally.
8.628
8.629 \subsection{Find text}
8.630 The noteeditor itself has no Find function, use Find in the mapeditor,
8.631 @@ -636,33 +629,31 @@
8.632
8.633 \section{Hello world}
8.634 This section is about how \vym can interact with other applications.
8.635 -Many applications meanwhile can read and write their data using XML, the
8.636 +Many applications can now read and write their data using XML, the
8.637 eXtensible Markup Language. \vym also uses XML to save its maps, see
8.638 \ref{fileformat} for a more detailed description.
8.639
8.640 -So if your an application understands XML, chances are good that someone
8.641 +So if you make use of another application that understands XML, chances are good that someone
8.642 could write import/export filters for \vym. Volunteers are always
8.643 welcome ;-)
8.644
8.645 \subsection{Import} \label{import}
8.646
8.647 \subsubsection*{KDE Bookmarks}
8.648 -The integrated bookmark editor in KDE is somewhat limited, so why not
8.649 +The integrated bookmark editor in KDE (Konqueror etc.) is somewhat limited, so why not
8.650 use \vym to maintain the bookmark mess? To create a new map containing
8.651 your current KDE bookmarks just choose
8.652 \begin{itemize}
8.653 - \item Map \ra Import\ra KDE Bookmarks
8.654 + \item File \ra Import\ra KDE Bookmarks
8.655 \end{itemize}
8.656
8.657 \subsubsection*{Mind Manager}
8.658 \vym has currently a very basic import filter to convert maps created by
8.659 -{\em Mind Manager}\footnote{Mind Manager is a professional software by
8.660 -Mindjet. Both names are registered trademarks by Mindjet. For more
8.661 -information see their website at
8.662 -\href{http://mindjet.de}{http://mindjet.de}} into \vym maps. Notes and
8.663 +{\em Mind Manager}\footnote{Mind Manager is a commercial i.e. non free, software application by Mindjet for Windows and the Mac. Both names are registered trademarks by Mindjet. For more information see their website at
8.664 +\href{http://mindjet.com}{http://mindjet.com}} into \vym maps. Notes and
8.665 pictures are not converted at the moment. You can import files with
8.666 \begin{itemize}
8.667 - \item Map \ra Import\ra Mind Manager
8.668 + \item File \ra Import\ra Mind Manager
8.669 \end{itemize}
8.670
8.671
8.672 @@ -676,7 +667,7 @@
8.673
8.674 \subsection{Export} \label{export}
8.675 \label{hideexport}
8.676 -Often you don't want to export the whole map, but just parts of it. For
8.677 +Often you may not want to export the whole map, but just parts of it. For
8.678 example you may have additional info you want to talk about in a
8.679 presentation, while those parts should not be visible to the audience.
8.680 To achieve this you can "hide" parts of the map during exports by
8.681 @@ -689,12 +680,11 @@
8.682 use of this flag. By default the flag is enabled.
8.683
8.684 \subsubsection*{Open Office}
8.685 -Open Office beginning with version~2 uses the so called "Open Office
8.686 -Document Format", which can be written by \vym. The options are
8.687 +Open Office beginning with version~2 uses the so called "Open Document Format", which can be written by \vym. The options are
8.688 currently limited, but it possible to export presentations which can be
8.689 opened in Open Office Impress. By selecting
8.690 \begin{itemize}
8.691 - \item Map \ra Export\ra Open Office
8.692 + \item File \ra Export\ra Open Office
8.693 \end{itemize}
8.694 you get a file dialogue where you can choose the output file and the
8.695 file type:
8.696 @@ -710,9 +700,10 @@
8.697 probably reedit in Open Office to avoid text running over the end of
8.698 a page
8.699 \item Images and flags are not used at the moment
8.700 - \item Notes are just written as plain text, without RichText
8.701 + \item Notes are just written as plain text, without RichText
8.702 + \item The full range of templates are not available in all distributions.
8.703 \end{itemize}
8.704 -Some of the templates make use of {\em sections} e.g. insert the
8.705 +Some of the templates make use of {\em sections} i.e sections insert the
8.706 headings of mainbranches as chapters for sections into the presentation.
8.707
8.708 \subsubsection*{Image}
8.709 @@ -725,7 +716,7 @@
8.710
8.711 \subsubsection*{ASCII}
8.712 Exporting an image as text is somewhat experimental at the moment. Later
8.713 -this will probably done using stylesheets. So the output may change in
8.714 +this will probably be done using stylesheets. So the output may change in
8.715 future versions of \vym.
8.716
8.717 \subsubsection*{\LaTeX}
8.718 @@ -733,44 +724,44 @@
8.719 as experimental, there are no options (yet).
8.720 By selecting
8.721 \begin{itemize}
8.722 - \item Map \ra Export\ra \LaTeX
8.723 + \item File \ra Export\ra \LaTeX
8.724 \end{itemize}
8.725 you will be asked in a file dialog for the name of the output file. This
8.726 -file should be included in a \LaTeX document using command
8.727 +file may then be included in a \LaTeX document using command:
8.728 \begin{verbatim}
8.729 \include{inputfile.tex}
8.730 \end{verbatim}
8.731
8.732 \subsubsection*{KDE Bookmarks}
8.733 \vym will overwrite the KDE bookmarks file and then try to notify
8.734 -running konquerors via DCOP of the changed file. \vym does not create a
8.735 +running Konquerors via DCOP of the changed file. \vym does not create a
8.736 backup!
8.737 \begin{itemize}
8.738 - \item Map \ra Export \ra KDE Bookmarks
8.739 + \item File \ra Export \ra KDE Bookmarks
8.740 \end{itemize}
8.741
8.742
8.743 \subsubsection*{XHTML (Webpages)}
8.744
8.745 -This is the format you want to use to create a webpage. For an example
8.746 -have a look at the \vym homepage:
8.747 +This is the format to use if you wish to create a webpage. To see an example
8.748 +visit the \vym homepage:
8.749 \href{http://www.InSilmaril.de/vym}{www.InSilmaril.de/vym}
8.750
8.751 -Some explanation how this works:
8.752 +Some explanation on how this works:
8.753 Before a map is exported as XHTML, it will be first written as XML into a
8.754 directory (see \ref{xmlexport}). Then the external program {\tt
8.755 -xsltproc}\footnote{On SUSE Linux {\tt xsltproc} is installed by
8.756 +xsltproc}\footnote{On SUSE Linux and some other distributions {\tt xsltproc} is installed by
8.757 default.}
8.758 will be called to process the XML file and generate HTML code.
8.759 -A dialog allows to set various options:
8.760 +A dialog allows the user to set various options:
8.761 \begin{itemize}
8.762 \item {\bf Include image:} If set, \vym will creat an image map at
8.763 the top of the HTML output. Clicking on a branch in the map will
8.764 jump to the corresponding section in the output.
8.765
8.766 \item {\bf Colored headings:}
8.767 - If set to yes, \vym will color the headings in the text part with the
8.768 - same colors like in the map.
8.769 + If set to yes, \vym will colour the headings in the text part with the
8.770 + same colours used in the \vym map.
8.771 \item {\bf Show Warnings:}
8.772 If set to yes, \vym will ask before overwriting data.
8.773 \item {\bf Show output:}
8.774 @@ -782,20 +773,19 @@
8.775
8.776
8.777 \subsubsection*{XML} \label{xmlexport}
8.778 -The map is written into a directory both as an image and as XML. The
8.779 +The map is written into a directory both as an image and as an XML file. The
8.780 directory is set in a file dialog. If the directory is not empty, you
8.781 -will be questioned if you risk to overwrite its contents.
8.782 +will be warned and offered choices if you are at risk of overwriting existing contents.
8.783
8.784 It is possible to export different maps into the same directory. Each
8.785 file generated will have the map's name as prefix, e.g. {\tt todo.vym}
8.786 becomes {\tt todo.xml}, {\tt todo.png}, {\tt todo-image-1.png} and so
8.787 -on. This is useful if e.g. for a website several combined maps have to
8.788 -be stored in the same directory.
8.789 +on. This is useful if, for example, a website comprises several combined maps that have to be stored in the same directory.
8.790
8.791 \subsubsection*{Export a part of a map}
8.792 -Select a branch you want to export together with its childs, then open
8.793 +Select a branch you want to export together with its children, then open
8.794 the context menu and choose {\em Save Selection}. This will create a
8.795 -file with the postfix {\tt .vyp}, which is an abbreviation for \lq vym
8.796 +file with the suffix {\tt .vyp}, which is an abbreviation for \lq vym
8.797 part\rq.
8.798
8.799
8.800 @@ -807,7 +797,7 @@
8.801 \subsection{Macros} \label{macros}
8.802 Macros have been added to \vym in version~1.9.0. Each function key
8.803 \key{F1} to \key{F12} holds a macro, which is executed on the current
8.804 -selection if the key is pressed. The default macros change the color of
8.805 +selection if the key is pressed. The default macros change the colour of
8.806 a subtree or set the frame of a branch:
8.807 \begin{center}
8.808 \includegraphics[width=8cm]{images/macros.png}
8.809 @@ -819,13 +809,13 @@
8.810
8.811 \subsection{How to deal with Bookmarks} \label{bookmarks}
8.812 \subsubsection*{Open new tabs instead of new windows}
8.813 -If you use konqueror as browser, \vym will remember the konqueror which
8.814 +If you use konqueror as your browser, \vym will remember the konqueror session which
8.815 was opened first by \vym. You can also press \key{Ctrl} and click to
8.816 -open the link in a new tab then.
8.817 +open the link in a new tab.
8.818
8.819 \vym can also open a new tab in Mozilla or Firefox using the remote
8.820 command\footnote{\href{http://www.mozilla.org/unix/remote.html}{http://www.mozilla.org/unix/remote.html}}
8.821 -of these.
8.822 +of these browsers.
8.823
8.824 \subsubsection*{Drag and Drop}
8.825 If you want to keep bookmarks in a map, select a branch where you want
8.826 @@ -847,108 +837,93 @@
8.827 \end{itemize}
8.828 The URL will be build from the number in the heading.
8.829
8.830 -\subsection{Including images into a branch}
8.831 -The default setting of an image is to float "freely". They can be
8.832 -positioned everywhere, but they might end up in the same place as other
8.833 -parts of the map.
8.834 +\subsection{Associating images with a branch}
8.835 +The default setting for an image is for it to float "freely". Images can be
8.836 +positioned anywhere on the canvas, but may end up in the same place as other
8.837 +parts of the map obscuring that part of the map.
8.838
8.839 -The solution is to include them "into" a branch. This can be done via
8.840 +The solution is to insert or include them "into" a branch. This can be done via
8.841 the context menu of their parent branch:
8.842 \begin{itemize}
8.843 \item Include images horizontally
8.844 \item Include images vertically
8.845 \end{itemize}
8.846 -The image ist still positioned relatively to its parent branch, but the
8.847 -heading and border of the branch adapt to the floating image, see below:
8.848 +The image is still positioned relative to its parent branch, but the
8.849 +heading and border of the branch frame adapt to the floating image, see below:
8.850 \begin{center}
8.851 \includegraphics[width=11cm]{images/includeImages.png}
8.852 \end{center}
8.853
8.854 \subsection{Modifier Modes}
8.855 -Modifiers are for example the \key{Shift}- or the \key{Alt}-keys. When
8.856 -pressed while doing actions with the mouse, they will cause \vym to use
8.857 -a "modified" action. E.g. you can move branches with mouse. If
8.858 +Modifiers are for example the \key{Shift}- the \key{Ctrl}- ot the \key{Alt}-keys. When
8.859 +pressed while applying mouse actions, they will cause \vym to use
8.860 +a "modified" action. e.g. you can move branches with the mouse. If
8.861 \key{Ctrl} or \key{Alt}is pressed while releasing the branch, it will be
8.862 added above/below the target, not as child of the target.
8.863
8.864 -Without a modifier pressed, the first click on a branch just selects
8.865 +Without a modifier key pressed, the first mouse click on a branch just selects
8.866 it. For the behaviour of the \key{Ctrl} modifier there are several
8.867 options, which can be set from the modifier toolbar:
8.868 \begin{center}
8.869 \includegraphics[width=3cm]{images/modmodes.png}
8.870 \end{center}
8.871 -The default is to copy the color from the clicked branch to the already
8.872 +The default is to copy the colour from the clicked branch to the already
8.873 selected branch. In the toolbar shown above the default modifier is
8.874 -selected, namely to copy the color of a branch. The second modifier
8.875 +selected, namely to copy the colour of a branch. The second modifier
8.876 let's you easily copy a whole branch with a single click. The third
8.877 -modifier lets you create {\em xLinks}, which will be explained in the
8.878 -next section.
8.879 +modifier lets you create links between branches called {\em xLinks}. They will be explained in the next section.
8.880
8.881 \subsection{Hide links of unselected objects}
8.882 Sometimes it would be useful to position a branch freely, just like a
8.883 -mainbranch or an image. Though this is not possible (yet) for all
8.884 +mainbranch or an image. This is possible for all
8.885 branches, you can use a mainbranch and hide its connecting link to the
8.886 -mapcenter. This can be used e.g. for legends or a collection of vymLinks
8.887 +mapcenter or hide the link between a child branch and its parent. This can be used e.g. for legends or a collection of vymLinks
8.888 pointing to other maps:
8.889 \begin{center}
8.890 \includegraphics[width=9cm]{images/hiddenlink.png}
8.891 \end{center}
8.892 -Change hiding of the links in the property window (opened in context
8.893 -menu or with \key{CTRL-I} on the "links"-tab.
8.894 +To hide the link between a branch and its parent open the context
8.895 +menu (Right Click) and check Hide link if object is not selected.
8.896
8.897
8.898 \subsection{XLinks} \label{xlinks}
8.899 So far all the data in the \vym map has been treelike. Using xLinks you
8.900 can link one branch to any other, just like attaching a rope between two
8.901 branches in a real tree. This is especially useful in complex maps,
8.902 -where you want to have crossreferences which don't fit on the same
8.903 -visible area, which fits on your screen. The following example, which is
8.904 -part of the \vym package, still fits on one screen, but shows how data
8.905 -can be crosslinked. In the graphics there is a link from a task (prepare
8.906 -a presentation) to general information:
8.907 +where you want to have crossreferences which can not be displayed on the same
8.908 +visible area of the {\em mapeditor} window. The following example map still fits on one screen, but shows how data can be crosslinked. In the graphics there is a link from a task (prepare a presentation) to general information:
8.909 \begin{center}
8.910 \includegraphics[width=12cm]{images/xlink.png}
8.911 \end{center}
8.912 Note that a xLink which points to a branch that is not visible (because
8.913 -it is scrolled), is just show as a little horizontal arrow. In the
8.914 +it is scrolled), is just shown as a little horizontal arrow. In the
8.915 screenshot above have a look at the \lq Tuesday\rq\ branch.
8.916
8.917 \subsubsection*{Create a xLink}
8.918 -Choose the link mode from the modifier toolbar (by clicking or pressing
8.919 +Choose the link mode from the modifier toolbar (by clicking the toolbar icon or pressing
8.920 \key{L}). Select the branch, where the xLink should start. Press the
8.921 -modifier key \key{Ctrl} and simultanously click on the branch where the
8.922 -link should end. (The link is already drawn before you release the mouse
8.923 -key). If you release the mouse over a branch the xLink becomes
8.924 -permanent.
8.925 +modifier key \key{Ctrl} and then click on the selected branch where the
8.926 +link should start and drag the mouse pointer to the branch where the link is to end. (The link is drawn to follow the mouse pointer). When you release the mouse over a branch the xLink becomes permanent.
8.927
8.928 \subsubsection*{Modify or delete a xLink}
8.929 -Open the context menu of a branch and select \lq Edit xLink\rq. A
8.930 -submenu contains all the xLinks of the branch (if there are any). They
8.931 -are named like the branches, where they end. Choose one and
8.932 -the xLink dialogue opens, where you can set color, width and also delete
8.933 -the xLink.
8.934 +First select a branch at either end of the xLink. Then open the context menu and select \lq Edit xLink\rq. A submenu contains all the xLinks of the branch (if there are any). They are named like the branches, where they end. Choose one and the xLink dialogue opens, where you can set colour, width and also delete the xLink.
8.935
8.936 \subsubsection*{Follow a xLink}
8.937 -In a complext \vym map it sometimes comes handy to jump to the other end
8.938 -of a xLink. You can do this by opening the context menu of the branch
8.939 -and clicking on \lq Goto xLink\rq and selecting the xLink you want to
8.940 -follow.
8.941 +In a complex \vym map it sometimes comes in handy to be able to jump to the other end
8.942 +of a xLink. You can do this by opening the context menu of the branch and clicking on \lq Goto xLink\rq and selecting the xLink you want to follow.
8.943
8.944
8.945
8.946 \subsection{Adding and removing branches}
8.947 The context menu of a branch shows some more ways to add and delete data
8.948 -e.g. you can delete a branch while keeping its childs. The childs become
8.949 +e.g. you can delete a branch while keeping its children. The children become
8.950 linked to the parent of the previously removed branch.
8.951 Similar branches can be inserted into existing maps. For keyboard
8.952 shortcuts also have a look at the context menu.
8.953
8.954 \subsection{Adding a whole map or a part of a map}
8.955 Select a branch where you want to add a previously saved map ({\tt .vym})or a part
8.956 -of a map ({\tt .vyp}) , then open
8.957 -the context menu and choose {\em Add \ra Import}. For the import you can
8.958 -choose between {\em Import Add} and {\em Import Replace}: The imported
8.959 -data will be added after the selection resp. replace the selection.
8.960 +of a map ({\tt .vyp}) , then open the context menu and choose {\em Add \ra Add Map (Insert)}. For the import you can choose between {\em Add Map (Insert)} and {\em Add Map (Replace)}: The imported data will be added after the selected branch.
8.961
8.962 \label{historywindow}
8.963
8.964 @@ -985,7 +960,7 @@
8.965
8.966 \begin{appendix}
8.967
8.968 -\section{\vym initialization process and configuration}
8.969 +\section{\vym initialisation process and configuration}
8.970 \subsection{Configuration file}
8.971 On startup \vym will look for a configuration for user specific settings
8.972 like window positions, toolbars etc. If this file does not already
8.973 @@ -1017,20 +992,20 @@
8.974 \begin{center}
8.975 \begin{tabular}{cccp{8cm}}\\
8.976 \bf Option & \bf Comment & \bf Argument & \bf Description \\ \hline
8.977 -d & debug & & Turn on debugging output \\
8.978 -h & help & & Show help\\
8.979 +v & version & & Show version ov \vym\\
8.980 l & local & & Use local paths to stylesheets, translations, icons,
8.981 etc. instead of system paths. Useful for testing\\
8.982 +h & help & & Show help\\
8.983 +r & run & filename & Run script\\
8.984 q & quit & & Quit immediatly after startup. Useful for benchmarks.\\
8.985 -r & run & filename & Run script\\
8.986 -v & version & & Show version ov \vym\\
8.987 \end{tabular}
8.988 \end{center}
8.989 You can also give several filenames at the commandline to let \vym open
8.990 several maps at once.
8.991
8.992
8.993 - \section{Scripts} \label{scripts} %FIXME
8.994 + \section{Scripts} \label{scripts}
8.995 + %FIXME
8.996
8.997
8.998
8.999 @@ -1064,7 +1039,7 @@
8.1000
8.1001 \subsubsection*{Contacting the author}\label{author}
8.1002 Especially for support questions please try the mailinglists first. If
8.1003 -everything else fails you can contact the Uwe Drechsel at
8.1004 +everything else fails you can contact the author Uwe Drechsel at
8.1005 \begin{center}
8.1006 \href{mailto:vym@InSilmaril.de}{vym@InSilmaril.de}
8.1007 \end{center}
8.1008 @@ -1080,7 +1055,7 @@
8.1009 \end{center}
8.1010 I build \vym regulary for openSUSE, so you may report it against a
8.1011 recent version there, even if you use another Operating System.
8.1012 -Please don't forget to tell
8.1013 +Please don't forget to tell me what you are using:
8.1014 \begin{itemize}
8.1015 \item the exact steps needed to reproduce the bug
8.1016 \item the version and build date of \vym (see the Help \ra About
8.1017 @@ -1103,7 +1078,7 @@
8.1018 \subsubsection{The Qt toolkit}
8.1019 Qt is C++ toolkit for multiplatform GUI and application development. It
8.1020 provides single-source portability across MS~Windows, Mac~OS~X, Linux
8.1021 -ans all major commercial Unix variants. Qt is also available for
8.1022 +and all major commercial Unix variants. Qt is also available for
8.1023 embedded devices. Qt is a Trolltech product. For more information see
8.1024 \begin{center}
8.1025 \href{http://www.trolltech.com/qt/}{www.trolltech.com/qt}
8.1026 @@ -1126,7 +1101,7 @@
8.1027 %FIXME
8.1028
8.1029 \subsection{\vym file format} \label{fileformat}
8.1030 -\vym maps usually have the postfix "{\tt .vym}" and represent a
8.1031 +\vym maps usually have the suffix "{\tt .vym}" and represent a
8.1032 compressed archive of data. If you want to have a
8.1033 closer look into the data structure map called "mapname.vym",
8.1034 just uncompress the map manually using
8.1035 @@ -1233,7 +1208,7 @@
8.1036 In the end I came up with the default presentation style, which still
8.1037 could be simplified, just in case you have free time\ldots
8.1038
8.1039 -The existing templates are still work in progress, before you spent too
8.1040 +The existing templates are still work in progress, before you spend too
8.1041 much time developing your own style, please contact me. Basically the
8.1042 following steps are needed to build your own style:
8.1043 \begin{enumerate}
8.1044 @@ -1274,7 +1249,7 @@
8.1045 \end{center}
8.1046 \end{enumerate}
8.1047 Currently images are exported and notes just will appear as text
8.1048 -without formatting and colors.
8.1049 +without formatting and colours.
8.1050
8.1051
8.1052
9.1 --- a/texteditor.cpp Wed May 02 15:31:18 2007 +0000
9.2 +++ b/texteditor.cpp Wed May 02 15:31:20 2007 +0000
9.3 @@ -56,23 +56,23 @@
9.4 setInactive();
9.5
9.6 // Load Settings
9.7 - resize (settings.value ( "/noteeditor/geometry/size", QSize(450,600)).toSize());
9.8 - move (settings.value ( "/noteeditor/geometry/pos", QPoint (250,50)).toPoint());
9.9 + resize (settings.value ( "/satellite/noteeditor/geometry/size", QSize(450,600)).toSize());
9.10 + move (settings.value ( "/satellite/noteeditor/geometry/pos", QPoint (250,50)).toPoint());
9.11
9.12 - if (settings.value ( "/noteeditor/showWithMain",true).toBool())
9.13 - setShowWithMain(true);
9.14 + if (settings.value ( "/satellite/noteeditor/showWithMain",true).toBool())
9.15 + show();
9.16 else
9.17 - setShowWithMain(false);
9.18 + hide();
9.19
9.20 varFont.fromString( settings.value
9.21 - ("/noteeditor/fonts/varFont",
9.22 + ("/satellite/noteeditor/fonts/varFont",
9.23 "Nimbus Sans l,14,-1,5,48,0,0,0,0,0").toString()
9.24 );
9.25 fixedFont.fromString (settings.value(
9.26 - "/noteeditor/fonts/fixedFont",
9.27 + "/satellite/noteeditor/fonts/fixedFont",
9.28 "Courier,14,-1,5,48,0,0,0,1,0").toString()
9.29 );
9.30 - QString s=settings.value ("/noteeditor/fonts/fonthintDefault","variable").toString();
9.31 + QString s=settings.value ("/satellite/noteeditor/fonts/fonthintDefault","variable").toString();
9.32 if (s == "fixed")
9.33 {
9.34 actionSettingsFonthintDefault->setOn (true);
9.35 @@ -85,7 +85,7 @@
9.36 filenameHint="";
9.37
9.38 // Restore position of toolbars
9.39 - restoreState (settings.value("/noteeditor/state",0).toByteArray());
9.40 + restoreState (settings.value("/satellite/noteeditor/state",0).toByteArray());
9.41
9.42 // Save settings in vymrc
9.43 settings.setValue("/mainwindow/printerName",printer->printerName());
9.44 @@ -96,20 +96,20 @@
9.45 {
9.46 if (printer) delete printer;
9.47 // Save Settings
9.48 - settings.setValue( "/noteeditor/geometry/size", size() );
9.49 - settings.setValue( "/noteeditor/geometry/pos", pos() );
9.50 - settings.setValue ("/noteeditor/state",saveState(0));
9.51 + settings.setValue( "/satellite/noteeditor/geometry/size", size() );
9.52 + settings.setValue( "/satellite/noteeditor/geometry/pos", pos() );
9.53 + settings.setValue ("/satellite/noteeditor/state",saveState(0));
9.54
9.55 - settings.setValue( "/noteeditor/showWithMain",showWithMain());
9.56 + settings.setValue( "/satellite/noteeditor/showWithMain",isVisible());
9.57
9.58 QString s;
9.59 if (actionSettingsFonthintDefault->isOn() )
9.60 s="fixed";
9.61 else
9.62 s="variable";
9.63 - settings.setValue( "/noteeditor/fonts/fonthintDefault",s );
9.64 - settings.setValue("/noteeditor/fonts/varFont", varFont.toString() );
9.65 - settings.setValue("/noteeditor/fonts/fixedFont", fixedFont.toString() );
9.66 + settings.setValue( "/satellite/noteeditor/fonts/fonthintDefault",s );
9.67 + settings.setValue("/satellite/noteeditor/fonts/varFont", varFont.toString() );
9.68 + settings.setValue("/satellite/noteeditor/fonts/fixedFont", fixedFont.toString() );
9.69
9.70
9.71 }
9.72 @@ -122,16 +122,6 @@
9.73 return true;
9.74 }
9.75
9.76 -void TextEditor::setShowWithMain(bool v)
9.77 -{
9.78 - showwithmain=v;
9.79 -}
9.80 -
9.81 -bool TextEditor::showWithMain()
9.82 -{
9.83 - return showwithmain;
9.84 -}
9.85 -
9.86 void TextEditor::setFontHint (const QString &fh)
9.87 {
9.88 if (fh=="fixed")
9.89 @@ -499,7 +489,7 @@
9.90 void TextEditor::closeEvent( QCloseEvent* ce )
9.91 {
9.92 ce->accept(); // TextEditor can be reopened with show()
9.93 - showwithmain=false;
9.94 + hide();
9.95 emit (windowClosed() );
9.96 return;
9.97 }
10.1 --- a/texteditor.h Wed May 02 15:31:18 2007 +0000
10.2 +++ b/texteditor.h Wed May 02 15:31:20 2007 +0000
10.3 @@ -14,8 +14,6 @@
10.4 ~TextEditor();
10.5
10.6 bool isEmpty();
10.7 - void setShowWithMain (bool);
10.8 - bool showWithMain ();
10.9 void setFontHint(const QString&);
10.10 QString getFontHint();
10.11 QString getFontHintDefault();
10.12 @@ -86,7 +84,6 @@
10.13 QBrush filledPaper; // depending on the state
10.14 QBrush inactivePaper; // depending on the state
10.15 EditorState state;
10.16 - bool showwithmain; // same visibility as mainwindow?
10.17 bool blockChangedSignal;
10.18
10.19 QFont varFont;
11.1 --- a/version.h Wed May 02 15:31:18 2007 +0000
11.2 +++ b/version.h Wed May 02 15:31:20 2007 +0000
11.3 @@ -6,7 +6,7 @@
11.4 #define __VYM_NAME "VYM"
11.5 #define __VYM_VERSION "1.8.72"
11.6 #define __VYM_CODENAME "Codename: 1.9.0-beta-1"
11.7 -#define __VYM_BUILD_DATE "April 25, 2007"
11.8 +#define __VYM_BUILD_DATE "May 2, 2007"
11.9
11.10
11.11 bool checkVersion(const QString &);
12.1 --- a/vym.pro Wed May 02 15:31:18 2007 +0000
12.2 +++ b/vym.pro Wed May 02 15:31:20 2007 +0000
12.3 @@ -41,8 +41,8 @@
12.4 ornamentedobj.h \
12.5 parser.h \
12.6 process.h \
12.7 + selection.h \
12.8 showtextdialog.h\
12.9 - selection.h \
12.10 simplescripteditor.h\
12.11 texteditor.h \
12.12 version.h \
12.13 @@ -86,9 +86,9 @@
12.14 ornamentedobj.cpp \
12.15 parser.cpp \
12.16 process.cpp \
12.17 + selection.cpp \
12.18 showtextdialog.cpp \
12.19 simplescripteditor.cpp \
12.20 - selection.cpp \
12.21 texteditor.cpp \
12.22 version.cpp \
12.23 xml.cpp \