1.1 Binary file demos/liveform.vym has changed
2.1 Binary file demos/todo.vym has changed
3.1 --- a/tex/vym.changelog Thu May 17 20:19:04 2007 +0000
3.2 +++ b/tex/vym.changelog Thu May 17 20:19:07 2007 +0000
3.3 @@ -1,3 +1,19 @@
3.4 +-------------------------------------------------------------------
3.5 +Thu May 17 18:01:16 CEST 2007 - uwe
3.6 +
3.7 +- Bugfix: No selection of branches while editing heading
3.8 +- Bugfix: geometry of selection box gets updated while setting scroll or
3.9 + hide flag
3.10 +- Bugfix: Possible segfault when redoing deleteChilds()
3.11 +
3.12 +-------------------------------------------------------------------
3.13 +Mon May 7 09:37:29 CEST 2007 - uwedr
3.14 +
3.15 +- Version: 1.8.72
3.16 +- Bugfix: autosave timeout now read from settings file
3.17 +- Bugfix: Settings for historywindow correclty read now
3.18 +- Bugfix: Closing property window toggle corresponding button
3.19 +
3.20 -------------------------------------------------------------------
3.21 Thu Apr 26 10:34:48 CEST 2007 - uwe
3.22
4.1 --- a/tex/vym.tex Thu May 17 20:19:04 2007 +0000
4.2 +++ b/tex/vym.tex Thu May 17 20:19:07 2007 +0000
4.3 @@ -4,11 +4,7 @@
4.4 \usepackage{verbatim}
4.5 \usepackage{hyperref}
4.6 \usepackage{graphicx}
4.7 -\usepackage{longtable}
4.8 -
4.9 -
4.10 -%\input{udmath}
4.11 -
4.12 +%\usepackage{longtable}
4.13
4.14 \hypersetup{bookmarks, bookmarksopen,
4.15 pdftitle={VYM - a tool for visual thinking },
4.16 @@ -34,7 +30,7 @@
4.17 \title{
4.18 \includegraphics[width=8cm]{images/vym-logo-new.png}
4.19 \\
4.20 -VYM \\ -- \\View Your Mind\\ {\small Version 1.8.71}}
4.21 +VYM \\ -- \\View Your Mind\\ {\small Version 1.9.0}}
4.22 \author{\textcopyright Uwe Drechsel }
4.23
4.24
4.25 @@ -148,10 +144,22 @@
4.26
4.27 \section{The Concept of the \vym application}
4.28 %TODO may add a general introduction here...
4.29 -\subsection{Windows: Mapeditor, Noteeditor, and more}
4.30 -\vym uses two windows in the main: an editor for the map itself and another one for
4.31 -notes asociated with the branches, which are part of the map. Let's call them {\em mapeditor} and {\em noteeditor}:
4.32 -
4.33 +\subsection{The Mainwindow and its satellites} \label{satellite}
4.34 +\vym comes with several windows, the central one being the {\em
4.35 +mapeditor}.
4.36 +More windows, each having a special purpose, can be opened and arranged
4.37 +around the mainwindow\footnote{
4.38 + The advantage of having separate window instead of integrating them
4.39 + in a combined workspace is flexibility in arranging the windows. For
4.40 + example I usually have the {\em noteeditor} "behind" the {\em
4.41 + mapeditor}. On Linux my windowmanager (KDE) allows me to enter text
4.42 + into a small visible corner of the {\em noteeditor} withour clicking
4.43 + the mouse button in it. I just push the mouse around to set the
4.44 + window focus, a concept which is useful also working with
4.45 + \href{http://www.gimp.org}{http://www.gimp.org}.
4.46 +}.
4.47 +The image below shows the {\em mapeditor}
4.48 +together with the often used {\em noteeditor}:
4.49 \begin{center}
4.50 \includegraphics[width=8cm]{images/windows.png}
4.51 \end{center}
4.52 @@ -162,9 +170,13 @@
4.53 type or copy\&paste it into the {\em noteeditor}. Working with notes is
4.54 explained in \ref{noteeditor}
4.55
4.56 -A third window which can be toggled on or off is the {\em history
4.57 -window}. It can be used to see the latest actions performed on a map and
4.58 -also to undo and redo actions. Details are in \ref{historywindow}.
4.59 +Here is a list of the available satellite windows:
4.60 +\begin{itemize}
4.61 + \item Noteeditor (see \ref {noteeditor})
4.62 + \item Historywindow (see \ref{historywindow})
4.63 + \item Branch Property Window (see \ref{propwindow})
4.64 +\end{itemize}
4.65 +
4.66
4.67 \subsection{Menus and Context menus}
4.68 At the top of each window you will find the menubar. The options provided there
4.69 @@ -175,15 +187,16 @@
4.70
4.71 \subsection{Toolbars}
4.72 The toolbars in the mainwindows give quick access to many functions and
4.73 -also display the state of a branch. For example a part of of the map
4.74 -can be hidden when the map is exported into an Open~Office presentation.
4.75 -To show this the branch in the map will show a little cloud symbol,
4.76 -which is also "switched on" in the toolbar.
4.77 +also display the state of selected objects in the map. For example a
4.78 +branch may show certain {\em flags}, the corresponding flags are also
4.79 +set in the toolbar.
4.80
4.81 -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
4.82 -position on top of the mapeditor to a vertical position on the right
4.83 -side. You can even detach it and make it "float" separate from the other
4.84 -windows. Or just insert it again at its original position.
4.85 +Note that you can reposition all toolbars by simply grabbing and
4.86 +dragging them with the toolbar handle to a new position. For example you
4.87 +can move the flags-toolbar from its original horizontal position on top
4.88 +of the mapeditor to a vertical position on the right side. Or just
4.89 +insert it again at its original position. Also hiding some of the
4.90 +toolbars is possible by right-clicking on the toolbar handle.
4.91
4.92 \subsection{Maps}
4.93 The {\em map} itself has always a {\em mapcenter}. The
4.94 @@ -213,9 +226,6 @@
4.95 "thumb-up" flag is set, then the "thumb down" is reset and vice
4.96 versa. You can change this default behaviour in the settings menu.
4.97
4.98 -%TODO add info about toolbars e.g. undo/redo, ...
4.99 -%TODO or reference to advanced editing undo/redo
4.100 -
4.101 \section{Mapeditor} \label {mapeditor}
4.102 \subsection{Start a new map}
4.103 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
4.104 @@ -236,8 +246,8 @@
4.105 Sometimes it comes in handy to be able to add a new branch above or below the current
4.106 one.
4.107 \begin{itemize}
4.108 - \item Use \key{Shift} \together with \key{Ins} to add a branch above the selected one or...
4.109 - \item \key{Ctrl} \together with \key{Ins} to add one below.
4.110 + \item Use \key{Shift-Ins} to add a branch above the selected one or...
4.111 + \item \key{Ctrl-Ins} to add one below.
4.112 \end{itemize}
4.113 It is also
4.114 possible to add a branch in such a way, that the current selection
4.115 @@ -366,7 +376,7 @@
4.116 \item use the menu and choose e.g Format \ra Set Color
4.117 \item use the toolbar
4.118 \begin{center}
4.119 - \includegraphics[width=3cm]{images/colour-buttons.png}
4.120 + \includegraphics[width=3cm]{images/color-buttons.png}
4.121 \end{center}
4.122 \end{itemize}
4.123 The first button (black in the graphic above) shows the current colour.
4.124 @@ -408,7 +418,7 @@
4.125 webbrowser to the mapeditor while a branch is selected there.
4.126
4.127 You can also add an image to a branch by opening the context menu of the
4.128 -branch. Right click the selected branch, choose "Add" then "Add Image". A
4.129 +branch. Right click the selected branch, choose "Add Image". A
4.130 dialog window enables you choose the image to load.
4.131 \footnote{Supported image types are: PNG, BMP, XBM, XPM and PNM. It may
4.132 also support JPEG, MNG and GIF, if specially configured during
4.133 @@ -442,17 +452,16 @@
4.134 changing its z-value (put it into background) etc.
4.135
4.136 \subsubsection*{Frames}
4.137 -A frame can be added to a branch by clicking with the
4.138 -right-mouse button. A context menu will open, where you can choose the
4.139 -frame. At the moment just a rectangle is offered. "No Frame" will be offered as the default for branches,
4.140 -nevertheless you can use images as frames. Have a look at the demo map
4.141 -{\tt todo.vym} as an example, where the mapcenter is a cloud. You can
4.142 -use an external drawing program like {\tt gimp} to create an image,
4.143 +A frame can be added to a branch in the {\em property window} (see
4.144 +\ref{propwindow}).
4.145 +Alternatively, you can use use images as frames. Have a look at the demo
4.146 +map {\tt todo.vym} as an example, where the mapcenter is a cloud. You
4.147 +can use an external drawing program like {\tt gimp} to create an image,
4.148 preferable with an transparency channel, so that you can design frames
4.149 -which don't use a rectangular borderline, just like the cloud.
4.150 +which don't use a rectangular borderline, just like that cloud.
4.151
4.152
4.153 -\subsection{Background design}
4.154 +\subsection{Design of map background and connecting links }
4.155 The design of the background of a map and also of the links connecting
4.156 various parts of the map can be changed by
4.157 \begin{itemize}
4.158 @@ -460,8 +469,11 @@
4.159 \item Right clicking on the canvas, which will open a context menu
4.160 \end{itemize}
4.161
4.162 -\subsubsection*{Background colour}
4.163 +\subsubsection*{Background }
4.164 The colour is set (and also displayed) as "Set background colour".
4.165 +Alternatevily you can set an background image, though this is not
4.166 +recommended in general. Working on the map becomes slow and the image
4.167 +currently cannot be positioned freely.
4.168
4.169 \subsubsection*{Link colour}
4.170 Links connecting branches can be coloured in one of two ways:
4.171 @@ -514,6 +526,11 @@
4.172 For more information on working with bookmarks and webbrowsers see
4.173 section \ref{bookmarks}.
4.174
4.175 +In the context menu there is also an option to open all URLs found
4.176 +in the selected subtree of the map. That's useful to simultanously open
4.177 +a collection of URLs in the webbrowser, especially if the browser can
4.178 +open them in tabs (like Konqueror).
4.179 +
4.180
4.181 \subsubsection*{\vym map}
4.182 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
4.183 @@ -524,6 +541,10 @@
4.184 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
4.185 multiple maps). To delete an existing link, just right click the branch and select "Delete \vym link".
4.186
4.187 +In the context menu there is also an option to open all vymlinks found
4.188 +in the selected subtree of the map. That's useful to simultanously open
4.189 +a collection of related maps.
4.190 +
4.191 Technical note: Internally \vym uses absolute paths, to avoid opening
4.192 several tabs containing the same map. When a map is saved, this path is
4.193 converted to a relative one (e.g. {\tt /home/user/vym.map} might become
4.194 @@ -584,11 +605,6 @@
4.195 functions. You can delete the complete note by clicking the
4.196 trashcan. Only the note itself is printed by clicking the printer icon.
4.197
4.198 -When pasting into the editor using the X11 copy\&paste mechanism, the
4.199 -editor will create a paragraph for each new line. Usually this is not
4.200 -wanted, so there you can convert all paragraphs into linebreaks by using
4.201 -Edit~\ra~Remove~Paragraphs or \key{ALT-X}.
4.202 -
4.203 \subsection{RichText: Colours, paragraphs and formatted text}
4.204 \vym supports formatted text (QT Rich Text) in the noteeditor since
4.205 version 1.4.7. Colours and text attributes (e.g. italic, bold) can be
4.206 @@ -599,7 +615,7 @@
4.207
4.208 \subsection{Fonts and how to switch them quickly}
4.209 The noteeditor is designed to be used for simple notes, not really as a full
4.210 -featured word processor. Because of many requests \vym now supports
4.211 +featured word processor. Because of many requests \vym supports
4.212 formatted text in the noteeditor\footnote{
4.213 \vym uses the QRichtText format, which is basically a subset of the
4.214 formatting provided in HTML.}
4.215 @@ -627,6 +643,7 @@
4.216 an email. Normally \vym will generate a new paragraph for each new line.
4.217 This usually is not what you want, so you can choose from the menu
4.218
4.219 +
4.220 \section{Hello world}
4.221 This section is about how \vym can interact with other applications.
4.222 Many applications can now read and write their data using XML, the
4.223 @@ -791,8 +808,35 @@
4.224
4.225 \section{Advanced Editing}
4.226
4.227 +\subsection{Properties of an object}
4.228 +For any branch you can open a satellite window (see \ref{satellite}):
4.229 +the {\em property window}:
4.230 +\begin{center}
4.231 + \includegraphics[width=8cm]{images/propwindow.png}
4.232 + \label{propwindow}
4.233 +\end{center}
4.234 +%FIXME create screenshot
4.235 +%FIXME explain the tabs
4.236 +
4.237 +\begin{itemize}
4.238 + \item Frame
4.239 + \item Link (see \ref{hideunselected})
4.240 + \item Layout (see \ref{incimg})
4.241 +\end{itemize}
4.242 +
4.243 \subsection{Changing the history: Undo and Redo}
4.244 -%FIXME
4.245 +\vym keeps track of all changes done in a map. The default number of
4.246 +changes which can be undone is~75. The complete history can be seen in
4.247 +the {\em historywindow}:
4.248 +\begin{center}
4.249 + \includegraphics[width=8cm]{images/historywindow.png}
4.250 + \label{historywindow}
4.251 +\end{center}
4.252 +A single step back be undone or redone with \key{CTRL-Z} or \key{CTRL-Y},
4.253 +or by using the buttons in the toolbar or the {\em historywindow}.
4.254 +Inside the {\em historywindow}, you can click on a line to unwind all
4.255 +actions done until that point in time -- or redo all changes by clicking
4.256 +on the last line.
4.257
4.258 \subsection{Macros} \label{macros}
4.259 Macros have been added to \vym in version~1.9.0. Each function key
4.260 @@ -807,7 +851,7 @@
4.261 Settings menu. More information on using scripts in \vym is found in
4.262 appendix~\ref{scripts}.
4.263
4.264 -\subsection{How to deal with Bookmarks} \label{bookmarks}
4.265 +\subsection{Bookmarks} \label{bookmarks}
4.266 \subsubsection*{Open new tabs instead of new windows}
4.267 If you use konqueror as your browser, \vym will remember the konqueror session which
4.268 was opened first by \vym. You can also press \key{Ctrl} and click to
4.269 @@ -837,13 +881,13 @@
4.270 \end{itemize}
4.271 The URL will be build from the number in the heading.
4.272
4.273 -\subsection{Associating images with a branch}
4.274 +\subsection{Associating images with a branch} \label{incimg}
4.275 The default setting for an image is for it to float "freely". Images can be
4.276 positioned anywhere on the canvas, but may end up in the same place as other
4.277 parts of the map obscuring that part of the map.
4.278
4.279 The solution is to insert or include them "into" a branch. This can be done via
4.280 -the context menu of their parent branch:
4.281 +the property window (see \ref{propwindow}):
4.282 \begin{itemize}
4.283 \item Include images horizontally
4.284 \item Include images vertically
4.285 @@ -857,9 +901,10 @@
4.286 \subsection{Modifier Modes}
4.287 Modifiers are for example the \key{Shift}- the \key{Ctrl}- ot the \key{Alt}-keys. When
4.288 pressed while applying mouse actions, they will cause \vym to use
4.289 -a "modified" action. e.g. you can move branches with the mouse. If
4.290 -\key{Ctrl} or \key{Alt}is pressed while releasing the branch, it will be
4.291 -added above/below the target, not as child of the target.
4.292 +a "modified" version of the action which usually would be done.
4.293 +
4.294 +%\key{Ctrl} or \key{Alt}is pressed while releasing the branch, it will be
4.295 +%added above/below the target, not as child of the target.
4.296
4.297 Without a modifier key pressed, the first mouse click on a branch just selects
4.298 it. For the behaviour of the \key{Ctrl} modifier there are several
4.299 @@ -867,13 +912,14 @@
4.300 \begin{center}
4.301 \includegraphics[width=3cm]{images/modmodes.png}
4.302 \end{center}
4.303 -The default is to copy the colour from the clicked branch to the already
4.304 -selected branch. In the toolbar shown above the default modifier is
4.305 -selected, namely to copy the colour of a branch. The second modifier
4.306 +The default mode is to copy the colour from the clicked branch to the already
4.307 +selected branch. The figure above shows the toolbar with the default modifier
4.308 +selected. The second modifier
4.309 let's you easily copy a whole branch with a single click. The third
4.310 -modifier lets you create links between branches called {\em xLinks}. They will be explained in the next section.
4.311 +modifier lets you create links between branches called {\em xLinks}.
4.312 +They will be explained in the next section \ref{xlinks}.
4.313
4.314 -\subsection{Hide links of unselected objects}
4.315 +\subsection{Hide links of unselected objects} \label{hidelink}
4.316 Sometimes it would be useful to position a branch freely, just like a
4.317 mainbranch or an image. This is possible for all
4.318 branches, you can use a mainbranch and hide its connecting link to the
4.319 @@ -882,8 +928,9 @@
4.320 \begin{center}
4.321 \includegraphics[width=9cm]{images/hiddenlink.png}
4.322 \end{center}
4.323 -To hide the link between a branch and its parent open the context
4.324 -menu (Right Click) and check Hide link if object is not selected.
4.325 +To hide the link between a branch and its parent open the
4.326 +\ref{propwindow} and check "Hide link if object is not selected" on
4.327 +"Link" tab.
4.328
4.329
4.330 \subsection{XLinks} \label{xlinks}
4.331 @@ -906,11 +953,17 @@
4.332 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.
4.333
4.334 \subsubsection*{Modify or delete a xLink}
4.335 -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.
4.336 +First select a branch at either end of the xLink. Then open the context
4.337 +menu and select \lq Edit xLink\rq. A submenu contains all the xLinks of
4.338 +the branch (if there are any). They are named like the branches, where
4.339 +they end. Choose one and the xLink dialogue opens, where you can set
4.340 +colour, width and also delete the xLink.
4.341
4.342 \subsubsection*{Follow a xLink}
4.343 In a complex \vym map it sometimes comes in handy to be able to jump to the other end
4.344 -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.
4.345 +of a xLink. You can do this by opening the context menu of the branch
4.346 +and clicking on \lq Goto xLink\rq and selecting the xLink you want to
4.347 +follow.
4.348
4.349
4.350
4.351 @@ -922,10 +975,11 @@
4.352 shortcuts also have a look at the context menu.
4.353
4.354 \subsection{Adding a whole map or a part of a map}
4.355 -Select a branch where you want to add a previously saved map ({\tt .vym})or a part
4.356 -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.
4.357 -
4.358 -\label{historywindow}
4.359 +Select a branch where you want to add a previously saved map ({\tt
4.360 +.vym})or a part of a map ({\tt .vyp}) , then open the context menu and
4.361 +choose {\em Add \ra Add Map (Insert)}. For the import you can choose
4.362 +between {\em Add Map (Insert)} and {\em Add Map (Replace)}: The imported
4.363 +data will be added after the selected branch.
4.364
4.365 \section{\vym on Mac OS X}
4.366 \subsection{Overview}
4.367 @@ -992,7 +1046,7 @@
4.368 \begin{center}
4.369 \begin{tabular}{cccp{8cm}}\\
4.370 \bf Option & \bf Comment & \bf Argument & \bf Description \\ \hline
4.371 -v & version & & Show version ov \vym\\
4.372 +v & version & & Show version and codename of \vym\\
4.373 l & local & & Use local paths to stylesheets, translations, icons,
4.374 etc. instead of system paths. Useful for testing\\
4.375 h & help & & Show help\\
5.1 --- a/version.h Thu May 17 20:19:04 2007 +0000
5.2 +++ b/version.h Thu May 17 20:19:07 2007 +0000
5.3 @@ -5,8 +5,9 @@
5.4
5.5 #define __VYM_NAME "VYM"
5.6 #define __VYM_VERSION "1.8.72"
5.7 -#define __VYM_CODENAME "Codename: 1.9.0-beta-1"
5.8 -#define __VYM_BUILD_DATE "May 3, 2007"
5.9 +//#define __VYM_CODENAME "Codename: 1.9.0-beta-1"
5.10 +#define __VYM_CODENAME "Codename: development version"
5.11 +#define __VYM_BUILD_DATE "May 16, 2007"
5.12
5.13
5.14 bool checkVersion(const QString &);