"
diff -r e0f6a21cc6d6 -r 8cdfa8dda71e mapeditor.cpp
--- a/mapeditor.cpp Fri Jul 08 08:06:36 2005 +0000
+++ b/mapeditor.cpp Mon Jul 11 19:55:57 2005 +0000
@@ -2407,9 +2407,9 @@
if (bo->countXLinks()==0)
{
branchLinksContextMenu->clear();
- branchLinksContextMenu->insertItem ("No link available");
+ branchLinksContextMenu->insertItem ("No xLink available");
branchLinksContextMenuDup->clear();
- branchLinksContextMenuDup->insertItem ("No link available");
+ branchLinksContextMenuDup->insertItem ("No xLink available");
} else
{
@@ -3407,6 +3407,7 @@
event->accept(true);
return;
}
+
}
event->ignore();
@@ -3435,8 +3436,7 @@
}
}
-void
-MapEditor::addFloatImage(const QPixmap &img)
+void MapEditor::addFloatImage(const QPixmap &img)
{
if (selection &&
(typeid(*selection) == typeid(BranchObj)) ||
diff -r e0f6a21cc6d6 -r 8cdfa8dda71e tex/vym.tex
--- a/tex/vym.tex Fri Jul 08 08:06:36 2005 +0000
+++ b/tex/vym.tex Mon Jul 11 19:55:57 2005 +0000
@@ -69,30 +69,35 @@
other things -- a map makes use of those connections and stimulates
new asccociations.
+
\subsubsection*{Your Brain}
In 1960 the Prof. {\sc Roger Sperry} discovered that both hemispheres
of the human brain have different tasks (of course both of them
-basically {\em can} do the same): The left side is specialised in
-\begin{itemize}
- \item verbal speech and writing
- \item numbers
- \item logical thinking
- \item analyzing and details
- \item science
- \item linear thinking
- \item concept of time
-\end{itemize}
-while the right side of the human brain is specialised in
-\begin{itemize}
- \item body language
- \item visual thinking, day dreams
- \item intuition and emotion
- \item overview of things
- \item creativity
- \item art, music, dancing
- \item non-linear thinking, connecting things
- \item spatial awareness
-\end{itemize}
+basically {\em can} do the same):
+\begin{center}
+\begin{tabular}{|p{5.5cm}|p{5.5cm}|} \hline
+ Left side & Right side \\ \hline
+ \begin{itemize}
+ \item verbal speech and writing
+ \item numbers
+ \item logical thinking
+ \item analyzing and details
+ \item science
+ \item linear thinking
+ \item concept of time
+ \end{itemize} &
+ \begin{itemize}
+ \item body language
+ \item visual thinking, day dreams
+ \item intuition and emotion
+ \item overview of things
+ \item creativity
+ \item art, music, dancing
+ \item non-linear thinking, connecting things
+ \item spatial awareness
+ \end{itemize} \\ \hline
+\end{tabular}
+\end{center}
In our science oriented society we have learned to mainly rely on our
left side of the brain, the "rational" one. In other cultures,
especially like the native americans and other "old" cultures, the right
@@ -118,7 +123,16 @@
%\section{Tutorials}
%TODO
-\section{Concept}
+\subsection{Internet Ressources}
+A good starting point to learn more about maps in general is Wikipedia:
+\begin{itemize}
+ \item English:
+ \href{http://en.wikipedia.org/wiki/Mind_map}{http://en.wikipedia.org/wiki/Mind\_map}
+ \item German:
+ \href{http://de.wikipedia.org/wiki/Mindmap}{http://de.wikipedia.org/wiki/Mindmap}
+\end{itemize}
+
+\subsection{Concept of \vym}
%TODO may add a general introduction here...
@@ -350,8 +364,11 @@
of \vym may have another kind of flags, which may be edited by the user.
\subsubsection*{Images}
-You can add a image to a branch or the mapcenter by clicking with the
-right-mouse button. A context menu will open, choose "Add Image". A
+The easiest way to add an image to a branch is by dragging it e.g. from a
+webbrowser to the mapeditor while a branch is selected there.
+
+You can also add a image to a branch by opening the context menu of the
+branch choose "Add Image". A
dialog window lets you choose the image to load.
\footnote{Supported image types are: PNG, BMP, XBM, XPM and PNM. It may
also support JPEG, MNG and GIF, if specially configured during
@@ -495,10 +512,9 @@
\section{Noteeditor} \label {noteeditor}
If you want to save more text in a branch e.g. a complete email, a
cooking recipe, or the whole source code of a software project, you can
-use the noteeditor. Since version 1.4.7 \vym supports formatted text in
-the noteeditor.
+use the noteeditor.
-\subsubsection*{States}
+\subsection{States}
Before you can type or paste text into it, you have
to select a branch in the mapeditor. Note that the background color
of the noteeditor indicates its state:
@@ -514,12 +530,12 @@
\includegraphics[width=8cm]{branches-flags.png}
\end{center}
-\subsubsection*{Import and export notes}
+\subsection{Import and export notes}
The note is always saved automatically within the \vym file itself.
Nevertheless sometimes it is nice to import a note from an external file
or write it. Use "File\ra~Import" and "File\ra~Export" to do so.
-\subsubsection*{Edit and print note}
+\subsection{Edit and print note}
Editing works like in any simple texteditor, including undo and redo
functions. You can delete the complete note by clicking the
trashcan. Only the note itself is printed by clicking the printer icon.
@@ -529,7 +545,7 @@
wanted, so there you can convert all paragraphs into linebreaks by using
Edit~\ra~Remove~Paragraphs or \key{ALT-X}.
-\subsubsection*{Fonts}
+\subsection{Fonts}
The noteeditor is ment to be used for simple notes, not really as full
featured text editor. Because of many requests \vym supports now
formatted text in the noteeditor\footnote{
@@ -551,29 +567,30 @@
be used. Please note, that the chosen font also will be used for HTML
exports, so you should only use fonts which are available generally.
-\subsubsection*{Colors and formatted text}
-Colors and text attributes (e.g. italic, bold) can
-be set with the buttons above the text.
-The text itself is divided in paragraphs. For each paragraph the format
-can be set (e.g. centered, right). A paragraph is ended when a
-\key{Return} is entered. If you just want to begin a new line, press
-\key{CTRL-Return}.
+\subsection{Colors and formatted text}
+\vym supports formatted text (QT Rich Text) in the noteeditor since
+version 1.4.7. Colors and text attributes (e.g. italic, bold) can be
+set with the buttons above the text. The text itself is divided in
+paragraphs. For each paragraph the format can be set (e.g. centered,
+right). A paragraph is ended when a \key{Return} is entered. If you just
+want to begin a new line, press \key{CTRL-Return}.
-\subsubsection*{Finding text}
+\subsection{Finding text}
The noteeditor itself has no Find function, use Find in the mapeditor,
which will also search all notes (see \ref{findwindow}).
-\subsubsection*{Pasting text into note editor}
+\subsection{Pasting text into note editor}
Often you will paste text into the editor from another application e.g.
an email. Normally \vym will generate a new paragraph for each new line.
This usually is not what you want, so you can choose from the menu
-\paragraph{Edit \ra Convert Paragraphs:}
-This turns paragraphs in selected text (or all text, if nothing is
+\subsection{Advanced actions}
+\subsubsection{Edit \ra Convert subsubsections:}
+This turns subsubsections in selected text (or all text, if nothing is
selected) into linebreaks. This is especially useful for snippets of
source code.
-\paragraph{Edit \ra Join Lines:}
+\subsubsection{Edit \ra Join Lines:}
Tries to format text, so that empty lines are used to delimit
paragraphs. This is done for selected text (or all text, if nothing is
selected). Especially useful for text like emails, meeting minutes etc.
@@ -713,10 +730,75 @@
choose between {\em Import Add} and {\em Import Replace}: The imported
data will be added after the selection resp. replace the selection.
-%TODO
-%\subsubsection{Menus}
-%\subsubsection{Keyboard shortcuts}
-%Where does vym save its settings? -> ~/.qt/vymrc
+
+\section{Advanced Editing}
+\vym offers a few shortcuts to let you work more quickly and literally
+to connect any branches directly.
+\subsection{Modifier Modes}
+Modifiers are for example the \key{Shift}- or the \key{Alt}-keys. When
+pressed while doing actions with the mouse, they will cause \vym to use
+a "modified" action. E.g. you can move branches with mouse. If
+\key{Ctrl} or \key{Alt}is pressed while releasing the branch, it will be
+added above/below the target, not as child of the target.
+
+Without a modifier pressed, the first click on a branch just selects
+it. For the behaviour of the \key{Ctrl} modifier there are several
+options, which can be set from the modifier toolbar:
+\begin{center}
+ \includegraphics[width=3cm]{modmodes.png}
+\end{center}
+The default is to copy the color from the clicked branch to the already
+selected branch. In the toolbar shown above the default modifier is
+selected, namely to copy the color of a branch. The second modifier
+let's you easily copy a whole branch with a single click. The third
+modifier lets you create {\em xLinks}, which will be explained in the
+next section.
+
+\subsection{XLinks}
+So far all the data in the \vym map has been treelike. Using xLinks you
+can link one branch to any other, just like attaching a rope between two
+branches in a real tree. This is especially useful in complex maps,
+where you want to have crossreferences which don't fit on the same
+visible area, which fits on your screen. The following example, which is
+part of the \vym package, 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:
+\begin{center}
+ \includegraphics[width=12cm]{xlink.png}
+\end{center}
+Note that a xLink which points to a branch that is not visible (because
+it is scrolled), is just show as a little horizontal arrow. In the
+screenshot above have a look at the \lq Tuesday\rq\ branch.
+
+\subsubsection{Create a xLink}
+Choose the link mode from the modifier toolbar (by clicking or pressing
+\key{L}). Select the branch, where the xLink should start. Press the
+modifier key \key{Ctr} and simultanously click on the branch where the
+link should end. (The link is already drawn before you release the mouse
+key). If you release the mouse over a branch the xLink becomes
+permanent.
+
+\subsubsection{Modify or delete a xLink}
+Open the context menu of a branch 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 color, width and also delete
+the xLink.
+
+\subsubsection{Follow a xLink}
+In a complext \vym map it sometimes comes handy to jump to the other end
+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.
+
+
+
+\subsection{Adding and removing links}
+The context menu of a branch shows some more ways to add and delete data
+e.g. you can delete a branch while keeping its childs. The childs become
+linked to the parent of the previously removed branch.
+Similar branches can be inserted into existing maps. For keyboard
+shortcuts also have a look at the context menu.
\section{\vym on Mac OS X}
@@ -732,7 +814,29 @@
handling will also be those of the Linux version e.g. The menu bar
will look different.
-%TODO Concept on Mac context menu, shortcuts...
+\subsection {Contextmenu and special keys}
+Most Macs unfortunatly just have a single mouse button. In order to show
+the context menu which usually would be opened with the right mouse
+button, you can click while pressing the \key{kommand}-key.
+
+Especially on Laptops some of the keys usually used on PC keyboards seem
+to be missing. The QT-Mac Edition of \vym has its own keyboard
+shortcuts. To find the shortcuts just have a look at all the menu
+entries, the shortcut is visible next to an entry. Toolbar buttons also
+may have shortcuts, just position the mouse pointer over a button and
+wait for the little help window to appear.
+
+\subsection {Viewing external links}
+\vym on Mac uses the system call {\tt /usr/bin/open} to view links.
+Mac~OS determines automatically if the link is a pdf or www page and
+opens the right browser.
+
+\subsection{Compiling \vym on Macs}
+Please refer to the documentation available on the internet:
+\begin{center}
+\href{http://www.InSilmaril.de/vym/faq.html}{http://www.InSilmaril.de/vym/faq.html}
+\end{center}
+\end{document}
\section{History of \vym}
\subsection{Future}
@@ -971,6 +1075,11 @@
\end{longtable}
\end{center}
+%TODO
+%\subsubsection{Menus}
+%\subsubsection{Keyboard shortcuts}
+%Where does vym save its settings? -> ~/.qt/vymrc
+
% INDEX
% mapeditor
@@ -994,9 +1103,10 @@
% fold
% vymlink
% xlink
+% modMode
% context menu
% Mac OS X
-\end{document}
\ No newline at end of file
+\end{document}
diff -r e0f6a21cc6d6 -r 8cdfa8dda71e version.h
--- a/version.h Fri Jul 08 08:06:36 2005 +0000
+++ b/version.h Mon Jul 11 19:55:57 2005 +0000
@@ -1,7 +1,7 @@
#ifndef VERSION_H
#define VERSION_H
-#define __VYM_VERSION__ "1.6.9"
-#define __BUILD_DATE__ "July 04, 2005"
+#define __VYM_VERSION__ "1.6.10"
+#define __BUILD_DATE__ "July 11, 2005"
#endif