Spanish doc is found, if LANG is set. Fixed wrong position of floatimages
1.1 --- a/aboutdialog.cpp Tue Oct 24 15:36:38 2006 +0000
1.2 +++ b/aboutdialog.cpp Mon Oct 30 12:39:37 2006 +0000
1.3 @@ -192,8 +192,8 @@
1.4 //if (!proc->waitForStarted() &&mainWindow->settingsURL() ) setSource(url);
1.5 if (!proc->waitForStarted() )
1.6 QMessageBox::warning(0,
1.7 - tr("Warning"),
1.8 - tr("Couldn't find a viewer to open %1.\n").arg(url)+
1.9 + tr("Warning","About window"),
1.10 + tr("Couldn't find a viewer to open %1.\n","About window").arg(url)+
1.11 tr("Please use Settings->")+tr("Set application to open an URL"));
1.12
1.13 }
2.1 --- a/api.cpp Tue Oct 24 15:36:38 2006 +0000
2.2 +++ b/api.cpp Mon Oct 30 12:39:37 2006 +0000
2.3 @@ -197,19 +197,19 @@
2.4 // a variable later
2.5 QString r;
2.6 ok=true;
2.7 - /*
2.8 - QRegExp re("\"(.*)\"");
2.9 - int pos=re.search (paramList[index]);
2.10 - if (pos>=0)
2.11 - r=re.cap (1);
2.12 - else
2.13 - r="";
2.14 - */
2.15 - if (paramList[index]=="true")
2.16 + QString p=paramList[index];
2.17 + if (p=="true" || p=="1")
2.18 return true;
2.19 - else if (paramList[index]=="false")
2.20 + else if (p=="false" || p=="0")
2.21 return false;
2.22 ok=false;
2.23 return ok;
2.24 }
2.25
2.26 +QColor API::parColor(bool &ok,const int &index)
2.27 +{
2.28 + // return the QColor at index
2.29 + ok=true;
2.30 + return QColor (paramList[index]);
2.31 +}
2.32 +
3.1 --- a/api.h Tue Oct 24 15:36:38 2006 +0000
3.2 +++ b/api.h Mon Oct 30 12:39:37 2006 +0000
3.3 @@ -1,6 +1,7 @@
3.4 #ifndef API_H
3.5 #define API_H
3.6
3.7 +#include <QColor>
3.8 #include <QStringList>
3.9
3.10 enum ErrorLevel {NoError,Warning,Aborted};
3.11 @@ -25,6 +26,7 @@
3.12 int parInt (bool &,const uint &index);
3.13 QString parString(bool &ok,const int &index);
3.14 bool parBool (bool &ok, const int &index);
3.15 + QColor parColor (bool &ok, const int &index);
3.16 private:
3.17 QString input;
3.18 QString com;
4.1 --- a/branchobj.cpp Tue Oct 24 15:36:38 2006 +0000
4.2 +++ b/branchobj.cpp Mon Oct 30 12:39:37 2006 +0000
4.3 @@ -921,7 +921,7 @@
4.4 return a;
4.5 }
4.6
4.7 -LinkableMapObj* BranchObj::addFloatImage ()
4.8 +FloatImageObj* BranchObj::addFloatImage ()
4.9 {
4.10 FloatImageObj *newfi=new FloatImageObj (canvas,this);
4.11 floatimage.append (newfi);
4.12 @@ -929,13 +929,15 @@
4.13 newfi->setVisibility (false);
4.14 else
4.15 newfi->setVisibility(visible);
4.16 + /*
4.17 calcBBoxSize();
4.18 positionBBox();
4.19 + */
4.20 requestReposition();
4.21 return newfi;
4.22 }
4.23
4.24 -LinkableMapObj* BranchObj::addFloatImage (FloatImageObj *fio)
4.25 +FloatImageObj* BranchObj::addFloatImage (FloatImageObj *fio)
4.26 {
4.27 FloatImageObj *newfi=new FloatImageObj (canvas,this);
4.28 floatimage.append (newfi);
4.29 @@ -944,8 +946,10 @@
4.30 newfi->setVisibility (false);
4.31 else
4.32 newfi->setVisibility(visible);
4.33 + /*
4.34 calcBBoxSize();
4.35 positionBBox();
4.36 + */
4.37 requestReposition();
4.38 return newfi;
4.39 }
5.1 --- a/branchobj.h Tue Oct 24 15:36:38 2006 +0000
5.2 +++ b/branchobj.h Mon Oct 30 12:39:37 2006 +0000
5.3 @@ -82,8 +82,8 @@
5.4 void setIncludeImagesHor(bool);
5.5 bool getIncludeImagesHor();
5.6 QString getIncludeImageAttr();
5.7 - virtual LinkableMapObj* addFloatImage();
5.8 - virtual LinkableMapObj* addFloatImage(FloatImageObj*);
5.9 + virtual FloatImageObj* addFloatImage();
5.10 + virtual FloatImageObj* addFloatImage(FloatImageObj*);
5.11 virtual void removeFloatImage(FloatImageObj*);
5.12 virtual FloatImageObj* getFirstFloatImage();
5.13 virtual FloatImageObj* getLastFloatImage();
6.1 Binary file demos/todo.vym has changed
7.1 --- a/floatimageobj.cpp Tue Oct 24 15:36:38 2006 +0000
7.2 +++ b/floatimageobj.cpp Mon Oct 30 12:39:37 2006 +0000
7.3 @@ -86,7 +86,7 @@
7.4 clickBox.setSize (QSize(icon->size().width()+8, icon->size().height()+8));
7.5 positionBBox();
7.6 filetype="PNG";
7.7 - filename="noname.png";
7.8 + filename="No filename given";
7.9 }
7.10
7.11 bool FloatImageObj::load (const QString &fn)
8.1 --- a/floatobj.cpp Tue Oct 24 15:36:38 2006 +0000
8.2 +++ b/floatobj.cpp Mon Oct 30 12:39:37 2006 +0000
8.3 @@ -89,7 +89,7 @@
8.4
8.5 void FloatObj::reposition()
8.6 {
8.7 - move (parObj->getChildPos().x()+relPos.x(), parObj->getChildPos().y()+relPos.y());
8.8 + move2RelPos (relPos);
8.9 updateLink();
8.10 }
8.11
9.1 --- a/lang/vym_de.ts Tue Oct 24 15:36:38 2006 +0000
9.2 +++ b/lang/vym_de.ts Mon Oct 30 12:39:37 2006 +0000
9.3 @@ -12,26 +12,57 @@
9.4 </message>
9.5 </context>
9.6 <context>
9.7 + <name>AboutTextBrowser</name>
9.8 + <message>
9.9 + <source>Warning</source>
9.10 + <translation type="obsolete">Warnung</translation>
9.11 + </message>
9.12 + <message>
9.13 + <source>Couldn't find a viewer to open %1.
9.14 +</source>
9.15 + <translation type="obsolete">Konnte kein Programm zum Öffnen von %1 finden.</translation>
9.16 + </message>
9.17 + <message>
9.18 + <source>Please use Settings-></source>
9.19 + <translation>Bitte setzen sie einen Pfad in Einstellungen-></translation>
9.20 + </message>
9.21 + <message>
9.22 + <source>Set application to open an URL</source>
9.23 + <translation>URLs öffnen mit...</translation>
9.24 + </message>
9.25 + <message>
9.26 + <source>Warning</source>
9.27 + <comment>About window</comment>
9.28 + <translation type="unfinished">Warnung</translation>
9.29 + </message>
9.30 + <message>
9.31 + <source>Couldn't find a viewer to open %1.
9.32 +</source>
9.33 + <comment>About window</comment>
9.34 + <translation type="unfinished">Konnte kein Programm zum Öffnen von %1 finden.</translation>
9.35 + </message>
9.36 +</context>
9.37 +<context>
9.38 <name>EditXLinkDialog</name>
9.39 <message>
9.40 <source>Edit XLink</source>
9.41 - <translation type="obsolete">xLink ändern</translation>
9.42 + <translation>xLink ändern</translation>
9.43 </message>
9.44 <message>
9.45 <source>XLink width:</source>
9.46 - <translation type="obsolete">xLink Dicke:</translation>
9.47 + <translation>xLink Dicke:</translation>
9.48 </message>
9.49 <message>
9.50 <source>Set color of heading</source>
9.51 - <translation type="obsolete">Farbe Heading</translation>
9.52 + <translation>Farbe Heading</translation>
9.53 </message>
9.54 <message>
9.55 <source>XLink color:</source>
9.56 - <translation type="obsolete">Farbe xLink:</translation>
9.57 + <translation>Farbe xLink:</translation>
9.58 </message>
9.59 <message>
9.60 <source>Use as default:</source>
9.61 - <translation type="obsolete">Als Standard verwenden:</translation>
9.62 + <translation>Als Standard verwenden:</translation>
9.63 </message>
9.64 <message>
9.65 <source>Delete XLink</source>
9.66 @@ -39,7 +70,11 @@
9.67 </message>
9.68 <message>
9.69 <source>Ok</source>
9.70 - <translation type="obsolete">Ok</translation>
9.71 + <translation>Ok</translation>
9.72 + </message>
9.73 + <message>
9.74 + <source>Quit and delete XLink</source>
9.75 + <translation></translation>
9.76 </message>
9.77 </context>
9.78 <context>
9.79 @@ -113,7 +148,7 @@
9.80 <name>ExportXHTMLDialog</name>
9.81 <message>
9.82 <source>Export XHTML</source>
9.83 - <translation type="obsolete">Exportiere XHTML</translation>
9.84 + <translation>Exportiere XHTML</translation>
9.85 </message>
9.86 <message>
9.87 <source>Directory:</source>
9.88 @@ -121,15 +156,15 @@
9.89 </message>
9.90 <message>
9.91 <source>Browse</source>
9.92 - <translation type="obsolete">Durchsuchen</translation>
9.93 + <translation>Durchsuchen</translation>
9.94 </message>
9.95 <message>
9.96 <source>Options</source>
9.97 - <translation type="obsolete">Optionen</translation>
9.98 + <translation>Optionen</translation>
9.99 </message>
9.100 <message>
9.101 <source>Include image</source>
9.102 - <translation type="obsolete">Bild erzeugen</translation>
9.103 + <translation>Bild erzeugen</translation>
9.104 </message>
9.105 <message>
9.106 <source>Include text</source>
9.107 @@ -137,23 +172,23 @@
9.108 </message>
9.109 <message>
9.110 <source>show output of external scripts</source>
9.111 - <translation type="obsolete">Zeige Ausgabe der externen Skripte</translation>
9.112 + <translation>Zeige Ausgabe der externen Skripte</translation>
9.113 </message>
9.114 <message>
9.115 <source>Export</source>
9.116 - <translation type="obsolete">Exportieren</translation>
9.117 + <translation>Exportieren</translation>
9.118 </message>
9.119 <message>
9.120 <source>Cancel</source>
9.121 - <translation type="obsolete">Abbrechen</translation>
9.122 + <translation>Abbrechen</translation>
9.123 </message>
9.124 <message>
9.125 <source>VYM - Export HTML to directory</source>
9.126 - <translation type="obsolete">VYM - Exportiere HTML in Verzeichnis</translation>
9.127 + <translation>VYM - Exportiere HTML in Verzeichnis</translation>
9.128 </message>
9.129 <message>
9.130 <source>Critical Error</source>
9.131 - <translation type="obsolete">Kritischer Fehler</translation>
9.132 + <translation>Kritischer Fehler</translation>
9.133 </message>
9.134 <message>
9.135 <source>Couldn't start </source>
9.136 @@ -165,39 +200,39 @@
9.137 </message>
9.138 <message>
9.139 <source>Export to directory:</source>
9.140 - <translation type="obsolete">Export Verzeichnis:</translation>
9.141 + <translation>Export Verzeichnis:</translation>
9.142 </message>
9.143 <message>
9.144 <source>Colored headings in text</source>
9.145 - <translation type="obsolete">Farbige Headings im Text</translation>
9.146 + <translation>Farbige Headings im Text</translation>
9.147 </message>
9.148 <message>
9.149 <source>showWarnings e.g. if directory is not empty</source>
9.150 - <translation type="obsolete">Warnung, falls Verzeichnis nicht leer ist</translation>
9.151 + <translation>Warnung, falls Verzeichnis nicht leer ist</translation>
9.152 </message>
9.153 <message>
9.154 <source>Stylesheets</source>
9.155 - <translation type="obsolete">Stylesheets</translation>
9.156 + <translation>Stylesheets</translation>
9.157 </message>
9.158 <message>
9.159 <source>CSS:</source>
9.160 - <translation type="obsolete">CSS:</translation>
9.161 + <translation>CSS:</translation>
9.162 </message>
9.163 <message>
9.164 <source>XSL:</source>
9.165 - <translation type="obsolete">XSL:</translation>
9.166 + <translation>XSL:</translation>
9.167 </message>
9.168 <message>
9.169 <source>VYM - Path to CSS file</source>
9.170 - <translation type="obsolete">VYM - Pfad zu CSS Datei</translation>
9.171 + <translation>VYM - Pfad zu CSS Datei</translation>
9.172 </message>
9.173 <message>
9.174 <source>VYM - Path to XSL file</source>
9.175 - <translation type="obsolete">VYM - Pfad zu XSL Datei</translation>
9.176 + <translation>VYM - Pfad zu XSL Datei</translation>
9.177 </message>
9.178 <message>
9.179 <source>Warning</source>
9.180 - <translation type="obsolete">Warnung</translation>
9.181 + <translation>Warnung</translation>
9.182 </message>
9.183 <message>
9.184 <source> could not be opened!</source>
9.185 @@ -205,19 +240,19 @@
9.186 </message>
9.187 <message>
9.188 <source>Save settings in map</source>
9.189 - <translation type="obsolete">Einstellungen in map speichern</translation>
9.190 + <translation>Einstellungen in map speichern</translation>
9.191 </message>
9.192 <message>
9.193 <source>Scripts</source>
9.194 - <translation type="obsolete">Skripte</translation>
9.195 + <translation>Skripte</translation>
9.196 </message>
9.197 <message>
9.198 <source>Before export:</source>
9.199 - <translation type="obsolete">Vor Export:</translation>
9.200 + <translation>Vor Export:</translation>
9.201 </message>
9.202 <message>
9.203 <source>After Export:</source>
9.204 - <translation type="obsolete">Nach Export:</translation>
9.205 + <translation>Nach Export:</translation>
9.206 </message>
9.207 <message>
9.208 <source>The settings saved in the map would like to run scripts:
9.209 @@ -235,11 +270,11 @@
9.210 </message>
9.211 <message>
9.212 <source>VYM - Path to pre export script</source>
9.213 - <translation type="obsolete">VYM - Pfad für Prä-Export Skript</translation>
9.214 + <translation>VYM - Pfad für Prä-Export Skript</translation>
9.215 </message>
9.216 <message>
9.217 <source>VYM - Path to post export script</source>
9.218 - <translation type="obsolete">VYM -Pfad für Post-Export Skript</translation>
9.219 + <translation>VYM -Pfad für Post-Export Skript</translation>
9.220 </message>
9.221 <message>
9.222 <source>Stylesheets:</source>
9.223 @@ -256,7 +291,7 @@
9.224
9.225 Please check, if you really
9.226 want to allow this in your system!</source>
9.227 - <translation type="obsolete">Die in der Map gespeicherten Einstellungen möchten gerne Skripte starten:
9.228 + <translation>Die in der Map gespeicherten Einstellungen möchten gerne Skripte starten:
9.229
9.230 %1
9.231
9.232 @@ -264,19 +299,19 @@
9.233 </message>
9.234 <message>
9.235 <source>Could not open %1</source>
9.236 - <translation type="obsolete">%1 konnte nicht geöffnet werden</translation>
9.237 + <translation>%1 konnte nicht geöffnet werden</translation>
9.238 </message>
9.239 <message>
9.240 <source>Could not write %1</source>
9.241 - <translation type="obsolete">%1 konnte nicht geschrieben werden</translation>
9.242 + <translation>%1 konnte nicht geschrieben werden</translation>
9.243 </message>
9.244 <message>
9.245 <source>Could not start %1</source>
9.246 - <translation type="obsolete">Konnte %1 nicht starten</translation>
9.247 + <translation>Konnte %1 nicht starten</translation>
9.248 </message>
9.249 <message>
9.250 <source>%1 didn't exit normally</source>
9.251 - <translation type="obsolete">%1 wurde nicht richtig beendet</translation>
9.252 + <translation>%1 wurde nicht richtig beendet</translation>
9.253 </message>
9.254 <message>
9.255 <source>Couldn't start %1</source>
9.256 @@ -287,31 +322,31 @@
9.257 <name>ExtraInfoDialog</name>
9.258 <message>
9.259 <source>VYM - Info</source>
9.260 - <translation type="obsolete">VYM - Info</translation>
9.261 + <translation>VYM - Info</translation>
9.262 </message>
9.263 <message>
9.264 <source>Map:</source>
9.265 - <translation type="obsolete">Map:</translation>
9.266 + <translation>Map:</translation>
9.267 </message>
9.268 <message>
9.269 <source>Author:</source>
9.270 - <translation type="obsolete">Author:</translation>
9.271 + <translation>Author:</translation>
9.272 </message>
9.273 <message>
9.274 <source>Comment:</source>
9.275 - <translation type="obsolete">Kommentar:</translation>
9.276 + <translation>Kommentar:</translation>
9.277 </message>
9.278 <message>
9.279 <source>Statistics:</source>
9.280 - <translation type="obsolete">Statistik:</translation>
9.281 + <translation>Statistik:</translation>
9.282 </message>
9.283 <message>
9.284 <source>Cancel</source>
9.285 - <translation type="obsolete">Abbrechen</translation>
9.286 + <translation>Abbrechen</translation>
9.287 </message>
9.288 <message>
9.289 <source>Close</source>
9.290 - <translation type="obsolete">Schliessen</translation>
9.291 + <translation>Schliessen</translation>
9.292 </message>
9.293 </context>
9.294 <context>
9.295 @@ -341,44 +376,51 @@
9.296 <name>HistoryWindow</name>
9.297 <message>
9.298 <source>Dialog</source>
9.299 - <translation type="unfinished"></translation>
9.300 + <translation></translation>
9.301 </message>
9.302 <message>
9.303 <source>Redo</source>
9.304 - <translation type="unfinished">Wiederherstellen</translation>
9.305 + <translation>Wiederherstellen</translation>
9.306 </message>
9.307 <message>
9.308 <source>New Row</source>
9.309 - <translation type="unfinished"></translation>
9.310 + <translation></translation>
9.311 </message>
9.312 <message>
9.313 <source>Time</source>
9.314 - <translation type="unfinished"></translation>
9.315 + <translation></translation>
9.316 </message>
9.317 <message>
9.318 <source>Comment</source>
9.319 - <translation type="unfinished"></translation>
9.320 + <translation></translation>
9.321 </message>
9.322 <message>
9.323 <source>Undo</source>
9.324 - <translation type="unfinished">Rückgängig</translation>
9.325 + <translation>Rückgängig</translation>
9.326 </message>
9.327 <message>
9.328 <source>Close</source>
9.329 - <translation type="unfinished">Schliessen</translation>
9.330 + <translation>Schliessen</translation>
9.331 </message>
9.332 <message>
9.333 <source>Action</source>
9.334 - <translation type="unfinished"></translation>
9.335 + <comment>Table with actions</comment>
9.336 + <translation></translation>
9.337 + </message>
9.338 + <message>
9.339 + <source>Comment</source>
9.340 + <comment>Table with actions</comment>
9.341 + <translation></translation>
9.342 </message>
9.343 <message>
9.344 <source>Undo action</source>
9.345 - <translation type="unfinished"></translation>
9.346 - </message>
9.347 - <message>
9.348 - <source>now</source>
9.349 - <comment>now bar in history hwindow</comment>
9.350 - <translation type="unfinished"></translation>
9.351 + <comment>Table with actions</comment>
9.352 + <translation></translation>
9.353 + </message>
9.354 + <message>
9.355 + <source>Current state</source>
9.356 + <comment>Current bar in history hwindow</comment>
9.357 + <translation>Aktuelle Zustand</translation>
9.358 </message>
9.359 </context>
9.360 <context>
9.361 @@ -393,7 +435,7 @@
9.362 </message>
9.363 <message>
9.364 <source>&New...</source>
9.365 - <translation>&Neu...</translation>
9.366 + <translation type="obsolete">&Neu...</translation>
9.367 </message>
9.368 <message>
9.369 <source>Open</source>
9.370 @@ -401,23 +443,23 @@
9.371 </message>
9.372 <message>
9.373 <source>&Open...</source>
9.374 - <translation>&Öffnen...</translation>
9.375 + <translation type="obsolete">&Öffnen...</translation>
9.376 </message>
9.377 <message>
9.378 <source>Save</source>
9.379 - <translation>Speichern</translation>
9.380 + <translation type="obsolete">Speichern</translation>
9.381 </message>
9.382 <message>
9.383 <source>&Save...</source>
9.384 - <translation>&Speichern...</translation>
9.385 + <translation type="obsolete">&Speichern...</translation>
9.386 </message>
9.387 <message>
9.388 <source>Save &As...</source>
9.389 - <translation>Speichern &unter...</translation>
9.390 + <translation type="obsolete">Speichern &unter...</translation>
9.391 </message>
9.392 <message>
9.393 <source>Import directory structure (experimental)</source>
9.394 - <translation>Importiere Verzeichnisstruktur (experimentelle Funktion)</translation>
9.395 + <translation type="obsolete">Importiere Verzeichnisstruktur (experimentelle Funktion)</translation>
9.396 </message>
9.397 <message>
9.398 <source>Import Dir</source>
9.399 @@ -433,7 +475,7 @@
9.400 </message>
9.401 <message>
9.402 <source>Print</source>
9.403 - <translation>Drucken</translation>
9.404 + <translation type="obsolete">Drucken</translation>
9.405 </message>
9.406 <message>
9.407 <source>&Print...</source>
9.408 @@ -445,7 +487,7 @@
9.409 </message>
9.410 <message>
9.411 <source>&Close Map</source>
9.412 - <translation>Schlie&ßen</translation>
9.413 + <translation type="obsolete">Schlie&ßen</translation>
9.414 </message>
9.415 <message>
9.416 <source>Exit VYM</source>
9.417 @@ -457,7 +499,7 @@
9.418 </message>
9.419 <message>
9.420 <source>&Edit</source>
9.421 - <translation>&Bearbeiten</translation>
9.422 + <translation type="obsolete">&Bearbeiten</translation>
9.423 </message>
9.424 <message>
9.425 <source>Undo</source>
9.426 @@ -465,7 +507,7 @@
9.427 </message>
9.428 <message>
9.429 <source>&Undo</source>
9.430 - <translation>&Rückgängig</translation>
9.431 + <translation type="obsolete">&Rückgängig</translation>
9.432 </message>
9.433 <message>
9.434 <source>Copy</source>
9.435 @@ -473,7 +515,7 @@
9.436 </message>
9.437 <message>
9.438 <source>&Copy</source>
9.439 - <translation>&Kopieren</translation>
9.440 + <translation type="obsolete">&Kopieren</translation>
9.441 </message>
9.442 <message>
9.443 <source>Cut</source>
9.444 @@ -481,7 +523,7 @@
9.445 </message>
9.446 <message>
9.447 <source>Cu&t</source>
9.448 - <translation>&Ausschneiden</translation>
9.449 + <translation type="obsolete">&Ausschneiden</translation>
9.450 </message>
9.451 <message>
9.452 <source>Paste</source>
9.453 @@ -489,7 +531,7 @@
9.454 </message>
9.455 <message>
9.456 <source>&Paste</source>
9.457 - <translation>Ein&fügen</translation>
9.458 + <translation type="obsolete">Ein&fügen</translation>
9.459 </message>
9.460 <message>
9.461 <source>Move branch up</source>
9.462 @@ -497,7 +539,7 @@
9.463 </message>
9.464 <message>
9.465 <source>Move up</source>
9.466 - <translation>Zweig nach oben</translation>
9.467 + <translation type="obsolete">Zweig nach oben</translation>
9.468 </message>
9.469 <message>
9.470 <source>Move branch down</source>
9.471 @@ -505,7 +547,7 @@
9.472 </message>
9.473 <message>
9.474 <source>Move down</source>
9.475 - <translation>Zweig nach unten</translation>
9.476 + <translation type="obsolete">Zweig nach unten</translation>
9.477 </message>
9.478 <message>
9.479 <source>Scroll branch</source>
9.480 @@ -517,7 +559,7 @@
9.481 </message>
9.482 <message>
9.483 <source>Unscroll all scrolled branches</source>
9.484 - <translation>Alle eingerollten Zweige aufrollen</translation>
9.485 + <translation type="obsolete">Alle eingerollten Zweige aufrollen</translation>
9.486 </message>
9.487 <message>
9.488 <source>Find</source>
9.489 @@ -537,7 +579,7 @@
9.490 </message>
9.491 <message>
9.492 <source>Use heading for URL</source>
9.493 - <translation>Beschriftung als URL übernehmen</translation>
9.494 + <translation type="obsolete">Beschriftung als URL übernehmen</translation>
9.495 </message>
9.496 <message>
9.497 <source>Jump to another vym map, if needed load it first</source>
9.498 @@ -561,7 +603,7 @@
9.499 </message>
9.500 <message>
9.501 <source>Edit heading</source>
9.502 - <translation>Bearbeite Zweig-Überschrift</translation>
9.503 + <translation type="obsolete">Bearbeite Zweig-Überschrift</translation>
9.504 </message>
9.505 <message>
9.506 <source>Delete Selection</source>
9.507 @@ -573,7 +615,7 @@
9.508 </message>
9.509 <message>
9.510 <source>Add branch as child</source>
9.511 - <translation>Neuer Zweig </translation>
9.512 + <translation type="obsolete">Neuer Zweig </translation>
9.513 </message>
9.514 <message>
9.515 <source>Add a branch above selection</source>
9.516 @@ -581,7 +623,7 @@
9.517 </message>
9.518 <message>
9.519 <source>Add branch above</source>
9.520 - <translation>Neuer Zweig - oben</translation>
9.521 + <translation type="obsolete">Neuer Zweig - oben</translation>
9.522 </message>
9.523 <message>
9.524 <source>Add a branch below selection</source>
9.525 @@ -589,7 +631,7 @@
9.526 </message>
9.527 <message>
9.528 <source>Add branch below</source>
9.529 - <translation>Neuer Zweig - unten</translation>
9.530 + <translation type="obsolete">Neuer Zweig - unten</translation>
9.531 </message>
9.532 <message>
9.533 <source>Select upper branch</source>
9.534 @@ -609,7 +651,7 @@
9.535 </message>
9.536 <message>
9.537 <source>Select child branch</source>
9.538 - <translation>Unterzweig auswählen</translation>
9.539 + <translation type="obsolete">Unterzweig auswählen</translation>
9.540 </message>
9.541 <message>
9.542 <source>Select first branch</source>
9.543 @@ -643,7 +685,7 @@
9.544 </message>
9.545 <message>
9.546 <source>Pic&k color</source>
9.547 - <translation>Farbe &übernehmen</translation>
9.548 + <translation type="obsolete">Farbe &übernehmen</translation>
9.549 </message>
9.550 <message>
9.551 <source>Color branch</source>
9.552 @@ -651,7 +693,7 @@
9.553 </message>
9.554 <message>
9.555 <source>Color &branch</source>
9.556 - <translation>Zweig &färben</translation>
9.557 + <translation type="obsolete">Zweig &färben</translation>
9.558 </message>
9.559 <message>
9.560 <source>Color Subtree</source>
9.561 @@ -659,7 +701,7 @@
9.562 </message>
9.563 <message>
9.564 <source>Color sub&tree</source>
9.565 - <translation>&Unterbaum färben</translation>
9.566 + <translation type="obsolete">&Unterbaum färben</translation>
9.567 </message>
9.568 <message>
9.569 <source>Line</source>
9.570 @@ -703,7 +745,7 @@
9.571 </message>
9.572 <message>
9.573 <source>&Use color of heading for link</source>
9.574 - <translation>&Verbindungen haben Farbe der Beschriftungen</translation>
9.575 + <translation type="obsolete">&Verbindungen haben Farbe der Beschriftungen</translation>
9.576 </message>
9.577 <message>
9.578 <source>Set Link Color</source>
9.579 @@ -731,7 +773,7 @@
9.580 </message>
9.581 <message>
9.582 <source>reset Zoom</source>
9.583 - <translation>Keine Vergrösserung</translation>
9.584 + <translation type="obsolete">Keine Vergrösserung</translation>
9.585 </message>
9.586 <message>
9.587 <source>Zoom in</source>
9.588 @@ -751,7 +793,7 @@
9.589 </message>
9.590 <message>
9.591 <source>Next Window</source>
9.592 - <translation>Nächstes Fenster</translation>
9.593 + <translation type="obsolete">Nächstes Fenster</translation>
9.594 </message>
9.595 <message>
9.596 <source>&Previous Window</source>
9.597 @@ -759,7 +801,7 @@
9.598 </message>
9.599 <message>
9.600 <source>Previous Window</source>
9.601 - <translation>Vorheriges Fenster</translation>
9.602 + <translation type="obsolete">Vorheriges Fenster</translation>
9.603 </message>
9.604 <message>
9.605 <source>&Settings</source>
9.606 @@ -787,7 +829,7 @@
9.607 </message>
9.608 <message>
9.609 <source>Select existing heading</source>
9.610 - <translation>Beschriftung vor dem editieren auswählen</translation>
9.611 + <translation type="obsolete">Beschriftung vor dem editieren auswählen</translation>
9.612 </message>
9.613 <message>
9.614 <source>Enable pasting into new branch</source>
9.615 @@ -811,7 +853,7 @@
9.616 </message>
9.617 <message>
9.618 <source>test flag</source>
9.619 - <translation>test Flag</translation>
9.620 + <translation type="obsolete">test Flag</translation>
9.621 </message>
9.622 <message>
9.623 <source>Count Canvas Items</source>
9.624 @@ -839,7 +881,7 @@
9.625 </message>
9.626 <message>
9.627 <source>&Help</source>
9.628 - <translation>&Hilfe</translation>
9.629 + <translation type="obsolete">&Hilfe</translation>
9.630 </message>
9.631 <message>
9.632 <source>Open VYM Documentation (pdf)</source>
9.633 @@ -847,7 +889,7 @@
9.634 </message>
9.635 <message>
9.636 <source>Open VYM Documentation (pdf) </source>
9.637 - <translation>VYM Handbuch (pdf)</translation>
9.638 + <translation type="obsolete">VYM Handbuch (pdf)</translation>
9.639 </message>
9.640 <message>
9.641 <source>Information about VYM</source>
9.642 @@ -863,11 +905,11 @@
9.643 </message>
9.644 <message>
9.645 <source>About QT</source>
9.646 - <translation>Über QT</translation>
9.647 + <translation type="obsolete">Über QT</translation>
9.648 </message>
9.649 <message>
9.650 <source>Save image</source>
9.651 - <translation>Speichere Bild</translation>
9.652 + <translation type="obsolete">Speichere Bild</translation>
9.653 </message>
9.654 <message>
9.655 <source>The file </source>
9.656 @@ -936,15 +978,15 @@
9.657 </message>
9.658 <message>
9.659 <source>Save &As</source>
9.660 - <translation>Speichern &unter...</translation>
9.661 + <translation type="obsolete">Speichern &unter...</translation>
9.662 </message>
9.663 <message>
9.664 <source>Open Recent</source>
9.665 - <translation>Zuletzt geöffnete Dateien</translation>
9.666 + <translation type="obsolete">Zuletzt geöffnete Dateien</translation>
9.667 </message>
9.668 <message>
9.669 <source>Export</source>
9.670 - <translation>Exportieren</translation>
9.671 + <translation type="obsolete">Exportieren</translation>
9.672 </message>
9.673 <message>
9.674 <source>Export map as image</source>
9.675 @@ -1038,7 +1080,7 @@
9.676 </message>
9.677 <message>
9.678 <source>Delete vym link</source>
9.679 - <translation>vym Verknüpfung löschen</translation>
9.680 + <translation type="obsolete">vym Verknüpfung löschen</translation>
9.681 </message>
9.682 <message>
9.683 <source>Critical Load Error</source>
9.684 @@ -1186,12 +1228,12 @@
9.685 <message>
9.686 <source>New map</source>
9.687 <comment>File menu</comment>
9.688 - <translation>Neue Map anlegen</translation>
9.689 + <translation type="obsolete">Neue Map anlegen</translation>
9.690 </message>
9.691 <message>
9.692 <source>Open</source>
9.693 <comment>File menu</comment>
9.694 - <translation>Öffnen</translation>
9.695 + <translation type="obsolete">Öffnen</translation>
9.696 </message>
9.697 <message>
9.698 <source>Modes when using modifiers</source>
9.699 @@ -1203,7 +1245,7 @@
9.700 </message>
9.701 <message>
9.702 <source>Add branch (insert)</source>
9.703 - <translation>Neuen Zweig einfügen</translation>
9.704 + <translation type="obsolete">Neuen Zweig einfügen</translation>
9.705 </message>
9.706 <message>
9.707 <source>Remove only branch and keep its childs</source>
9.708 @@ -1211,7 +1253,7 @@
9.709 </message>
9.710 <message>
9.711 <source>Remove only branch </source>
9.712 - <translation>Zweig entfernen, Unterzweige behalten</translation>
9.713 + <translation type="obsolete">Zweig entfernen, Unterzweige behalten</translation>
9.714 </message>
9.715 <message>
9.716 <source>Remove childs of branch</source>
9.717 @@ -1219,7 +1261,7 @@
9.718 </message>
9.719 <message>
9.720 <source>Remove childs</source>
9.721 - <translation>Unterzweige entfernen</translation>
9.722 + <translation type="obsolete">Unterzweige entfernen</translation>
9.723 </message>
9.724 <message>
9.725 <source>Use modifier to copy</source>
9.726 @@ -1231,11 +1273,11 @@
9.727 </message>
9.728 <message>
9.729 <source>Remove</source>
9.730 - <translation>Entfernen</translation>
9.731 + <translation type="obsolete">Entfernen</translation>
9.732 </message>
9.733 <message>
9.734 <source>Edit XLink</source>
9.735 - <translation>xLink ändern</translation>
9.736 + <translation type="obsolete">xLink ändern</translation>
9.737 </message>
9.738 <message>
9.739 <source>Goto XLink</source>
9.740 @@ -1282,16 +1324,16 @@
9.741 </message>
9.742 <message>
9.743 <source>Delete key</source>
9.744 - <translation>Entfernen Taste</translation>
9.745 + <translation type="obsolete">Entfernen Taste</translation>
9.746 </message>
9.747 <message>
9.748 <source>Exclusive flags</source>
9.749 - <translation>Exklusive Flags</translation>
9.750 + <translation type="obsolete">Exklusive Flags</translation>
9.751 </message>
9.752 <message>
9.753 <source>The directory %1 is not empty.
9.754 Do you risk to overwrite its contents?</source>
9.755 - <translation>Das Verzeichnis %1 ist nicht leer.
9.756 + <translation type="obsolete">Das Verzeichnis %1 ist nicht leer.
9.757 Riskieren Sie es dessen Inhalt zu überschreiben?</translation>
9.758 </message>
9.759 <message>
9.760 @@ -1365,7 +1407,7 @@
9.761 </message>
9.762 <message>
9.763 <source>E&xit</source>
9.764 - <translation>B&eenden</translation>
9.765 + <translation type="obsolete">B&eenden</translation>
9.766 </message>
9.767 <message>
9.768 <source>Redo</source>
9.769 @@ -1373,7 +1415,7 @@
9.770 </message>
9.771 <message>
9.772 <source>&Redo</source>
9.773 - <translation>Wieder&herstellen</translation>
9.774 + <translation type="obsolete">Wieder&herstellen</translation>
9.775 </message>
9.776 <message>
9.777 <source>Create URL to FATE</source>
9.778 @@ -1385,7 +1427,7 @@
9.779 </message>
9.780 <message>
9.781 <source>Include images vertically</source>
9.782 - <translation>Obere und untere Bildkanten berücksichtigen</translation>
9.783 + <translation type="obsolete">Obere und untere Bildkanten berücksichtigen</translation>
9.784 </message>
9.785 <message>
9.786 <source>Include left and right position of images into branch</source>
9.787 @@ -1393,7 +1435,7 @@
9.788 </message>
9.789 <message>
9.790 <source>Include images horizontally</source>
9.791 - <translation>Linke und rechte Bildkanten berücksichtigen</translation>
9.792 + <translation type="obsolete">Linke und rechte Bildkanten berücksichtigen</translation>
9.793 </message>
9.794 <message>
9.795 <source>Hide link</source>
9.796 @@ -1401,7 +1443,7 @@
9.797 </message>
9.798 <message>
9.799 <source>Hide link if object is not selected</source>
9.800 - <translation>Verbindung verbergen, falls Objekt nicht selektiert ist</translation>
9.801 + <translation type="obsolete">Verbindung verbergen, falls Objekt nicht selektiert ist</translation>
9.802 </message>
9.803 <message>
9.804 <source>Note</source>
9.805 @@ -1510,7 +1552,7 @@
9.806 </message>
9.807 <message>
9.808 <source>Call test function</source>
9.809 - <translation>Testfunktion aufrufen</translation>
9.810 + <translation type="obsolete">Testfunktion aufrufen</translation>
9.811 </message>
9.812 <message>
9.813 <source>Couldn't save %1</source>
9.814 @@ -1534,7 +1576,7 @@
9.815 </message>
9.816 <message>
9.817 <source>Export in Open Document Format used e.g. in Open Office </source>
9.818 - <translation>Exportiere im Open Document Format, das z.B. in Open Office verwendet wird</translation>
9.819 + <translation type="obsolete">Exportiere im Open Document Format, das z.B. in Open Office verwendet wird</translation>
9.820 </message>
9.821 <message>
9.822 <source>Export as XML</source>
9.823 @@ -1570,15 +1612,15 @@
9.824 </message>
9.825 <message>
9.826 <source>Add map (insert)</source>
9.827 - <translation>Map einfügen (An Selektion hinzufügen)</translation>
9.828 + <translation type="obsolete">Map einfügen (An Selektion hinzufügen)</translation>
9.829 </message>
9.830 <message>
9.831 <source>Add map (replace)</source>
9.832 - <translation>Map einfügen (Selektion austauschen)</translation>
9.833 + <translation type="obsolete">Map einfügen (Selektion austauschen)</translation>
9.834 </message>
9.835 <message>
9.836 <source>Export as</source>
9.837 - <translation>Exportieren als</translation>
9.838 + <translation type="obsolete">Exportieren als</translation>
9.839 </message>
9.840 <message>
9.841 <source>Export to</source>
9.842 @@ -1590,7 +1632,7 @@
9.843 </message>
9.844 <message>
9.845 <source>Hide in exports</source>
9.846 - <translation>In Export nicht anzeigen</translation>
9.847 + <translation type="obsolete">In Export nicht anzeigen</translation>
9.848 </message>
9.849 <message>
9.850 <source>Hide object in exported maps</source>
9.851 @@ -1603,7 +1645,7 @@
9.852 </message>
9.853 <message>
9.854 <source>Use hide flags</source>
9.855 - <translation>Während des Exports das "Verbergen" Flag verwenden </translation>
9.856 + <translation type="obsolete">Während des Exports das "Verbergen" Flag verwenden </translation>
9.857 </message>
9.858 <message>
9.859 <source>Open URL in new tab</source>
9.860 @@ -1675,7 +1717,7 @@
9.861 </message>
9.862 <message>
9.863 <source>F&ormat</source>
9.864 - <translation>F&ormat</translation>
9.865 + <translation type="obsolete">F&ormat</translation>
9.866 </message>
9.867 <message>
9.868 <source>Show Note Editor</source>
9.869 @@ -1695,79 +1737,646 @@
9.870 </message>
9.871 <message>
9.872 <source>Image</source>
9.873 - <translation>Bild</translation>
9.874 + <translation type="obsolete">Bild</translation>
9.875 </message>
9.876 <message>
9.877 <source>Format Actions</source>
9.878 <comment>Toolbars</comment>
9.879 - <translation>Format Actions</translation>
9.880 + <translation type="obsolete">Format Actions</translation>
9.881 </message>
9.882 <message>
9.883 <source>View Actions</source>
9.884 <comment>Toolbars</comment>
9.885 - <translation>Ansicht Aktionen</translation>
9.886 + <translation type="obsolete">Ansicht Aktionen</translation>
9.887 </message>
9.888 <message>
9.889 <source>Modes when using modifiers</source>
9.890 <comment>Toolbars</comment>
9.891 - <translation type="unfinished">Modes beim Benutzen von Modifizierern</translation>
9.892 + <translation type="obsolete">Modes beim Benutzen von Modifizierern</translation>
9.893 </message>
9.894 <message>
9.895 <source>Standard Flags</source>
9.896 <comment>Standard Flag Toolbar</comment>
9.897 - <translation type="unfinished"></translation>
9.898 + <translation>Standard Flags Werkzeugleiste</translation>
9.899 </message>
9.900 <message>
9.901 <source>Follow XLink</source>
9.902 - <translation type="unfinished"></translation>
9.903 + <translation type="obsolete">XLink folgen</translation>
9.904 </message>
9.905 <message>
9.906 <source>Couldn't find configuration for export to Open Office
9.907 </source>
9.908 - <translation type="unfinished"></translation>
9.909 + <translation>Konnte keine EInstellungen zum Export nach Open Office finden
9.910 +</translation>
9.911 </message>
9.912 <message>
9.913 <source>No matches found for "%1"</source>
9.914 - <translation type="unfinished"></translation>
9.915 + <translation>Keine treffer für "%1" gefunden</translation>
9.916 </message>
9.917 <message>
9.918 <source>&Map</source>
9.919 - <translation type="unfinished"></translation>
9.920 + <translation>&Map</translation>
9.921 </message>
9.922 <message>
9.923 <source>&Actions</source>
9.924 - <translation type="unfinished"></translation>
9.925 + <translation type="obsolete">&Aktionen</translation>
9.926 </message>
9.927 <message>
9.928 <source>Open all URLs in subtree</source>
9.929 - <translation type="unfinished"></translation>
9.930 - </message>
9.931 - <message>
9.932 - <source>Open xlinked map</source>
9.933 - <translation type="unfinished"></translation>
9.934 + <translation>Alle URLs in Unterbaum öffnen</translation>
9.935 </message>
9.936 <message>
9.937 <source>Open all vym links in subtree</source>
9.938 - <translation type="unfinished"></translation>
9.939 + <translation>Alle Verbindungen zu vym maps in Unterbaum öffnen</translation>
9.940 </message>
9.941 <message>
9.942 <source>URLs and vymLinks</source>
9.943 - <translation type="unfinished"></translation>
9.944 + <translation type="obsolete">URLs und Verbindungen zu vym maps</translation>
9.945 </message>
9.946 <message>
9.947 <source>Couldn't create temporary directory before load
9.948 </source>
9.949 - <translation type="unfinished"></translation>
9.950 + <translation>Konnte temporäres Verzeichnis vor dem Laden nicht erzeugen</translation>
9.951 </message>
9.952 <message>
9.953 <source>Couldn't create temporary directory before save
9.954 </source>
9.955 + <translation>Konnte temporäres Verzeichnis vor dem Speichern nicht erzeugen</translation>
9.956 + </message>
9.957 + <message>
9.958 + <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
9.959 + <translation>Sorry, im Moment unterstützen nur Konqueror und Mozilla tabbed browsing.</translation>
9.960 + </message>
9.961 + <message>
9.962 + <source>Test function</source>
9.963 + <translation type="obsolete">Test Funktion</translation>
9.964 + </message>
9.965 + <message>
9.966 + <source>Command</source>
9.967 + <translation type="obsolete">Test Kommando</translation>
9.968 + </message>
9.969 + <message>
9.970 + <source>Enter command to call in editor</source>
9.971 + <translation type="obsolete">Kommando für den MapEditor</translation>
9.972 + </message>
9.973 + <message>
9.974 + <source>Open linked map</source>
9.975 + <translation type="obsolete">Verlinkte Map öffnen</translation>
9.976 + </message>
9.977 + <message>
9.978 + <source>&New...</source>
9.979 + <comment>File menu</comment>
9.980 + <translation>&Neu...</translation>
9.981 + </message>
9.982 + <message>
9.983 + <source>New map</source>
9.984 + <comment>Status tip File menu</comment>
9.985 + <translation>Neue map</translation>
9.986 + </message>
9.987 + <message>
9.988 + <source>&Open...</source>
9.989 + <comment>File menu</comment>
9.990 + <translation>&Öffnen...</translation>
9.991 + </message>
9.992 + <message>
9.993 + <source>Open</source>
9.994 + <comment>Status tip File menu</comment>
9.995 + <translation>Öffnen</translation>
9.996 + </message>
9.997 + <message>
9.998 + <source>Open Recent</source>
9.999 + <comment>File menu</comment>
9.1000 + <translation>Zuletzt geöffnete Dateien</translation>
9.1001 + </message>
9.1002 + <message>
9.1003 + <source>&Save...</source>
9.1004 + <comment>File menu</comment>
9.1005 + <translation>&Speichern...</translation>
9.1006 + </message>
9.1007 + <message>
9.1008 + <source>Save</source>
9.1009 + <comment>Status tip file menu</comment>
9.1010 + <translation>Speichern</translation>
9.1011 + </message>
9.1012 + <message>
9.1013 + <source>Save &As...</source>
9.1014 + <comment>File menu</comment>
9.1015 + <translation>Speichern &unter...</translation>
9.1016 + </message>
9.1017 + <message>
9.1018 + <source>Save &As</source>
9.1019 + <comment>Status tip file menu</comment>
9.1020 + <translation>Speichern &unter...</translation>
9.1021 + </message>
9.1022 + <message>
9.1023 + <source>Import</source>
9.1024 + <comment>File menu</comment>
9.1025 + <translation>Importieren</translation>
9.1026 + </message>
9.1027 + <message>
9.1028 + <source>Import %1</source>
9.1029 + <comment>Status tip file menu</comment>
9.1030 <translation type="unfinished"></translation>
9.1031 </message>
9.1032 <message>
9.1033 - <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
9.1034 + <source>KDE bookmarks</source>
9.1035 <translation type="unfinished"></translation>
9.1036 </message>
9.1037 + <message>
9.1038 + <source>Firefox Bookmarks</source>
9.1039 + <comment>File menu</comment>
9.1040 + <translation type="unfinished">Firefox Lesezeichen</translation>
9.1041 + </message>
9.1042 + <message>
9.1043 + <source>Import %1</source>
9.1044 + <comment>status tip file menu</comment>
9.1045 + <translation type="unfinished"></translation>
9.1046 + </message>
9.1047 + <message>
9.1048 + <source>Import Dir%1</source>
9.1049 + <comment>File menu</comment>
9.1050 + <translation type="unfinished"></translation>
9.1051 + </message>
9.1052 + <message>
9.1053 + <source>Import directory structure (experimental)</source>
9.1054 + <comment>status tip file menu</comment>
9.1055 + <translation type="unfinished">Importiere Verzeichnisstruktur (experimentelle Funktion)</translation>
9.1056 + </message>
9.1057 + <message>
9.1058 + <source>Export</source>
9.1059 + <comment>File menu</comment>
9.1060 + <translation type="unfinished">Exportieren</translation>
9.1061 + </message>
9.1062 + <message>
9.1063 + <source>Image%1</source>
9.1064 + <comment>File export menu</comment>
9.1065 + <translation type="unfinished"></translation>
9.1066 + </message>
9.1067 + <message>
9.1068 + <source>Export map as image</source>
9.1069 + <comment>status tip file menu</comment>
9.1070 + <translation type="unfinished">als Bild</translation>
9.1071 + </message>
9.1072 + <message>
9.1073 + <source>Export in Open Document Format used e.g. in Open Office </source>
9.1074 + <comment>status tip file menu</comment>
9.1075 + <translation type="unfinished">Exportiere im Open Document Format, das z.B. in Open Office verwendet wird</translation>
9.1076 + </message>
9.1077 + <message>
9.1078 + <source>Export as %1</source>
9.1079 + <comment>status tip file menu</comment>
9.1080 + <translation type="unfinished"></translation>
9.1081 + </message>
9.1082 + <message>
9.1083 + <source> webpage (XHTML)</source>
9.1084 + <comment>status tip file menu</comment>
9.1085 + <translation type="unfinished"></translation>
9.1086 + </message>
9.1087 + <message>
9.1088 + <source>Export as %1</source>
9.1089 + <translation type="unfinished"></translation>
9.1090 + </message>
9.1091 + <message>
9.1092 + <source>KDE Bookmarks</source>
9.1093 + <comment>File menu</comment>
9.1094 + <translation type="unfinished">KDE Lesezeichen</translation>
9.1095 + </message>
9.1096 + <message>
9.1097 + <source>Print</source>
9.1098 + <comment>File menu</comment>
9.1099 + <translation type="unfinished">Drucken</translation>
9.1100 + </message>
9.1101 + <message>
9.1102 + <source>&Close Map</source>
9.1103 + <comment>File menu</comment>
9.1104 + <translation type="unfinished">Schlie&ßen</translation>
9.1105 + </message>
9.1106 + <message>
9.1107 + <source>E&xit</source>
9.1108 + <comment>File menu</comment>
9.1109 + <translation type="unfinished">B&eenden</translation>
9.1110 + </message>
9.1111 + <message>
9.1112 + <source>&Actions toolbar</source>
9.1113 + <comment>Toolbar name</comment>
9.1114 + <translation type="unfinished"></translation>
9.1115 + </message>
9.1116 + <message>
9.1117 + <source>&Edit</source>
9.1118 + <comment>Edit menu</comment>
9.1119 + <translation type="unfinished">&Bearbeiten</translation>
9.1120 + </message>
9.1121 + <message>
9.1122 + <source>&Undo</source>
9.1123 + <comment>Edit menu</comment>
9.1124 + <translation type="unfinished"></translation>
9.1125 + </message>
9.1126 + <message>
9.1127 + <source>&Redo</source>
9.1128 + <comment>Edit menu</comment>
9.1129 + <translation type="unfinished">Wieder&herstellen</translation>
9.1130 + </message>
9.1131 + <message>
9.1132 + <source>&Copy</source>
9.1133 + <comment>Edit menu</comment>
9.1134 + <translation type="unfinished">&Kopieren</translation>
9.1135 + </message>
9.1136 + <message>
9.1137 + <source>Cu&t</source>
9.1138 + <comment>Edit menu</comment>
9.1139 + <translation type="unfinished">&Ausschneiden</translation>
9.1140 + </message>
9.1141 + <message>
9.1142 + <source>&Paste</source>
9.1143 + <comment>Edit menu</comment>
9.1144 + <translation type="unfinished">Ein&fügen</translation>
9.1145 + </message>
9.1146 + <message>
9.1147 + <source>Edit heading</source>
9.1148 + <comment>Edit menu</comment>
9.1149 + <translation type="unfinished">Bearbeite Zweig-Überschrift</translation>
9.1150 + </message>
9.1151 + <message>
9.1152 + <source>Delete Selection</source>
9.1153 + <comment>Edit menu</comment>
9.1154 + <translation type="unfinished">Entfernen</translation>
9.1155 + </message>
9.1156 + <message>
9.1157 + <source>Add branch as child</source>
9.1158 + <comment>Edit menu</comment>
9.1159 + <translation type="unfinished">Neuer Zweig </translation>
9.1160 + </message>
9.1161 + <message>
9.1162 + <source>Add branch (insert)</source>
9.1163 + <comment>Edit menu</comment>
9.1164 + <translation type="unfinished">Neuen Zweig einfügen</translation>
9.1165 + </message>
9.1166 + <message>
9.1167 + <source>Add branch above</source>
9.1168 + <comment>Edit menu</comment>
9.1169 + <translation type="unfinished">Neuer Zweig - oben</translation>
9.1170 + </message>
9.1171 + <message>
9.1172 + <source>Add branch below</source>
9.1173 + <comment>Edit menu</comment>
9.1174 + <translation type="unfinished">Neuer Zweig - unten</translation>
9.1175 + </message>
9.1176 + <message>
9.1177 + <source>Move up</source>
9.1178 + <comment>Edit menu</comment>
9.1179 + <translation type="unfinished">Zweig nach oben</translation>
9.1180 + </message>
9.1181 + <message>
9.1182 + <source>Move down</source>
9.1183 + <comment>Edit menu</comment>
9.1184 + <translation type="unfinished">Zweig nach unten</translation>
9.1185 + </message>
9.1186 + <message>
9.1187 + <source>Scroll branch</source>
9.1188 + <comment>Edit menu</comment>
9.1189 + <translation type="unfinished">Zweig einrollen</translation>
9.1190 + </message>
9.1191 + <message>
9.1192 + <source>Unscroll all scrolled branches</source>
9.1193 + <comment>Edit menu</comment>
9.1194 + <translation type="unfinished">Alle eingerollten Zweige aufrollen</translation>
9.1195 + </message>
9.1196 + <message>
9.1197 + <source>Find...</source>
9.1198 + <comment>Edit menu</comment>
9.1199 + <translation type="unfinished"></translation>
9.1200 + </message>
9.1201 + <message>
9.1202 + <source>Open URL</source>
9.1203 + <comment>Edit menu</comment>
9.1204 + <translation type="unfinished">URL öffnen</translation>
9.1205 + </message>
9.1206 + <message>
9.1207 + <source>Open URL in new tab</source>
9.1208 + <comment>Edit menu</comment>
9.1209 + <translation type="unfinished">URL in neuen Tab öffnen</translation>
9.1210 + </message>
9.1211 + <message>
9.1212 + <source>Open all URLs in subtree</source>
9.1213 + <comment>Edit menu</comment>
9.1214 + <translation type="unfinished">Alle URLs in Unterbaum öffnen</translation>
9.1215 + </message>
9.1216 + <message>
9.1217 + <source>Edit URL...</source>
9.1218 + <comment>Edit menu</comment>
9.1219 + <translation type="unfinished"></translation>
9.1220 + </message>
9.1221 + <message>
9.1222 + <source>Use heading for URL</source>
9.1223 + <comment>Edit menu</comment>
9.1224 + <translation type="unfinished">Beschriftung als URL übernehmen</translation>
9.1225 + </message>
9.1226 + <message>
9.1227 + <source>Create URL to Bugzilla</source>
9.1228 + <comment>Edit menu</comment>
9.1229 + <translation type="unfinished">URL für Bugzilla anlegen</translation>
9.1230 + </message>
9.1231 + <message>
9.1232 + <source>Create URL to FATE</source>
9.1233 + <comment>Edit menu</comment>
9.1234 + <translation type="unfinished">URL für FATE anlegen</translation>
9.1235 + </message>
9.1236 + <message>
9.1237 + <source>Open linked map</source>
9.1238 + <comment>Edit menu</comment>
9.1239 + <translation type="unfinished">Verlinkte Map öffnen</translation>
9.1240 + </message>
9.1241 + <message>
9.1242 + <source>Open all vym links in subtree</source>
9.1243 + <comment>Edit menu</comment>
9.1244 + <translation type="unfinished">Alle Verbindungen zu vym maps in Unterbaum öffnen</translation>
9.1245 + </message>
9.1246 + <message>
9.1247 + <source>Edit vym link...</source>
9.1248 + <comment>Edit menu</comment>
9.1249 + <translation type="unfinished"></translation>
9.1250 + </message>
9.1251 + <message>
9.1252 + <source>Delete vym link</source>
9.1253 + <comment>Edit menu</comment>
9.1254 + <translation type="unfinished">vym Verknüpfung löschen</translation>
9.1255 + </message>
9.1256 + <message>
9.1257 + <source>Hide in exports</source>
9.1258 + <comment>Edit menu</comment>
9.1259 + <translation type="unfinished">In Export nicht anzeigen</translation>
9.1260 + </message>
9.1261 + <message>
9.1262 + <source>Edit Map Info...</source>
9.1263 + <comment>Edit menu</comment>
9.1264 + <translation type="unfinished"></translation>
9.1265 + </message>
9.1266 + <message>
9.1267 + <source>Add map (insert)</source>
9.1268 + <comment>Edit menu</comment>
9.1269 + <translation type="unfinished">Map einfügen (An Selektion hinzufügen)</translation>
9.1270 + </message>
9.1271 + <message>
9.1272 + <source>Add map (replace)</source>
9.1273 + <comment>Edit menu</comment>
9.1274 + <translation type="unfinished">Map einfügen (Selektion austauschen)</translation>
9.1275 + </message>
9.1276 + <message>
9.1277 + <source>Save selection</source>
9.1278 + <comment>Edit menu</comment>
9.1279 + <translation type="unfinished">Auswahl speichern</translation>
9.1280 + </message>
9.1281 + <message>
9.1282 + <source>Remove only branch </source>
9.1283 + <comment>Edit menu</comment>
9.1284 + <translation type="unfinished">Zweig entfernen, Unterzweige behalten</translation>
9.1285 + </message>
9.1286 + <message>
9.1287 + <source>Remove childs</source>
9.1288 + <comment>Edit menu</comment>
9.1289 + <translation type="unfinished">Unterzweige entfernen</translation>
9.1290 + </message>
9.1291 + <message>
9.1292 + <source>Select upper branch</source>
9.1293 + <comment>Edit menu</comment>
9.1294 + <translation type="unfinished">Zweig oben auswählen</translation>
9.1295 + </message>
9.1296 + <message>
9.1297 + <source>Select lower branch</source>
9.1298 + <comment>Edit menu</comment>
9.1299 + <translation type="unfinished">Zweig unten auswählen</translation>
9.1300 + </message>
9.1301 + <message>
9.1302 + <source>Select left branch</source>
9.1303 + <comment>Edit menu</comment>
9.1304 + <translation type="unfinished">Linken Zweig auswählen</translation>
9.1305 + </message>
9.1306 + <message>
9.1307 + <source>Select child branch</source>
9.1308 + <comment>Edit menu</comment>
9.1309 + <translation type="unfinished">Unterzweig auswählen</translation>
9.1310 + </message>
9.1311 + <message>
9.1312 + <source>Select first branch</source>
9.1313 + <comment>Edit menu</comment>
9.1314 + <translation type="unfinished">Obersten Zweig auwählen</translation>
9.1315 + </message>
9.1316 + <message>
9.1317 + <source>Select last branch</source>
9.1318 + <comment>Edit menu</comment>
9.1319 + <translation type="unfinished">Untersten Zweig auswählen</translation>
9.1320 + </message>
9.1321 + <message>
9.1322 + <source>Add Image...</source>
9.1323 + <comment>Edit menu</comment>
9.1324 + <translation type="unfinished"></translation>
9.1325 + </message>
9.1326 + <message>
9.1327 + <source>F&ormat</source>
9.1328 + <comment>Format menu</comment>
9.1329 + <translation type="unfinished">F&ormat</translation>
9.1330 + </message>
9.1331 + <message>
9.1332 + <source>Format Actions</source>
9.1333 + <comment>Format Toolbar name</comment>
9.1334 + <translation type="unfinished">Format Actions</translation>
9.1335 + </message>
9.1336 + <message>
9.1337 + <source>Pic&k color</source>
9.1338 + <comment>Edit menu</comment>
9.1339 + <translation type="unfinished">Farbe &übernehmen</translation>
9.1340 + </message>
9.1341 + <message>
9.1342 + <source>Color &branch</source>
9.1343 + <comment>Edit menu</comment>
9.1344 + <translation type="unfinished">Zweig &färben</translation>
9.1345 + </message>
9.1346 + <message>
9.1347 + <source>Color sub&tree</source>
9.1348 + <comment>Edit menu</comment>
9.1349 + <translation type="unfinished">&Unterbaum färben</translation>
9.1350 + </message>
9.1351 + <message>
9.1352 + <source>No Frame</source>
9.1353 + <comment>Branch attribute</comment>
9.1354 + <translation type="unfinished">Kein Rahmen</translation>
9.1355 + </message>
9.1356 + <message>
9.1357 + <source>RectangleBranch attribute</source>
9.1358 + <translation type="unfinished"></translation>
9.1359 + </message>
9.1360 + <message>
9.1361 + <source>Include images vertically</source>
9.1362 + <comment>Branch attribute</comment>
9.1363 + <translation type="unfinished">Obere und untere Bildkanten berücksichtigen</translation>
9.1364 + </message>
9.1365 + <message>
9.1366 + <source>Include images horizontally</source>
9.1367 + <comment>Branch attribute</comment>
9.1368 + <translation type="unfinished">Linke und rechte Bildkanten berücksichtigen</translation>
9.1369 + </message>
9.1370 + <message>
9.1371 + <source>Hide link if object is not selected</source>
9.1372 + <comment>Branch attribute</comment>
9.1373 + <translation type="unfinished">Verbindung verbergen, falls Objekt nicht selektiert ist</translation>
9.1374 + </message>
9.1375 + <message>
9.1376 + <source>&Use color of heading for link</source>
9.1377 + <comment>Branch attribute</comment>
9.1378 + <translation type="unfinished">&Verbindungen haben Farbe der Beschriftungen</translation>
9.1379 + </message>
9.1380 + <message>
9.1381 + <source>View Actions</source>
9.1382 + <comment>View Toolbar name</comment>
9.1383 + <translation type="unfinished">Ansicht Aktionen</translation>
9.1384 + </message>
9.1385 + <message>
9.1386 + <source>reset Zoom</source>
9.1387 + <comment>View action</comment>
9.1388 + <translation type="unfinished">Keine Vergrösserung</translation>
9.1389 + </message>
9.1390 + <message>
9.1391 + <source>Zoom in</source>
9.1392 + <comment>View action</comment>
9.1393 + <translation type="unfinished">Vergrössern</translation>
9.1394 + </message>
9.1395 + <message>
9.1396 + <source>Zoom out</source>
9.1397 + <comment>View action</comment>
9.1398 + <translation type="unfinished">Verkleinern</translation>
9.1399 + </message>
9.1400 + <message>
9.1401 + <source>Show Note Editor</source>
9.1402 + <comment>View action</comment>
9.1403 + <translation type="unfinished">Zeige Notiz Editor</translation>
9.1404 + </message>
9.1405 + <message>
9.1406 + <source>Show history window</source>
9.1407 + <comment>View action</comment>
9.1408 + <translation type="unfinished">Zeige Verlaufsfenster</translation>
9.1409 + </message>
9.1410 + <message>
9.1411 + <source>Next Window</source>
9.1412 + <comment>View action</comment>
9.1413 + <translation type="unfinished">Nächstes Fenster</translation>
9.1414 + </message>
9.1415 + <message>
9.1416 + <source>Previous Window</source>
9.1417 + <comment>View action</comment>
9.1418 + <translation type="unfinished">Vorheriges Fenster</translation>
9.1419 + </message>
9.1420 + <message>
9.1421 + <source>Modes when using modifiers</source>
9.1422 + <comment>Modifier Toolbar name</comment>
9.1423 + <translation type="unfinished">Modes beim Benutzen von Modifizierern</translation>
9.1424 + </message>
9.1425 + <message>
9.1426 + <source>Use modifier to color branches</source>
9.1427 + <comment>Mode modifier</comment>
9.1428 + <translation type="unfinished">Modifzierer zum Färben verwenden</translation>
9.1429 + </message>
9.1430 + <message>
9.1431 + <source>Use modifier to copy</source>
9.1432 + <comment>Mode modifier</comment>
9.1433 + <translation type="unfinished">Modifizierer zum Kopieren verwenden</translation>
9.1434 + </message>
9.1435 + <message>
9.1436 + <source>Use modifier to draw xLinks</source>
9.1437 + <comment>Mode modifier</comment>
9.1438 + <translation type="unfinished">Modifizierer zum Anlegen von xLinks verwenden</translation>
9.1439 + </message>
9.1440 + <message>
9.1441 + <source>Set application to open pdf files</source>
9.1442 + <comment>Settings action</comment>
9.1443 + <translation type="unfinished">pdf-Dateien öffnen mit...</translation>
9.1444 + </message>
9.1445 + <message>
9.1446 + <source>Set application to open external links</source>
9.1447 + <comment>Settings action</comment>
9.1448 + <translation type="unfinished">Anwendung zum Öffnen externen Verweise</translation>
9.1449 + </message>
9.1450 + <message>
9.1451 + <source>Edit branch after adding it</source>
9.1452 + <comment>Settings action</comment>
9.1453 + <translation type="unfinished">Zweig nach dem Einfügen neu beschriften</translation>
9.1454 + </message>
9.1455 + <message>
9.1456 + <source>Select branch after adding it</source>
9.1457 + <comment>Settings action</comment>
9.1458 + <translation type="unfinished">Zweig nach dem Einfügen auswählen</translation>
9.1459 + </message>
9.1460 + <message>
9.1461 + <source>Select existing heading</source>
9.1462 + <comment>Settings action</comment>
9.1463 + <translation type="unfinished">Beschriftung vor dem editieren auswählen</translation>
9.1464 + </message>
9.1465 + <message>
9.1466 + <source>Delete key</source>
9.1467 + <comment>Settings action</comment>
9.1468 + <translation type="unfinished">Entfernen Taste</translation>
9.1469 + </message>
9.1470 + <message>
9.1471 + <source>Exclusive flags</source>
9.1472 + <comment>Settings action</comment>
9.1473 + <translation type="unfinished">Exklusive Flags</translation>
9.1474 + </message>
9.1475 + <message>
9.1476 + <source>Use hide flags</source>
9.1477 + <comment>Settings action</comment>
9.1478 + <translation type="unfinished">Während des Exports das "Verbergen" Flag verwenden </translation>
9.1479 + </message>
9.1480 + <message>
9.1481 + <source>&Help</source>
9.1482 + <comment>Help menubar entry</comment>
9.1483 + <translation type="unfinished">&Hilfe</translation>
9.1484 + </message>
9.1485 + <message>
9.1486 + <source>Open VYM Documentation (pdf) </source>
9.1487 + <comment>Help action</comment>
9.1488 + <translation type="unfinished">VYM Handbuch (pdf)</translation>
9.1489 + </message>
9.1490 + <message>
9.1491 + <source>About VYM</source>
9.1492 + <comment>Help action</comment>
9.1493 + <translation type="unfinished">Über VYM</translation>
9.1494 + </message>
9.1495 + <message>
9.1496 + <source>About QT</source>
9.1497 + <comment>Help action</comment>
9.1498 + <translation type="unfinished">Über QT</translation>
9.1499 + </message>
9.1500 + <message>
9.1501 + <source>Remove</source>
9.1502 + <comment>Context menu name</comment>
9.1503 + <translation type="unfinished">Entfernen</translation>
9.1504 + </message>
9.1505 + <message>
9.1506 + <source>URLs and vymLinks</source>
9.1507 + <comment>Context menu name</comment>
9.1508 + <translation type="unfinished">URLs und Verbindungen zu vym maps</translation>
9.1509 + </message>
9.1510 + <message>
9.1511 + <source>Edit XLink</source>
9.1512 + <comment>Context menu name</comment>
9.1513 + <translation type="unfinished">xLink ändern</translation>
9.1514 + </message>
9.1515 + <message>
9.1516 + <source>Follow XLink</source>
9.1517 + <comment>Context menu name</comment>
9.1518 + <translation type="unfinished">XLink folgen</translation>
9.1519 + </message>
9.1520 + <message>
9.1521 + <source>Save image</source>
9.1522 + <comment>Context action</comment>
9.1523 + <translation type="unfinished">Speichere Bild</translation>
9.1524 + </message>
9.1525 + <message>
9.1526 + <source>The directory %1 is not empty.
9.1527 +Do you risk to overwrite its contents?</source>
9.1528 + <comment>write directory</comment>
9.1529 + <translation type="unfinished">Das Verzeichnis %1 ist nicht leer.
9.1530 +Riskieren Sie es dessen Inhalt zu überschreiben?</translation>
9.1531 + </message>
9.1532 </context>
9.1533 <context>
9.1534 <name>MapEditor</name>
9.1535 @@ -2008,7 +2617,7 @@
9.1536 </message>
9.1537 <message>
9.1538 <source>Critical Parse Error by reading backupFile</source>
9.1539 - <translation>Kritischer Fehler beim Parsen
9.1540 + <translation type="obsolete">Kritischer Fehler beim Parsen
9.1541 der Sicherungskopie</translation>
9.1542 </message>
9.1543 <message>
9.1544 @@ -2145,7 +2754,7 @@
9.1545 Maybe you want to reload your original data.
9.1546
9.1547 Sorry for any inconveniences.</source>
9.1548 - <translation>Um einen Schritt rückgängig machen zu können, wird das Verzeichnis
9.1549 + <translation type="obsolete">Um einen Schritt rückgängig machen zu können, wird das Verzeichnis
9.1550 %1 benutzt - leider ist verschwunden.
9.1551 Am besten Sie starten vym neu und laden Ihre Daten nochmal.
9.1552
9.1553 @@ -2209,7 +2818,7 @@
9.1554 </message>
9.1555 <message>
9.1556 <source>Warning</source>
9.1557 - <translation type="obsolete">Warnung</translation>
9.1558 + <translation>Warnung</translation>
9.1559 </message>
9.1560 <message>
9.1561 <source>Couldn't find script %1
9.1562 @@ -2221,11 +2830,25 @@
9.1563 </message>
9.1564 <message>
9.1565 <source>History for </source>
9.1566 - <translation type="unfinished"></translation>
9.1567 + <translation>Verlauf für</translation>
9.1568 </message>
9.1569 <message>
9.1570 <source>Save image</source>
9.1571 - <translation type="unfinished">Speichere Bild</translation>
9.1572 + <translation>Speichere Bild</translation>
9.1573 + </message>
9.1574 + <message>
9.1575 + <source>Critical Parse Error while reading %1</source>
9.1576 + <translation>Kritischer Fehler beim Parsen von %1</translation>
9.1577 + </message>
9.1578 + <message>
9.1579 + <source>Could not read %1</source>
9.1580 + <translation>%1 konnte nicht gelesen werden</translation>
9.1581 + </message>
9.1582 + <message>
9.1583 + <source>Can't get color of heading,
9.1584 +there's no branch selected</source>
9.1585 + <translation>Konnte die Farbe der Beschriftung nicht bestimmen,
9.1586 +da kein Zweig ausgewählt ist.</translation>
9.1587 </message>
9.1588 </context>
9.1589 <context>
9.1590 @@ -2343,12 +2966,12 @@
9.1591 </message>
9.1592 <message>
9.1593 <source>Error</source>
9.1594 - <translation type="unfinished"></translation>
9.1595 + <translation>Fehler</translation>
9.1596 </message>
9.1597 <message>
9.1598 <source>Couldn't access temporary directory
9.1599 </source>
9.1600 - <translation type="unfinished"></translation>
9.1601 + <translation>Auf das temporäre Verzeichnis konnte nicht zugegriffen werden</translation>
9.1602 </message>
9.1603 </context>
9.1604 <context>
9.1605 @@ -2359,7 +2982,7 @@
9.1606 </message>
9.1607 <message>
9.1608 <source>Close</source>
9.1609 - <translation type="unfinished">Schliessen</translation>
9.1610 + <translation>Schliessen</translation>
9.1611 </message>
9.1612 <message>
9.1613 <source>History of %1</source>
9.1614 @@ -2367,7 +2990,7 @@
9.1615 </message>
9.1616 <message>
9.1617 <source>Dialog</source>
9.1618 - <translation type="unfinished"></translation>
9.1619 + <translation>Dialog</translation>
9.1620 </message>
9.1621 </context>
9.1622 <context>
9.1623 @@ -2378,7 +3001,7 @@
9.1624 </message>
9.1625 <message>
9.1626 <source>Import</source>
9.1627 - <translation>Importiere</translation>
9.1628 + <translation type="obsolete">Importiere</translation>
9.1629 </message>
9.1630 <message>
9.1631 <source>&Import...</source>
9.1632 @@ -2414,7 +3037,7 @@
9.1633 </message>
9.1634 <message>
9.1635 <source>Undo</source>
9.1636 - <translation>Rückgängig</translation>
9.1637 + <translation type="obsolete">Rückgängig</translation>
9.1638 </message>
9.1639 <message>
9.1640 <source>&Undo</source>
9.1641 @@ -2422,7 +3045,7 @@
9.1642 </message>
9.1643 <message>
9.1644 <source>Redo</source>
9.1645 - <translation>Wiederherstellen</translation>
9.1646 + <translation type="obsolete">Wiederherstellen</translation>
9.1647 </message>
9.1648 <message>
9.1649 <source>&Redo</source>
9.1650 @@ -2430,7 +3053,7 @@
9.1651 </message>
9.1652 <message>
9.1653 <source>Select and copy all</source>
9.1654 - <translation>Alles auswählen und kopieren</translation>
9.1655 + <translation type="obsolete">Alles auswählen und kopieren</translation>
9.1656 </message>
9.1657 <message>
9.1658 <source>Select and copy &all</source>
9.1659 @@ -2438,7 +3061,7 @@
9.1660 </message>
9.1661 <message>
9.1662 <source>Copy</source>
9.1663 - <translation>Kopieren</translation>
9.1664 + <translation type="obsolete">Kopieren</translation>
9.1665 </message>
9.1666 <message>
9.1667 <source>&Copy</source>
9.1668 @@ -2446,7 +3069,7 @@
9.1669 </message>
9.1670 <message>
9.1671 <source>Cut</source>
9.1672 - <translation>Ausschneiden</translation>
9.1673 + <translation type="obsolete">Ausschneiden</translation>
9.1674 </message>
9.1675 <message>
9.1676 <source>Cu&t</source>
9.1677 @@ -2454,7 +3077,7 @@
9.1678 </message>
9.1679 <message>
9.1680 <source>Paste</source>
9.1681 - <translation>Einfügen</translation>
9.1682 + <translation type="obsolete">Einfügen</translation>
9.1683 </message>
9.1684 <message>
9.1685 <source>&Paste</source>
9.1686 @@ -2462,7 +3085,7 @@
9.1687 </message>
9.1688 <message>
9.1689 <source>Delete all</source>
9.1690 - <translation>Alles löschen</translation>
9.1691 + <translation type="obsolete">Alles löschen</translation>
9.1692 </message>
9.1693 <message>
9.1694 <source>&Delete All</source>
9.1695 @@ -2486,7 +3109,7 @@
9.1696 </message>
9.1697 <message>
9.1698 <source>Set fixed font</source>
9.1699 - <translation>Wähle Zeichensatz mit fixer Breite</translation>
9.1700 + <translation type="obsolete">Wähle Zeichensatz mit fixer Breite</translation>
9.1701 </message>
9.1702 <message>
9.1703 <source>Set &fixed font</source>
9.1704 @@ -2494,7 +3117,7 @@
9.1705 </message>
9.1706 <message>
9.1707 <source>Set variable font</source>
9.1708 - <translation>Wähle Zeichensatz mit variabler Breite</translation>
9.1709 + <translation type="obsolete">Wähle Zeichensatz mit variabler Breite</translation>
9.1710 </message>
9.1711 <message>
9.1712 <source>Set &variable font</source>
9.1713 @@ -2502,7 +3125,7 @@
9.1714 </message>
9.1715 <message>
9.1716 <source>Used fixed font by default</source>
9.1717 - <translation>Verwende fixen Zeichensatz per default</translation>
9.1718 + <translation type="obsolete">Verwende fixen Zeichensatz per default</translation>
9.1719 </message>
9.1720 <message>
9.1721 <source>&fixed font is default</source>
9.1722 @@ -2510,11 +3133,11 @@
9.1723 </message>
9.1724 <message>
9.1725 <source>Export Note (HTML)</source>
9.1726 - <translation>Exportiere Notiz (HTML)</translation>
9.1727 + <translation type="obsolete">Exportiere Notiz (HTML)</translation>
9.1728 </message>
9.1729 <message>
9.1730 <source>Export Note As (HTML) </source>
9.1731 - <translation>Exportiere Notiz als (HTML)</translation>
9.1732 + <translation type="obsolete">Exportiere Notiz als (HTML)</translation>
9.1733 </message>
9.1734 <message>
9.1735 <source>Export &As... (HTML)</source>
9.1736 @@ -2522,7 +3145,7 @@
9.1737 </message>
9.1738 <message>
9.1739 <source>Export Note As (ASCII) </source>
9.1740 - <translation>Exportiere Notiz als (ASCII)</translation>
9.1741 + <translation type="obsolete">Exportiere Notiz als (ASCII)</translation>
9.1742 </message>
9.1743 <message>
9.1744 <source>Export &As...(ASCII)</source>
9.1745 @@ -2570,11 +3193,11 @@
9.1746 </message>
9.1747 <message>
9.1748 <source>The file </source>
9.1749 - <translation>Die Datei</translation>
9.1750 + <translation type="obsolete">Die Datei</translation>
9.1751 </message>
9.1752 <message>
9.1753 <source> exists already. Do you want to overwrite it?</source>
9.1754 - <translation>gibt es bereits. Wollen Sie sie</translation>
9.1755 + <translation type="obsolete">gibt es bereits. Wollen Sie sie</translation>
9.1756 </message>
9.1757 <message>
9.1758 <source>Overwrite</source>
9.1759 @@ -2586,7 +3209,7 @@
9.1760 </message>
9.1761 <message>
9.1762 <source>Couldn't export note </source>
9.1763 - <translation>Konnte Notiz nicht exportieren</translation>
9.1764 + <translation type="obsolete">Konnte Notiz nicht exportieren</translation>
9.1765 </message>
9.1766 <message>
9.1767 <source>Export Note to single file (ASCII)</source>
9.1768 @@ -2598,7 +3221,7 @@
9.1769 </message>
9.1770 <message>
9.1771 <source>&Convert Paragraphs</source>
9.1772 - <translation>&Absätze umwandeln</translation>
9.1773 + <translation type="obsolete">&Absätze umwandeln</translation>
9.1774 </message>
9.1775 <message>
9.1776 <source>Join all lines of a paragraph</source>
9.1777 @@ -2606,11 +3229,11 @@
9.1778 </message>
9.1779 <message>
9.1780 <source>&Join lines</source>
9.1781 - <translation>&Zeilen vereinen</translation>
9.1782 + <translation type="obsolete">&Zeilen vereinen</translation>
9.1783 </message>
9.1784 <message>
9.1785 <source>Toggle font hint for the whole text</source>
9.1786 - <translation>Zeichensatz für gesamten Text umschalten</translation>
9.1787 + <translation type="obsolete">Zeichensatz für gesamten Text umschalten</translation>
9.1788 </message>
9.1789 <message>
9.1790 <source>&Font hint</source>
9.1791 @@ -2634,34 +3257,147 @@
9.1792 </message>
9.1793 <message>
9.1794 <source>Edit Actions</source>
9.1795 - <translation type="unfinished"></translation>
9.1796 + <translation>Edit Actions</translation>
9.1797 </message>
9.1798 <message>
9.1799 <source>Format Actions</source>
9.1800 - <translation type="unfinished">Format Actions</translation>
9.1801 + <translation>Format Actions</translation>
9.1802 </message>
9.1803 <message>
9.1804 <source>Print Document</source>
9.1805 - <translation type="unfinished"></translation>
9.1806 + <translation type="obsolete">Drucke Notiz</translation>
9.1807 </message>
9.1808 <message>
9.1809 <source>Note Actions</source>
9.1810 - <translation type="unfinished"></translation>
9.1811 + <translation>Note Actions</translation>
9.1812 </message>
9.1813 <message>
9.1814 <source>&Note</source>
9.1815 - <translation type="unfinished"></translation>
9.1816 + <translation type="obsolete">&Notiz</translation>
9.1817 + </message>
9.1818 + <message>
9.1819 + <source>Ready</source>
9.1820 + <comment>Statusbar message</comment>
9.1821 + <translation>Bereit</translation>
9.1822 + </message>
9.1823 + <message>
9.1824 + <source>No filename available for this note.</source>
9.1825 + <comment>Statusbar message</comment>
9.1826 + <translation>Notiz hat keinen Dateinamen</translation>
9.1827 + </message>
9.1828 + <message>
9.1829 + <source>Note Editor</source>
9.1830 + <comment>Window caption</comment>
9.1831 + <translation>Notiz Editor</translation>
9.1832 + </message>
9.1833 + <message>
9.1834 + <source>&Note</source>
9.1835 + <comment>Menubar</comment>
9.1836 + <translation>&Notiz</translation>
9.1837 + </message>
9.1838 + <message>
9.1839 + <source>Import</source>
9.1840 + <comment>Status tip for Note menu</comment>
9.1841 + <translation>Importieren</translation>
9.1842 + </message>
9.1843 + <message>
9.1844 + <source>Export Note (HTML)</source>
9.1845 + <comment>Status tip for Note menu</comment>
9.1846 + <translation>Exportiere Notiz (HTML)</translation>
9.1847 + </message>
9.1848 + <message>
9.1849 + <source>Export Note As (HTML) </source>
9.1850 + <comment>Status tip for Note Menu</comment>
9.1851 + <translation>Exportiere Notiz als (HTML)</translation>
9.1852 + </message>
9.1853 + <message>
9.1854 + <source>Export Note As (ASCII) </source>
9.1855 + <comment>Status tip for note menu</comment>
9.1856 + <translation>Exportiere Notiz als (ASCII)</translation>
9.1857 + </message>
9.1858 + <message>
9.1859 + <source>Print Note</source>
9.1860 + <comment>Status tip for note menu</comment>
9.1861 + <translation>Drucke Notiz</translation>
9.1862 + </message>
9.1863 + <message>
9.1864 + <source>Undo</source>
9.1865 + <comment>Status tip for note menu</comment>
9.1866 + <translation>Rückgängig</translation>
9.1867 + </message>
9.1868 + <message>
9.1869 + <source>Redo</source>
9.1870 + <comment>Status tip for note menu</comment>
9.1871 + <translation>Wiederherstellen</translation>
9.1872 + </message>
9.1873 + <message>
9.1874 + <source>Select and copy all</source>
9.1875 + <comment>Status tip for note menu</comment>
9.1876 + <translation>Alles auswählen und kopieren</translation>
9.1877 + </message>
9.1878 + <message>
9.1879 + <source>Copy</source>
9.1880 + <comment>Status tip for note menu</comment>
9.1881 + <translation>Kopieren</translation>
9.1882 + </message>
9.1883 + <message>
9.1884 + <source>Cut</source>
9.1885 + <comment>Status tip for note menu</comment>
9.1886 + <translation>Ausschneiden</translation>
9.1887 + </message>
9.1888 + <message>
9.1889 + <source>Paste</source>
9.1890 + <comment>Status tip for note menu</comment>
9.1891 + <translation>Einfügen</translation>
9.1892 + </message>
9.1893 + <message>
9.1894 + <source>Delete all</source>
9.1895 + <comment>Status tip for note menu</comment>
9.1896 + <translation>Alles löschen</translation>
9.1897 + </message>
9.1898 + <message>
9.1899 + <source>Toggle font hint for the whole text</source>
9.1900 + <comment>Status tip for note menu</comment>
9.1901 + <translation>Zeichensatz für gesamten Text umschalten</translation>
9.1902 + </message>
9.1903 + <message>
9.1904 + <source>Set fixed font</source>
9.1905 + <comment>Status tip for note menu</comment>
9.1906 + <translation>Wähle Zeichensatz mit fixer Breite</translation>
9.1907 + </message>
9.1908 + <message>
9.1909 + <source>Set variable font</source>
9.1910 + <comment>Status tip for note menu</comment>
9.1911 + <translation>Wähle Zeichensatz mit variabler Breite</translation>
9.1912 + </message>
9.1913 + <message>
9.1914 + <source>Used fixed font by default</source>
9.1915 + <comment>Status tip for note menu</comment>
9.1916 + <translation>Verwende fixen Zeichensatz per default</translation>
9.1917 + </message>
9.1918 + <message>
9.1919 + <source>The file %1
9.1920 +exists already.
9.1921 +Do you want to overwrite it?</source>
9.1922 + <comment>dialog 'save note as'</comment>
9.1923 + <translation>Die Datei %1 gibt es bereits.
9.1924 +Wollen Sie sie überschreiben?</translation>
9.1925 + </message>
9.1926 + <message>
9.1927 + <source>Couldn't export note </source>
9.1928 + <comment>dialog 'save note as'</comment>
9.1929 + <translation>Konnte Notiz nicht exportieren</translation>
9.1930 </message>
9.1931 </context>
9.1932 <context>
9.1933 <name>WarningDialog</name>
9.1934 <message>
9.1935 <source>VYM - Warning : Foo...</source>
9.1936 - <translation type="obsolete">VYM - Warnung: ...</translation>
9.1937 + <translation type="unfinished">VYM - Warnung: ...</translation>
9.1938 </message>
9.1939 <message>
9.1940 <source>Proceed</source>
9.1941 - <translation type="obsolete">Weiter</translation>
9.1942 + <translation type="unfinished">Weiter</translation>
9.1943 </message>
9.1944 <message>
9.1945 <source>Show this message again</source>
9.1946 @@ -2669,11 +3405,15 @@
9.1947 </message>
9.1948 <message>
9.1949 <source>Cancel</source>
9.1950 - <translation type="obsolete">Abbrechen</translation>
9.1951 + <translation type="unfinished">Abbrechen</translation>
9.1952 </message>
9.1953 <message>
9.1954 <source>Ok</source>
9.1955 - <translation type="obsolete">Ok</translation>
9.1956 + <translation type="unfinished">Ok</translation>
9.1957 + </message>
9.1958 + <message>
9.1959 + <source>showAgainBox</source>
9.1960 + <translation type="unfinished"></translation>
9.1961 </message>
9.1962 </context>
9.1963 </TS>
10.1 --- a/linkablemapobj.cpp Tue Oct 24 15:36:38 2006 +0000
10.2 +++ b/linkablemapobj.cpp Mon Oct 30 12:39:37 2006 +0000
10.3 @@ -154,9 +154,13 @@
10.4 {
10.5 if (parObj)
10.6 {
10.7 - getRelPos();
10.8 + relPos.setX (absPos.x() - parObj->getChildPos().x() );
10.9 + relPos.setY (absPos.y() - parObj->getChildPos().y() );
10.10 parObj->calcBBoxSize();
10.11 - }
10.12 + } else
10.13 + {
10.14 + qWarning ("LMO::setRelPos No parent yet!");
10.15 + }
10.16 }
10.17
10.18 void LinkableMapObj::setRelPos(const QPoint &p)
10.19 @@ -166,14 +170,15 @@
10.20 {
10.21 parObj->calcBBoxSize();
10.22 requestReposition();
10.23 - }
10.24 + } else
10.25 + {
10.26 + qWarning ("LMO::setRelPos No parent yet!");
10.27 + }
10.28 }
10.29
10.30 QPoint LinkableMapObj::getRelPos()
10.31 {
10.32 if (!parObj) return QPoint();
10.33 - relPos.setX (absPos.x() - parObj->getChildPos().x() );
10.34 - relPos.setY (absPos.y() - parObj->getChildPos().y() );
10.35 return relPos;
10.36 }
10.37
10.38 @@ -713,9 +718,9 @@
10.39
10.40 void LinkableMapObj::reposition()
10.41 {
10.42 + cout << "LMO::reposition\n";
10.43 // FIXME not needed? Is overloaded in BranchObj...
10.44 /*
10.45 - cout << "LMO::reposition\n";
10.46 if (depth==0)
10.47 {
10.48 // only calculate the sizes once. If the deepest LMO changes its height,
11.1 --- a/mainwindow.cpp Tue Oct 24 15:36:38 2006 +0000
11.2 +++ b/mainwindow.cpp Mon Oct 30 12:39:37 2006 +0000
11.3 @@ -73,6 +73,9 @@
11.4 // Sometimes we may need to remember old selections
11.5 prevSelection="";
11.6
11.7 + // Default color
11.8 + currentColor=Qt::black;
11.9 +
11.10 // Create unique temporary directory
11.11 bool ok;
11.12 tmpVymDir=makeUniqueDir (ok,"/tmp/vym-XXXXXX");
11.13 @@ -242,123 +245,123 @@
11.14 tb->setObjectName ("mapTB");
11.15
11.16 QAction *a;
11.17 - a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New..." ),this);
11.18 - a->setStatusTip ( tr( "New map","File menu" ) );
11.19 + a = new QAction(QPixmap( iconPath+"filenew.png"), tr( "&New...","File menu" ),this);
11.20 + a->setStatusTip ( tr( "New map","Status tip File menu" ) );
11.21 a->setShortcut ( Qt::CTRL + Qt::Key_N );
11.22 a->addTo( tb );
11.23 fileMenu->addAction (a);
11.24 connect( a, SIGNAL( triggered() ), this, SLOT( fileNew() ) );
11.25
11.26 - a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ),this);
11.27 - a->setStatusTip (tr( "Open","File menu" ) );
11.28 + a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Open..." ,"File menu"),this);
11.29 + a->setStatusTip (tr( "Open","Status tip File menu" ) );
11.30 a->setShortcut ( Qt::CTRL + Qt::Key_O );
11.31 a->addTo( tb );
11.32 fileMenu->addAction (a);
11.33 connect( a, SIGNAL( triggered() ), this, SLOT( fileLoad() ) );
11.34
11.35 - fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent"));
11.36 + fileLastMapsMenu = fileMenu->addMenu (tr("Open Recent","File menu"));
11.37 fileMenu->addSeparator();
11.38
11.39 - a = new QAction( QPixmap( iconPath+"filesave.png"), tr( "&Save..." ), this);
11.40 - a->setStatusTip ( tr( "Save" ));
11.41 + a = new QAction( QPixmap( iconPath+"filesave.png"), tr( "&Save...","File menu" ), this);
11.42 + a->setStatusTip ( tr( "Save","Status tip file menu" ));
11.43 a->setShortcut (Qt::CTRL + Qt::Key_S );
11.44 a->addTo( tb );
11.45 fileMenu->addAction (a);
11.46 connect( a, SIGNAL( triggered() ), this, SLOT( fileSave() ) );
11.47 actionFileSave=a;
11.48
11.49 - a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As..." ), this);
11.50 - a->setStatusTip (tr( "Save &As" ) );
11.51 + a = new QAction( QPixmap(iconPath+"filesaveas.png"), tr( "Save &As...","File menu" ), this);
11.52 + a->setStatusTip (tr( "Save &As","Status tip file menu" ) );
11.53 fileMenu->addAction (a);
11.54 connect( a, SIGNAL( triggered() ), this, SLOT( fileSaveAs() ) );
11.55
11.56 fileMenu->addSeparator();
11.57
11.58 - fileImportMenu = fileMenu->addMenu (tr("Import"));
11.59 + fileImportMenu = fileMenu->addMenu (tr("Import","File menu"));
11.60
11.61 a = new QAction(tr("KDE Bookmarks"), this);
11.62 - a->setStatusTip ( tr( "Import")+" "+tr("KDE Bookmarks" ));
11.63 + a->setStatusTip ( tr( "Import %1","Status tip file menu" ).arg(tr("KDE bookmarks")));
11.64 a->addTo (fileImportMenu);
11.65 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportKDEBookmarks() ) );
11.66
11.67 if (settings.value( "/mainwindow/showTestMenu",false).toBool())
11.68 {
11.69 - a = new QAction( QPixmap(), tr("Firefox Bookmarks"),this);
11.70 - a->setStatusTip (tr( "Import")+" "+tr("Firefox Bookmarks" ) );
11.71 + a = new QAction( QPixmap(), tr("Firefox Bookmarks","File menu"),this);
11.72 + a->setStatusTip (tr( "Import %1","Status tip file menu").arg(tr("Firefox Bookmarks" ) ));
11.73 a->addTo (fileImportMenu);
11.74 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportFirefoxBookmarks() ) );
11.75 }
11.76
11.77 a = new QAction("Mind Manager...",this);
11.78 - a->setStatusTip ( tr( "Import")+" Mind Manager" );
11.79 + a->setStatusTip ( tr( "Import %1","status tip file menu").arg(" Mind Manager") );
11.80 fileImportMenu->addAction (a);
11.81 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportMM() ) );
11.82
11.83 - a = new QAction( tr( "Import Dir"+QString("...") ), this);
11.84 - a->setStatusTip (tr( "Import directory structure (experimental)" ) );
11.85 + a = new QAction( tr( "Import Dir%1","File menu").arg("..."), this);
11.86 + a->setStatusTip (tr( "Import directory structure (experimental)","status tip file menu" ) );
11.87 fileImportMenu->addAction (a);
11.88 connect( a, SIGNAL( triggered() ), this, SLOT( fileImportDir() ) );
11.89
11.90 - fileExportMenu = fileMenu->addMenu (tr("Export"));
11.91 -
11.92 - a = new QAction( tr("Image")+QString("..."), this);
11.93 - a->setStatusTip( tr( "Export map as image" ));
11.94 + fileExportMenu = fileMenu->addMenu (tr("Export","File menu"));
11.95 +
11.96 + a = new QAction( tr("Image%1","File export menu").arg("..."), this);
11.97 + a->setStatusTip( tr( "Export map as image","status tip file menu" ));
11.98 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportImage() ) );
11.99 fileExportMenu->addAction (a);
11.100
11.101 - a = new QAction( "Open Office"+QString("..."), this);
11.102 - a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office " ));
11.103 + a = new QAction( "Open Office...", this);
11.104 + a->setStatusTip( tr( "Export in Open Document Format used e.g. in Open Office ","status tip file menu" ));
11.105 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportOOPresentation() ) );
11.106 fileExportMenu->addAction (a);
11.107
11.108 a = new QAction( "Webpage (XHTML)...",this );
11.109 a->setShortcut (Qt::ALT + Qt::Key_X);
11.110 - a->setStatusTip ( tr( "Export as")+" webpage (XHTML)");
11.111 + a->setStatusTip ( tr( "Export as %1","status tip file menu").arg(tr(" webpage (XHTML)","status tip file menu")));
11.112 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXHTML() ) );
11.113 fileExportMenu->addAction (a);
11.114
11.115 a = new QAction( "Text (ASCII)...", this);
11.116 - a->setStatusTip ( tr( "Export as")+" ASCII"+" "+tr("(still experimental)" ));
11.117 + a->setStatusTip ( tr( "Export as %1").arg("ASCII "+tr("(still experimental)" )));
11.118 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportASCII() ) );
11.119 fileExportMenu->addAction (a);
11.120
11.121 - a = new QAction( tr("KDE Bookmarks"), this);
11.122 - a->setStatusTip( tr( "Export as")+" "+tr("KDE Bookmarks" ));
11.123 + a = new QAction( tr("KDE Bookmarks","File menu"), this);
11.124 + a->setStatusTip( tr( "Export as %1").arg(tr("KDE Bookmarks" )));
11.125 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportKDEBookmarks() ) );
11.126 fileExportMenu->addAction (a);
11.127
11.128 a = new QAction( "Taskjuggler...", this );
11.129 - a->setStatusTip( tr( "Export as")+" Taskjuggler"+" "+tr("(still experimental)" ));
11.130 + a->setStatusTip( tr( "Export as %1").arg("Taskjuggler "+tr("(still experimental)" )));
11.131 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportTaskjuggler() ) );
11.132 fileExportMenu->addAction (a);
11.133
11.134 a = new QAction( "LaTeX...", this);
11.135 - a->setStatusTip( tr( "Export as")+" LaTeX"+" "+tr("(still experimental)" ));
11.136 + a->setStatusTip( tr( "Export as %1").arg("LaTeX "+tr("(still experimental)" )));
11.137 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportLaTeX() ) );
11.138 fileExportMenu->addAction (a);
11.139
11.140 a = new QAction( "XML..." , this );
11.141 - a->setStatusTip (tr( "Export as")+" XML");
11.142 + a->setStatusTip (tr( "Export as %1").arg("XML"));
11.143 connect( a, SIGNAL( triggered() ), this, SLOT( fileExportXML() ) );
11.144 fileExportMenu->addAction (a);
11.145
11.146 fileMenu->addSeparator();
11.147
11.148 a = new QAction(QPixmap( iconPath+"fileprint.png"), tr( "&Print")+QString("..."), this);
11.149 - a->setStatusTip ( tr( "Print" ) );
11.150 + a->setStatusTip ( tr( "Print" ,"File menu") );
11.151 a->setShortcut (Qt::CTRL + Qt::Key_P );
11.152 a->addTo( tb );
11.153 fileMenu->addAction (a);
11.154 connect( a, SIGNAL( triggered() ), this, SLOT( filePrint() ) );
11.155 actionFilePrint=a;
11.156
11.157 - a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map" ), this);
11.158 + a = new QAction( QPixmap(iconPath+"fileclose.png"), tr( "&Close Map","File menu" ), this);
11.159 a->setStatusTip (tr( "Close Map" ) );
11.160 a->setShortcut (Qt::ALT + Qt::Key_C );
11.161 fileMenu->addAction (a);
11.162 connect( a, SIGNAL( triggered() ), this, SLOT( fileCloseMap() ) );
11.163
11.164 - a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit")+" "+__VYM, this);
11.165 + a = new QAction(QPixmap(iconPath+"exit.png"), tr( "E&xit","File menu")+" "+__VYM, this);
11.166 a->setStatusTip ( tr( "Exit")+" "+__VYM );
11.167 a->setShortcut (Qt::CTRL + Qt::Key_Q );
11.168 fileMenu->addAction (a);
11.169 @@ -369,14 +372,14 @@
11.170 //Edit Actions
11.171 void Main::setupEditActions()
11.172 {
11.173 - QToolBar *tb = addToolBar( tr ("&Actions") );
11.174 + QToolBar *tb = addToolBar( tr ("&Actions toolbar","Toolbar name") );
11.175 tb->setLabel( "Edit Actions" );
11.176 tb->setObjectName ("actionsTB");
11.177 - QMenu *editMenu = menuBar()->addMenu( tr("&Edit") );
11.178 + QMenu *editMenu = menuBar()->addMenu( tr("&Edit","Edit menu") );
11.179
11.180 QAction *a;
11.181 QAction *alt;
11.182 - a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo" ),this);
11.183 + a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo","Edit menu" ),this);
11.184 connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
11.185 a->setStatusTip (tr( "Undo" ) );
11.186 a->setShortcut ( Qt::CTRL + Qt::Key_Z );
11.187 @@ -385,7 +388,7 @@
11.188 editMenu->addAction (a);
11.189 actionEditUndo=a;
11.190
11.191 - a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo" ), this);
11.192 + a = new QAction( QPixmap( iconPath+"redo.png"), tr( "&Redo","Edit menu" ), this);
11.193 a->setStatusTip (tr( "Redo" ));
11.194 a->setShortcut (Qt::CTRL + Qt::Key_Y );
11.195 tb->addAction (a);
11.196 @@ -394,7 +397,7 @@
11.197 actionEditRedo=a;
11.198
11.199 editMenu->addSeparator();
11.200 - a = new QAction(QPixmap( iconPath+"editcopy.png"), tr( "&Copy" ), this);
11.201 + a = new QAction(QPixmap( iconPath+"editcopy.png"), tr( "&Copy","Edit menu" ), this);
11.202 a->setStatusTip ( tr( "Copy" ) );
11.203 a->setShortcut (Qt::CTRL + Qt::Key_C );
11.204 a->setEnabled (false);
11.205 @@ -403,7 +406,7 @@
11.206 connect( a, SIGNAL( triggered() ), this, SLOT( editCopy() ) );
11.207 actionEditCopy=a;
11.208
11.209 - a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t" ), this);
11.210 + a = new QAction(QPixmap( iconPath+"editcut.png" ), tr( "Cu&t","Edit menu" ), this);
11.211 a->setStatusTip ( tr( "Cut" ) );
11.212 a->setShortcut (Qt::CTRL + Qt::Key_X );
11.213 a->setEnabled (false);
11.214 @@ -412,7 +415,7 @@
11.215 actionEditCut=a;
11.216 connect( a, SIGNAL( triggered() ), this, SLOT( editCut() ) );
11.217
11.218 - a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste" ),this);
11.219 + a = new QAction(QPixmap( iconPath+"editpaste.png"), tr( "&Paste","Edit menu" ),this);
11.220 connect( a, SIGNAL( triggered() ), this, SLOT( editPaste() ) );
11.221 a->setStatusTip ( tr( "Paste" ) );
11.222 a->setShortcut ( Qt::CTRL + Qt::Key_V );
11.223 @@ -422,14 +425,14 @@
11.224 actionEditPaste=a;
11.225
11.226 // Shortcuts to modify heading:
11.227 - a = new QAction(tr( "Edit heading" ),this);
11.228 + a = new QAction(tr( "Edit heading","Edit menu" ),this);
11.229 a->setStatusTip ( tr( "edit Heading" ));
11.230 a->setShortcut ( Qt::Key_Enter);
11.231 // a->setShortcutContext (Qt::WindowShortcut);
11.232 addAction (a);
11.233 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading() ) );
11.234 actionListBranches.append(a);
11.235 - a = new QAction( tr( "Edit heading" ), this);
11.236 + a = new QAction( tr( "Edit heading","Edit menu" ), this);
11.237 a->setStatusTip (tr( "edit Heading" ));
11.238 a->setShortcut (Qt::Key_Return );
11.239 //a->setShortcutContext (Qt::WindowShortcut);
11.240 @@ -438,7 +441,7 @@
11.241 actionListBranches.append(a);
11.242 editMenu->addAction (a);
11.243 actionEditHeading=a;
11.244 - a = new QAction( tr( "Edit heading" ), this);
11.245 + a = new QAction( tr( "Edit heading","Edit menu" ), this);
11.246 a->setStatusTip (tr( "edit Heading" ));
11.247 a->setShortcut ( Qt::Key_F2 );
11.248 a->setShortcutContext (Qt::WindowShortcut);
11.249 @@ -447,7 +450,7 @@
11.250 actionListBranches.append(a);
11.251
11.252 // Shortcut to delete selection
11.253 - a = new QAction( tr( "Delete Selection" ),this);
11.254 + a = new QAction( tr( "Delete Selection","Edit menu" ),this);
11.255 a->setStatusTip (tr( "Delete Selection" ));
11.256 a->setShortcut ( Qt::Key_Delete);
11.257 a->setShortcutContext (Qt::WindowShortcut);
11.258 @@ -456,13 +459,13 @@
11.259 actionEditDelete=a;
11.260
11.261 // Shortcut to add branch
11.262 - alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
11.263 + alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
11.264 alt->setStatusTip ( tr( "Add a branch as child of selection" ));
11.265 alt->setShortcut (Qt::Key_A);
11.266 alt->setShortcutContext (Qt::WindowShortcut);
11.267 addAction (alt);
11.268 connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
11.269 - a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child" ), this);
11.270 + a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
11.271 a->setStatusTip ( tr( "Add a branch as child of selection" ));
11.272 a->setShortcut (Qt::Key_Insert);
11.273 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
11.274 @@ -478,7 +481,7 @@
11.275
11.276
11.277 // Add branch by inserting it at selection
11.278 - a = new QAction(tr( "Add branch (insert)" ), this);
11.279 + a = new QAction(tr( "Add branch (insert)","Edit menu" ), this);
11.280 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
11.281 a->setShortcut (Qt::ALT + Qt::Key_Insert );
11.282 a->setShortcutContext (Qt::WindowShortcut);
11.283 @@ -487,7 +490,7 @@
11.284 a->setEnabled (false);
11.285 actionListBranches.append(a);
11.286 actionEditAddBranchBefore=a;
11.287 - a = new QAction(tr( "Add branch (insert)" ),this);
11.288 + a = new QAction(tr( "Add branch (insert)","Edit menu" ),this);
11.289 a->setStatusTip ( tr( "Add a branch by inserting and making selection its child" ));
11.290 a->setShortcut ( Qt::ALT + Qt::Key_A );
11.291 a->setShortcutContext (Qt::WindowShortcut);
11.292 @@ -496,7 +499,7 @@
11.293 actionListBranches.append(a);
11.294
11.295 // Add branch above
11.296 - a = new QAction(tr( "Add branch above" ), this);
11.297 + a = new QAction(tr( "Add branch above","Edit menu" ), this);
11.298 a->setStatusTip ( tr( "Add a branch above selection" ));
11.299 a->setShortcut (Qt::SHIFT+Qt::Key_Insert );
11.300 a->setShortcutContext (Qt::WindowShortcut);
11.301 @@ -505,7 +508,7 @@
11.302 a->setEnabled (false);
11.303 actionListBranches.append(a);
11.304 actionEditAddBranchAbove=a;
11.305 - a = new QAction(tr( "Add branch above" ), this);
11.306 + a = new QAction(tr( "Add branch above","Edit menu" ), this);
11.307 a->setStatusTip ( tr( "Add a branch above selection" ));
11.308 a->setShortcut (Qt::SHIFT+Qt::Key_A );
11.309 a->setShortcutContext (Qt::WindowShortcut);
11.310 @@ -514,7 +517,7 @@
11.311 actionListBranches.append(a);
11.312
11.313 // Add branch below
11.314 - a = new QAction(tr( "Add branch below" ), this);
11.315 + a = new QAction(tr( "Add branch below","Edit menu" ), this);
11.316 a->setStatusTip ( tr( "Add a branch below selection" ));
11.317 a->setShortcut (Qt::CTRL +Qt::Key_Insert );
11.318 a->setShortcutContext (Qt::WindowShortcut);
11.319 @@ -523,7 +526,7 @@
11.320 a->setEnabled (false);
11.321 actionListBranches.append(a);
11.322 actionEditAddBranchBelow=a;
11.323 - a = new QAction(tr( "Add branch below" ), this);
11.324 + a = new QAction(tr( "Add branch below","Edit menu" ), this);
11.325 a->setStatusTip ( tr( "Add a branch below selection" ));
11.326 a->setShortcut (Qt::CTRL +Qt::Key_A );
11.327 a->setShortcutContext (Qt::WindowShortcut);
11.328 @@ -531,7 +534,7 @@
11.329 connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranchBelow() ) );
11.330 actionListBranches.append(a);
11.331
11.332 - a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up" ), this);
11.333 + a = new QAction(QPixmap(iconPath+"up.png" ), tr( "Move up","Edit menu" ), this);
11.334 a->setStatusTip ( tr( "Move branch up" ) );
11.335 a->setShortcut (Qt::Key_PageUp );
11.336 a->setEnabled (false);
11.337 @@ -540,7 +543,7 @@
11.338 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveUp() ) );
11.339 actionEditMoveUp=a;
11.340
11.341 - a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down" ),this);
11.342 + a = new QAction( QPixmap( iconPath+"down.png"), tr( "Move down","Edit menu" ),this);
11.343 connect( a, SIGNAL( triggered() ), this, SLOT( editMoveDown() ) );
11.344 a->setStatusTip (tr( "Move branch down" ) );
11.345 a->setShortcut ( Qt::Key_PageDown );
11.346 @@ -550,12 +553,12 @@
11.347 actionEditMoveDown=a;
11.348
11.349
11.350 - a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ),this);
11.351 + a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ),this);
11.352 a->setShortcut ( Qt::Key_ScrollLock );
11.353 a->setStatusTip (tr( "Scroll branch" ) );
11.354 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
11.355
11.356 - alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch" ), this);
11.357 + alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
11.358 alt->setShortcut ( Qt::Key_S );
11.359 alt->setStatusTip (tr( "Scroll branch" ));
11.360 connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
11.361 @@ -573,14 +576,14 @@
11.362 addAction (alt);
11.363 actionListBranches.append(actionEditToggleScroll);
11.364
11.365 - a = new QAction( tr( "Unscroll all scrolled branches" ), this);
11.366 + a = new QAction( tr( "Unscroll all scrolled branches","Edit menu" ), this);
11.367 a->setStatusTip (tr( "Unscroll all" ));
11.368 editMenu->addAction (a);
11.369 connect( a, SIGNAL( triggered() ), this, SLOT( editUnScrollAll() ) );
11.370
11.371 editMenu->addSeparator();
11.372
11.373 - a = new QAction( QPixmap(iconPath+"find.png"), tr( "Find"+QString("...") ), this);
11.374 + a = new QAction( QPixmap(iconPath+"find.png"), tr( "Find...","Edit menu"), this);
11.375 a->setStatusTip (tr( "Find" ) );
11.376 a->setShortcut (Qt::CTRL + Qt::Key_F );
11.377 editMenu->addAction (a);
11.378 @@ -588,7 +591,7 @@
11.379
11.380 editMenu->addSeparator();
11.381
11.382 - a = new QAction( QPixmap(flagsPath+"flag-url.png"), tr( "Open URL" ), this);
11.383 + a = new QAction( QPixmap(flagsPath+"flag-url.png"), tr( "Open URL","Edit menu" ), this);
11.384 a->setShortcut (Qt::CTRL + Qt::Key_U );
11.385 a->setShortcut (tr( "Open URL" ));
11.386 tb->addAction (a);
11.387 @@ -596,21 +599,21 @@
11.388 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURL() ) );
11.389 actionEditOpenURL=a;
11.390
11.391 - a = new QAction( tr( "Open URL in new tab" ), this);
11.392 + a = new QAction( tr( "Open URL in new tab","Edit menu" ), this);
11.393 a->setStatusTip (tr( "Open URL in new tab" ));
11.394 a->setShortcut (Qt::CTRL+Qt::Key_U );
11.395 addAction(a);
11.396 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenURLTab() ) );
11.397 actionEditOpenURLTab=a;
11.398
11.399 - a = new QAction( tr( "Open all URLs in subtree" ), this);
11.400 + a = new QAction( tr( "Open all URLs in subtree","Edit menu" ), this);
11.401 a->setStatusTip (tr( "Open all URLs in subtree" ));
11.402 addAction(a);
11.403 actionListBranches.append(a);
11.404 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenMultipleURLTabs() ) );
11.405 actionEditOpenMultipleURLTabs=a;
11.406
11.407 - a = new QAction(QPixmap(), tr( "Edit URL"+QString("...") ), this);
11.408 + a = new QAction(QPixmap(), tr( "Edit URL...","Edit menu"), this);
11.409 a->setStatusTip ( tr( "Edit URL" ) );
11.410 a->setShortcut (Qt::SHIFT + Qt::CTRL + Qt::Key_U );
11.411 //a->setShortcut ( Qt::Key_U );
11.412 @@ -620,35 +623,35 @@
11.413 connect( a, SIGNAL( triggered() ), this, SLOT( editURL() ) );
11.414 actionEditURL=a;
11.415
11.416 - a = new QAction( tr( "Use heading for URL" ), this);
11.417 + a = new QAction( tr( "Use heading for URL","Edit menu" ), this);
11.418 a->setStatusTip ( tr( "Use heading of selected branch as URL" ));
11.419 a->setEnabled (false);
11.420 actionListBranches.append(a);
11.421 connect( a, SIGNAL( triggered() ), this, SLOT( editHeading2URL() ) );
11.422 actionEditHeading2URL=a;
11.423
11.424 - a = new QAction(tr( "Create URL to Bugzilla" ), this);
11.425 + a = new QAction(tr( "Create URL to Bugzilla","Edit menu" ), this);
11.426 a->setStatusTip ( tr( "Create URL to Bugzilla" ));
11.427 a->setEnabled (false);
11.428 actionListBranches.append(a);
11.429 connect( a, SIGNAL( triggered() ), this, SLOT( editBugzilla2URL() ) );
11.430 actionEditBugzilla2URL=a;
11.431
11.432 - a = new QAction(tr( "Create URL to FATE" ), this);
11.433 + a = new QAction(tr( "Create URL to FATE","Edit menu" ), this);
11.434 a->setStatusTip ( tr( "Create URL to FATE" ));
11.435 a->setEnabled (false);
11.436 actionListBranches.append(a);
11.437 connect( a, SIGNAL( triggered() ), this, SLOT( editFATE2URL() ) );
11.438 actionEditFATE2URL=a;
11.439
11.440 - a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Open xlinked map" ), this);
11.441 + a = new QAction(QPixmap(flagsPath+"flag-vymlink.png"), tr( "Open linked map","Edit menu" ), this);
11.442 a->setStatusTip ( tr( "Jump to another vym map, if needed load it first" ));
11.443 tb->addAction (a);
11.444 a->setEnabled (false);
11.445 connect( a, SIGNAL( triggered() ), this, SLOT( editOpenVymLink() ) );
11.446 actionEditOpenVymLink=a;
11.447
11.448 - a = new QAction(QPixmap(), tr( "Open all vym links in subtree" ), this);
11.449 + a = new QAction(QPixmap(), tr( "Open all vym links in subtree","Edit menu" ), this);
11.450 a->setStatusTip ( tr( "Open all vym links in subtree" ));
11.451 a->setEnabled (false);
11.452 actionListBranches.append(a);
11.453 @@ -656,20 +659,20 @@
11.454 actionEditOpenMultipleVymLinks=a;
11.455
11.456
11.457 - a = new QAction(tr( "Edit vym link"+QString("...") ), this);
11.458 + a = new QAction(tr( "Edit vym link...","Edit menu" ), this);
11.459 a->setEnabled (false);
11.460 a->setStatusTip ( tr( "Edit link to another vym map" ));
11.461 connect( a, SIGNAL( triggered() ), this, SLOT( editVymLink() ) );
11.462 actionListBranches.append(a);
11.463 actionEditVymLink=a;
11.464
11.465 - a = new QAction(tr( "Delete vym link" ),this);
11.466 + a = new QAction(tr( "Delete vym link","Edit menu" ),this);
11.467 a->setStatusTip ( tr( "Delete link to another vym map" ));
11.468 a->setEnabled (false);
11.469 connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteVymLink() ) );
11.470 actionEditDeleteVymLink=a;
11.471
11.472 - a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports" ), this);
11.473 + a = new QAction(QPixmap(flagsPath+"flag-hideexport.png"), tr( "Hide in exports","Edit menu" ), this);
11.474 a->setStatusTip ( tr( "Hide object in exports" ) );
11.475 a->setShortcut (Qt::Key_H );
11.476 a->setToggleAction(true);
11.477 @@ -678,14 +681,14 @@
11.478 connect( a, SIGNAL( triggered() ), this, SLOT( editToggleHideExport() ) );
11.479 actionEditToggleHideExport=a;
11.480
11.481 - a = new QAction(tr( "Edit Map Info"+QString("...") ),this);
11.482 + a = new QAction(tr( "Edit Map Info...","Edit menu" ),this);
11.483 a->setStatusTip ( tr( "Edit Map Info" ));
11.484 a->setEnabled (true);
11.485 connect( a, SIGNAL( triggered() ), this, SLOT( editMapInfo() ) );
11.486 actionEditMapInfo=a;
11.487
11.488 // Import at selection (adding to selection)
11.489 - a = new QAction( tr( "Add map (insert)" ),this);
11.490 + a = new QAction( tr( "Add map (insert)","Edit menu" ),this);
11.491 a->setStatusTip (tr( "Add map at selection" ));
11.492 connect( a, SIGNAL( triggered() ), this, SLOT( editImportAdd() ) );
11.493 a->setEnabled (false);
11.494 @@ -693,7 +696,7 @@
11.495 actionEditImportAdd=a;
11.496
11.497 // Import at selection (replacing selection)
11.498 - a = new QAction( tr( "Add map (replace)" ), this);
11.499 + a = new QAction( tr( "Add map (replace)","Edit menu" ), this);
11.500 a->setStatusTip (tr( "Replace selection with map" ));
11.501 connect( a, SIGNAL( triggered() ), this, SLOT( editImportReplace() ) );
11.502 a->setEnabled (false);
11.503 @@ -701,7 +704,7 @@
11.504 actionEditImportReplace=a;
11.505
11.506 // Save selection
11.507 - a = new QAction( tr( "Save selection" ), this);
11.508 + a = new QAction( tr( "Save selection","Edit menu" ), this);
11.509 a->setStatusTip (tr( "Save selection" ));
11.510 connect( a, SIGNAL( triggered() ), this, SLOT( editSaveBranch() ) );
11.511 a->setEnabled (false);
11.512 @@ -709,50 +712,50 @@
11.513 actionEditSaveBranch=a;
11.514
11.515 // Only remove branch, not its childs
11.516 - a = new QAction(tr( "Remove only branch " ), this);
11.517 + a = new QAction(tr( "Remove only branch ","Edit menu" ), this);
11.518 a->setStatusTip ( tr( "Remove only branch and keep its childs" ));
11.519 a->setShortcut (Qt::ALT + Qt::Key_Delete );
11.520 - connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveBranchKeepChilds() ) );
11.521 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteKeepChilds() ) );
11.522 a->setEnabled (false);
11.523 addAction (a);
11.524 actionListBranches.append(a);
11.525 - actionEditRemoveBranchKeepChilds=a;
11.526 + actionEditDeleteKeepChilds=a;
11.527
11.528 // Only remove childs of a branch
11.529 - a = new QAction( tr( "Remove childs" ), this);
11.530 + a = new QAction( tr( "Remove childs","Edit menu" ), this);
11.531 a->setStatusTip (tr( "Remove childs of branch" ));
11.532 a->setShortcut (Qt::SHIFT + Qt::Key_Delete );
11.533 - connect( a, SIGNAL( triggered() ), this, SLOT( editRemoveChilds() ) );
11.534 + connect( a, SIGNAL( triggered() ), this, SLOT( editDeleteChilds() ) );
11.535 a->setEnabled (false);
11.536 actionListBranches.append(a);
11.537 - actionEditRemoveChilds=a;
11.538 + actionEditDeleteChilds=a;
11.539
11.540 // Shortcuts for navigating with cursor:
11.541 - a = new QAction(tr( "Select upper branch" ), this);
11.542 + a = new QAction(tr( "Select upper branch","Edit menu" ), this);
11.543 a->setStatusTip ( tr( "Select upper branch" ));
11.544 a->setShortcut (Qt::Key_Up );
11.545 a->setShortcutContext (Qt::WindowShortcut);
11.546 addAction (a);
11.547 connect( a, SIGNAL( triggered() ), this, SLOT( editUpperBranch() ) );
11.548 - a = new QAction( tr( "Select lower branch" ),this);
11.549 + a = new QAction( tr( "Select lower branch","Edit menu" ),this);
11.550 a->setStatusTip (tr( "Select lower branch" ));
11.551 a->setShortcut ( Qt::Key_Down );
11.552 a->setShortcutContext (Qt::WindowShortcut);
11.553 addAction (a);
11.554 connect( a, SIGNAL( triggered() ), this, SLOT( editLowerBranch() ) );
11.555 - a = new QAction(tr( "Select left branch" ), this);
11.556 + a = new QAction(tr( "Select left branch","Edit menu" ), this);
11.557 a->setStatusTip ( tr( "Select left branch" ));
11.558 a->setShortcut (Qt::Key_Left );
11.559 a->setShortcutContext (Qt::WindowShortcut);
11.560 addAction (a);
11.561 connect( a, SIGNAL( triggered() ), this, SLOT( editLeftBranch() ) );
11.562 - a = new QAction( tr( "Select child branch" ), this);
11.563 + a = new QAction( tr( "Select child branch","Edit menu" ), this);
11.564 a->setStatusTip (tr( "Select right branch" ));
11.565 a->setShortcut (Qt::Key_Right);
11.566 a->setShortcutContext (Qt::WindowShortcut);
11.567 addAction (a);
11.568 connect( a, SIGNAL( triggered() ), this, SLOT( editRightBranch() ) );
11.569 - a = new QAction( tr( "Select first branch" ), this);
11.570 + a = new QAction( tr( "Select first branch","Edit menu" ), this);
11.571 a->setStatusTip (tr( "Select first branch" ));
11.572 a->setShortcut (Qt::Key_Home );
11.573 a->setShortcutContext (Qt::WindowShortcut);
11.574 @@ -762,7 +765,7 @@
11.575 actionListBranches.append(a);
11.576 actionEditSelectFirst=a;
11.577 connect( a, SIGNAL( triggered() ), this, SLOT( editFirstBranch() ) );
11.578 - a = new QAction( tr( "Select last branch" ),this);
11.579 + a = new QAction( tr( "Select last branch","Edit menu" ),this);
11.580 a->setStatusTip (tr( "Select last branch" ));
11.581 a->setShortcut ( Qt::Key_End );
11.582 a->setShortcutContext (Qt::WindowShortcut);
11.583 @@ -773,7 +776,7 @@
11.584 actionListBranches.append(a);
11.585 actionEditSelectLast=a;
11.586
11.587 - a = new QAction( tr( "Add Image" )+QString("..."), this);
11.588 + a = new QAction( tr( "Add Image...","Edit menu" ), this);
11.589 a->setStatusTip (tr( "Add Image" ));
11.590 connect( a, SIGNAL( triggered() ), this, SLOT( editLoadImage() ) );
11.591 actionEditLoadImage=a;
11.592 @@ -783,9 +786,9 @@
11.593 // Format Actions
11.594 void Main::setupFormatActions()
11.595 {
11.596 - QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat"));
11.597 -
11.598 - QToolBar *tb = addToolBar( tr("Format Actions","Toolbars"));
11.599 + QMenu *formatMenu = menuBar()->addMenu (tr ("F&ormat","Format menu"));
11.600 +
11.601 + QToolBar *tb = addToolBar( tr("Format Actions","Format Toolbar name"));
11.602 tb->setObjectName ("formatTB");
11.603 QAction *a;
11.604 QPixmap pix( 16,16);
11.605 @@ -796,7 +799,7 @@
11.606 a->addTo( tb );
11.607 formatMenu->addAction (a);
11.608 actionFormatColor=a;
11.609 - a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color" ), this);
11.610 + a= new QAction( QPixmap(iconPath+"formatcolorpicker.png"), tr( "Pic&k color","Edit menu" ), this);
11.611 a->setStatusTip (tr( "Pick color\nHint: You can pick a color from another branch and color using CTRL+Left Button" ) );
11.612 a->setShortcut (Qt::CTRL + Qt::Key_K );
11.613 connect( a, SIGNAL( triggered() ), this, SLOT( formatPickColor() ) );
11.614 @@ -806,7 +809,7 @@
11.615 actionListBranches.append(a);
11.616 actionFormatPickColor=a;
11.617
11.618 - a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch" ), this);
11.619 + a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch","Edit menu" ), this);
11.620 a->setStatusTip ( tr( "Color branch" ) );
11.621 a->setShortcut (Qt::CTRL + Qt::Key_I);
11.622 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) );
11.623 @@ -816,7 +819,7 @@
11.624 actionListBranches.append(a);
11.625 actionFormatColorBranch=a;
11.626
11.627 - a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree" ), this);
11.628 + a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree","Edit menu" ), this);
11.629 a->setStatusTip ( tr( "Color Subtree" ));
11.630 a->setShortcut (Qt::CTRL + Qt::Key_T);
11.631 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
11.632 @@ -857,37 +860,37 @@
11.633
11.634 actionGroupFormatFrameTypes=new QActionGroup ( this);
11.635 actionGroupFormatFrameTypes->setExclusive (true);
11.636 - a = new QAction( tr( "No Frame" ), actionGroupFormatFrameTypes );
11.637 + a = new QAction( tr( "No Frame","Branch attribute" ), actionGroupFormatFrameTypes );
11.638 a->setStatusTip (tr("No Frame"));
11.639 a->setToggleAction(true);
11.640 connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameNone() ) );
11.641 actionFormatFrameNone=a;
11.642 - a = new QAction( tr( "Rectangle" ), actionGroupFormatFrameTypes);
11.643 + a = new QAction( tr( "Rectangle""Branch attribute" ), actionGroupFormatFrameTypes);
11.644 a->setStatusTip (tr( "Rectangle" ));
11.645 a->setToggleAction(true);
11.646 connect( a, SIGNAL( triggered() ), this, SLOT( formatFrameRectangle() ) );
11.647 actionFormatFrameRectangle=a;
11.648
11.649 - a = new QAction( tr( "Include images vertically" ), this);
11.650 + a = new QAction( tr( "Include images vertically","Branch attribute" ), this);
11.651 a->setStatusTip ( tr ("Include top and bottom position of images into branch"));
11.652 a->setToggleAction(true);
11.653 connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesVer() ) );
11.654 actionFormatIncludeImagesVer=a;
11.655
11.656 - a = new QAction( tr( "Include images horizontally" ), this);
11.657 + a = new QAction( tr( "Include images horizontally","Branch attribute" ), this);
11.658 a->setStatusTip ( tr ("Include left and right position of images into branch"));
11.659 a->setToggleAction(true);
11.660 connect( a, SIGNAL( triggered() ), this, SLOT( formatIncludeImagesHor() ) );
11.661 actionFormatIncludeImagesHor=a;
11.662
11.663 - a = new QAction( tr( "Hide link if object is not selected" ), this);
11.664 + a = new QAction( tr( "Hide link if object is not selected","Branch attribute" ), this);
11.665 a->setStatusTip (tr( "Hide link" ));
11.666 a->setToggleAction(true);
11.667 connect( a, SIGNAL( triggered() ), this, SLOT( formatHideLinkUnselected() ) );
11.668 actionFormatHideLinkUnselected=a;
11.669
11.670 formatMenu->addSeparator();
11.671 - a= new QAction( tr( "&Use color of heading for link" ), this);
11.672 + a= new QAction( tr( "&Use color of heading for link","Branch attribute" ), this);
11.673 a->setStatusTip (tr( "Use same color for links and headings" ));
11.674 a->setToggleAction(true);
11.675 connect( a, SIGNAL( triggered() ), this, SLOT( formatToggleLinkColorHint() ) );
11.676 @@ -911,27 +914,27 @@
11.677 // View Actions
11.678 void Main::setupViewActions()
11.679 {
11.680 - QToolBar *tb = addToolBar( tr("View Actions","Toolbars") );
11.681 + QToolBar *tb = addToolBar( tr("View Actions","View Toolbar name") );
11.682 tb->setLabel( "View Actions" );
11.683 tb->setObjectName ("viewTB");
11.684 QMenu *viewMenu = menuBar()->addMenu ( tr( "&View" ));
11.685
11.686 QAction *a;
11.687 - a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom" ), this);
11.688 + a = new QAction(QPixmap(iconPath+"viewmag-reset.png"), tr( "reset Zoom","View action" ), this);
11.689 a->setStatusTip ( tr( "Zoom reset" ) );
11.690 a->setShortcut (Qt::CTRL + Qt::Key_0 );
11.691 a->addTo( tb );
11.692 viewMenu->addAction (a);
11.693 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomReset() ) );
11.694
11.695 - a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in" ), this);
11.696 + a = new QAction( QPixmap(iconPath+"viewmag+.png"), tr( "Zoom in","View action" ), this);
11.697 a->setStatusTip (tr( "Zoom in" ));
11.698 a->setShortcut (Qt::CTRL + Qt::Key_Plus);
11.699 a->addTo( tb );
11.700 viewMenu->addAction (a);
11.701 connect( a, SIGNAL( triggered() ), this, SLOT(viewZoomIn() ) );
11.702
11.703 - a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out" ), this);
11.704 + a = new QAction( QPixmap(iconPath+"viewmag-.png"), tr( "Zoom out","View action" ), this);
11.705 a->setStatusTip (tr( "Zoom out" ));
11.706 a->setShortcut (Qt::CTRL + Qt::Key_Minus );
11.707 a->addTo( tb );
11.708 @@ -939,7 +942,7 @@
11.709 connect( a, SIGNAL( triggered() ), this, SLOT( viewZoomOut() ) );
11.710
11.711
11.712 - a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor" ),this);
11.713 + a = new QAction(QPixmap(flagsPath+"flag-note.png"), tr( "Show Note Editor","View action" ),this);
11.714 a->setStatusTip ( tr( "Show Note Editor" ));
11.715 a->setShortcut ( Qt::CTRL + Qt::Key_E );
11.716 a->setToggleAction(true);
11.717 @@ -952,7 +955,7 @@
11.718 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleNoteEditor() ) );
11.719 actionViewToggleNoteEditor=a;
11.720
11.721 - a = new QAction( tr( "Show history window" ),this );
11.722 + a = new QAction( tr( "Show history window","View action" ),this );
11.723 a->setStatusTip ( tr( "Show history window" ));
11.724 a->setShortcut ( Qt::CTRL + Qt::Key_H );
11.725 a->setToggleAction(false);
11.726 @@ -960,13 +963,13 @@
11.727 connect( a, SIGNAL( triggered() ), this, SLOT(windowToggleHistory() ) );
11.728 actionViewToggleHistoryWindow=a;
11.729
11.730 - a = new QAction(tr( "Next Window" ), this);
11.731 + a = new QAction(tr( "Next Window","View action" ), this);
11.732 a->setStatusTip ( tr( "&Next Window" ) );
11.733 a->setShortcut (Qt::ALT + Qt::Key_N );
11.734 viewMenu->addAction (a);
11.735 connect( a, SIGNAL( triggered() ), this, SLOT(windowNextEditor() ) );
11.736
11.737 - a = new QAction (tr( "Previous Window" ), this );
11.738 + a = new QAction (tr( "Previous Window","View action" ), this );
11.739 a->setStatusTip (tr( "&Previous Window" ));
11.740 a->setShortcut (Qt::ALT + Qt::Key_P );
11.741 viewMenu->addAction (a);
11.742 @@ -979,12 +982,12 @@
11.743 //QPopupMenu *menu = new QPopupMenu( this );
11.744 //menuBar()->insertItem( tr( "&Mode (using modifiers)" ), menu );
11.745
11.746 - QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Toolbars") );
11.747 + QToolBar *tb = addToolBar( tr ("Modes when using modifiers","Modifier Toolbar name") );
11.748 tb->setObjectName ("modesTB");
11.749 QAction *a;
11.750 actionGroupModModes=new QActionGroup ( this);
11.751 actionGroupModModes->setExclusive (true);
11.752 - a= new QAction( QPixmap(iconPath+"modecolor.png"), tr( "Use modifier to color branches" ), actionGroupModModes);
11.753 + a= new QAction( QPixmap(iconPath+"modecolor.png"), tr( "Use modifier to color branches","Mode modifier" ), actionGroupModModes);
11.754 a->setShortcut (Qt::Key_J);
11.755 a->setStatusTip ( tr( "Use modifier to color branches" ));
11.756 a->setToggleAction(true);
11.757 @@ -992,14 +995,14 @@
11.758 a->setOn(true);
11.759 actionModModeColor=a;
11.760
11.761 - a= new QAction( QPixmap(iconPath+"modecopy.png"), tr( "Use modifier to copy" ), actionGroupModModes );
11.762 + a= new QAction( QPixmap(iconPath+"modecopy.png"), tr( "Use modifier to copy","Mode modifier" ), actionGroupModModes );
11.763 a->setShortcut( Qt::Key_K);
11.764 a->setStatusTip( tr( "Use modifier to copy" ));
11.765 a->setToggleAction(true);
11.766 a->addTo (tb);
11.767 actionModModeCopy=a;
11.768
11.769 - a= new QAction(QPixmap(iconPath+"modelink.png"), tr( "Use modifier to draw xLinks" ), actionGroupModModes );
11.770 + a= new QAction(QPixmap(iconPath+"modelink.png"), tr( "Use modifier to draw xLinks","Mode modifier" ), actionGroupModModes );
11.771 a->setShortcut (Qt::Key_L);
11.772 a->setStatusTip( tr( "Use modifier to draw xLinks" ));
11.773 a->setToggleAction(true);
11.774 @@ -1333,39 +1336,39 @@
11.775
11.776 QAction *a;
11.777
11.778 - a = new QAction( tr( "Set application to open pdf files"), this);
11.779 + a = new QAction( tr( "Set application to open pdf files","Settings action"), this);
11.780 a->setStatusTip ( tr( "Set application to open pdf files"));
11.781 connect( a, SIGNAL( triggered() ), this, SLOT( settingsPDF() ) );
11.782 settingsMenu->addAction (a);
11.783
11.784 - a = new QAction( tr( "Set application to open external links"), this);
11.785 + a = new QAction( tr( "Set application to open external links","Settings action"), this);
11.786 a->setStatusTip( tr( "Set application to open external links"));
11.787 connect( a, SIGNAL( triggered() ), this, SLOT( settingsURL() ) );
11.788 settingsMenu->addAction (a);
11.789
11.790 settingsMenu->addSeparator();
11.791 - a = new QAction( tr( "Edit branch after adding it" ), this );
11.792 + a = new QAction( tr( "Edit branch after adding it","Settings action" ), this );
11.793 a->setStatusTip( tr( "Edit branch after adding it" ));
11.794 a->setToggleAction(true);
11.795 a->setOn ( settings.value ("/mapeditor/editmode/autoEdit",true).toBool());
11.796 settingsMenu->addAction (a);
11.797 actionSettingsAutoEdit=a;
11.798
11.799 - a= new QAction( tr( "Select branch after adding it" ), this );
11.800 + a= new QAction( tr( "Select branch after adding it","Settings action" ), this );
11.801 a->setStatusTip( tr( "Select branch after adding it" ));
11.802 a->setToggleAction(true);
11.803 a->setOn ( settings.value ("/mapeditor/editmode/autoSelectHeading",false).toBool() );
11.804 settingsMenu->addAction (a);
11.805 actionSettingsAutoSelectHeading=a;
11.806
11.807 - a= new QAction(tr( "Select existing heading" ), this);
11.808 + a= new QAction(tr( "Select existing heading","Settings action" ), this);
11.809 a->setStatusTip( tr( "Select heading before editing" ));
11.810 a->setToggleAction(true);
11.811 a->setOn ( settings.value ("/mapeditor/editmode/autoSelectText",true).toBool() );
11.812 settingsMenu->addAction (a);
11.813 actionSettingsAutoSelectText=a;
11.814
11.815 - a= new QAction( tr( "Delete key" ), this);
11.816 + a= new QAction( tr( "Delete key","Settings action" ), this);
11.817 a->setStatusTip( tr( "Delete key for deleting branches" ));
11.818 a->setToggleAction(true);
11.819 a->setOn ( settings.value ("/mapeditor/editmode/useDelKey",false).toBool() );
11.820 @@ -1373,14 +1376,14 @@
11.821 connect( a, SIGNAL( triggered() ), this, SLOT( settingsToggleDelKey() ) );
11.822 actionSettingsUseDelKey=a;
11.823
11.824 - a= new QAction( tr( "Exclusive flags" ), this);
11.825 + a= new QAction( tr( "Exclusive flags","Settings action" ), this);
11.826 a->setStatusTip( tr( "Use exclusive flags in flag toolbars" ));
11.827 a->setToggleAction(true);
11.828 a->setOn ( settings.value ("/mapeditor/editmode/useFlagGroups",true).toBool() );
11.829 settingsMenu->addAction (a);
11.830 actionSettingsUseFlagGroups=a;
11.831
11.832 - a= new QAction( tr( "Use hide flags" ), this);
11.833 + a= new QAction( tr( "Use hide flags","Settings action" ), this);
11.834 a->setStatusTip( tr( "Use hide flag during exports " ));
11.835 a->setToggleAction(true);
11.836 a->setOn ( settings.value ("/export/useHideExport",true).toBool() );
11.837 @@ -1394,13 +1397,13 @@
11.838 QMenu *testMenu = menuBar()->addMenu( tr( "&Test" ));
11.839
11.840 QAction *a;
11.841 - a = new QAction( tr( "Test function" ), this);
11.842 - a->setStatusTip( tr( "Call test function" ));
11.843 + a = new QAction( "Test function" , this);
11.844 + a->setStatusTip( "Call test function" );
11.845 a->setShortcut (Qt::Key_F4 );
11.846 connect( a, SIGNAL( triggered() ), this, SLOT( testFunction() ) );
11.847 testMenu->addAction (a);
11.848 - a = new QAction( tr( "Command" ), this);
11.849 - a->setStatusTip( tr( "Enter command to call in editor" ));
11.850 + a = new QAction( "Command" , this);
11.851 + a->setStatusTip( "Enter command to call in editor" );
11.852 a->setShortcut (Qt::Key_F5 );
11.853 connect( a, SIGNAL( triggered() ), this, SLOT( testCommand() ) );
11.854 testMenu->addAction (a);
11.855 @@ -1409,20 +1412,20 @@
11.856 // Help Actions
11.857 void Main::setupHelpActions()
11.858 {
11.859 - QMenu *helpMenu = menuBar()->addMenu ( tr( "&Help" ));
11.860 + QMenu *helpMenu = menuBar()->addMenu ( tr( "&Help","Help menubar entry" ));
11.861
11.862 QAction *a;
11.863 - a = new QAction( tr( "Open VYM Documentation (pdf) " ), this );
11.864 + a = new QAction( tr( "Open VYM Documentation (pdf) ","Help action" ), this );
11.865 a->setStatusTip( tr( "Open VYM Documentation (pdf)" ));
11.866 connect( a, SIGNAL( triggered() ), this, SLOT( helpDoc() ) );
11.867 helpMenu->addAction (a);
11.868
11.869 - a = new QAction( tr( "About VYM" ), this);
11.870 + a = new QAction( tr( "About VYM","Help action" ), this);
11.871 a->setStatusTip( tr( "About VYM")+" "__VYM);
11.872 connect( a, SIGNAL( triggered() ), this, SLOT( helpAbout() ) );
11.873 helpMenu->addAction (a);
11.874
11.875 - a = new QAction( tr( "About QT" ), this);
11.876 + a = new QAction( tr( "About QT","Help action" ), this);
11.877 a->setStatusTip( tr( "Information about QT toolkit" ));
11.878 connect( a, SIGNAL( triggered() ), this, SLOT( helpAboutQT() ) );
11.879 helpMenu->addAction (a);
11.880 @@ -1450,11 +1453,11 @@
11.881 branchAddContextMenu->addAction ( actionEditImportReplace );
11.882
11.883 // Submenu "Remove"
11.884 - branchRemoveContextMenu =branchContextMenu->addMenu (tr ("Remove"));
11.885 + branchRemoveContextMenu =branchContextMenu->addMenu (tr ("Remove","Context menu name"));
11.886 branchRemoveContextMenu->addAction (actionEditCut);
11.887 branchRemoveContextMenu->addAction ( actionEditDelete );
11.888 - branchRemoveContextMenu->addAction ( actionEditRemoveBranchKeepChilds );
11.889 - branchRemoveContextMenu->addAction ( actionEditRemoveChilds );
11.890 + branchRemoveContextMenu->addAction ( actionEditDeleteKeepChilds );
11.891 + branchRemoveContextMenu->addAction ( actionEditDeleteChilds );
11.892
11.893
11.894 actionEditSaveBranch->addTo( branchContextMenu );
11.895 @@ -1472,7 +1475,7 @@
11.896 branchLinksContextMenu =new QMenu (this);
11.897
11.898 branchContextMenu->addSeparator();
11.899 - branchLinksContextMenu=branchContextMenu->addMenu(tr("URLs and vymLinks"));
11.900 + branchLinksContextMenu=branchContextMenu->addMenu(tr("URLs and vymLinks","Context menu name"));
11.901 branchLinksContextMenu->addAction ( actionEditOpenURL );
11.902 branchLinksContextMenu->addAction ( actionEditOpenURLTab );
11.903 branchLinksContextMenu->addAction ( actionEditOpenMultipleURLTabs );
11.904 @@ -1493,15 +1496,15 @@
11.905 // Context Menu for XLinks in a branch menu
11.906 // This will be populated "on demand" in MapEditor::updateActions
11.907 branchContextMenu->addSeparator();
11.908 - branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink"));
11.909 - branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink"));
11.910 + branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
11.911 + branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
11.912 connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
11.913 connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
11.914
11.915
11.916 // Context menu for floatimage
11.917 floatimageContextMenu =new QMenu (this);
11.918 - a= new QAction (tr ("Save image"),this);
11.919 + a= new QAction (tr ("Save image","Context action"),this);
11.920 connect (a, SIGNAL (triggered()), this, SLOT (editSaveImage()));
11.921 floatimageContextMenu->addAction (a);
11.922
11.923 @@ -1583,7 +1586,7 @@
11.924 if (!eList.isEmpty())
11.925 {
11.926 QMessageBox mb( __VYM,
11.927 - tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?").arg(dir),
11.928 + tr("The directory %1 is not empty.\nDo you risk to overwrite its contents?","write directory").arg(dir),
11.929 QMessageBox::Warning,
11.930 QMessageBox::Yes ,
11.931 QMessageBox::Cancel | QMessageBox::Default,
11.932 @@ -2882,16 +2885,16 @@
11.933 fileSaveAs (PartOfMap);
11.934 }
11.935
11.936 -void Main::editRemoveBranchKeepChilds()
11.937 +void Main::editDeleteKeepChilds()
11.938 {
11.939 if (currentMapEditor())
11.940 - currentMapEditor()->removeBranchKeepChilds();
11.941 + currentMapEditor()->deleteKeepChilds();
11.942 }
11.943
11.944 -void Main::editRemoveChilds()
11.945 +void Main::editDeleteChilds()
11.946 {
11.947 if (currentMapEditor())
11.948 - currentMapEditor()->removeChilds();
11.949 + currentMapEditor()->deleteChilds();
11.950 }
11.951
11.952 void Main::editDeleteSelection()
11.953 @@ -2965,9 +2968,8 @@
11.954 {
11.955 if (currentMapEditor())
11.956 {
11.957 - QColor col = QColorDialog::getColor( currentMapEditor()->getColor(), this );
11.958 + QColor col = QColorDialog::getColor((currentColor ), this );
11.959 if ( !col.isValid() ) return;
11.960 - currentMapEditor()->setColor( col );
11.961 colorChanged( col );
11.962 }
11.963 }
11.964 @@ -2975,7 +2977,7 @@
11.965 void Main::formatPickColor()
11.966 {
11.967 if (currentMapEditor())
11.968 - colorChanged( currentMapEditor()->pickColor() );
11.969 + colorChanged( currentMapEditor()->getCurrentHeadingColor() );
11.970 }
11.971
11.972 void Main::colorChanged(QColor c)
11.973 @@ -2983,18 +2985,19 @@
11.974 QPixmap pix( 16, 16 );
11.975 pix.fill( c );
11.976 actionFormatColor->setIconSet( pix );
11.977 + currentColor=c;
11.978 }
11.979
11.980 void Main::formatColorItem()
11.981 {
11.982 if (currentMapEditor())
11.983 - currentMapEditor()->colorItem();
11.984 + currentMapEditor()->colorItem(currentColor);
11.985 }
11.986
11.987 void Main::formatColorBranch()
11.988 {
11.989 if (currentMapEditor())
11.990 - currentMapEditor()->colorBranch();
11.991 + currentMapEditor()->colorBranch(currentColor);
11.992 }
11.993
11.994 void Main::formatLinkStyleLine()
11.995 @@ -3412,6 +3415,7 @@
11.996 {
11.997 if (!currentMapEditor()) return;
11.998 currentMapEditor()->testFunction();
11.999 +
11.1000 }
11.1001
11.1002 void Main::testCommand()
11.1003 @@ -3425,38 +3429,45 @@
11.1004
11.1005 void Main::helpDoc()
11.1006 {
11.1007 - QString docpath;
11.1008 + QString locale = QLocale::system().name();
11.1009 + QString docname;
11.1010 + if (locale.left(2)=="es")
11.1011 + docname="vym_es.pdf";
11.1012 + else
11.1013 + docname="vym.pdf";
11.1014 + QDir docdir;
11.1015 #if defined(Q_OS_MACX)
11.1016 - docpath="./vym.app/Contents/vym.pdf";
11.1017 + docdir.setPath("./vym.app/Contents");
11.1018 #else
11.1019 // default path in SUSE LINUX
11.1020 - docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
11.1021 + docdir.setPath("/usr/share/doc/packages/vym/doc");
11.1022 #endif
11.1023
11.1024 - if (!QFile (docpath).exists() )
11.1025 + if (!docdir.exists() )
11.1026 {
11.1027 // relative path for easy testing in tarball
11.1028 - docpath="doc/vym.pdf";
11.1029 - if (!QFile (docpath).exists() )
11.1030 + docdir.setPath("doc");
11.1031 + if (!docdir.exists() )
11.1032 {
11.1033 // relative path for testing while still writing vym.tex
11.1034 - docpath="doc/tex/vym.pdf";
11.1035 - if (!QFile (docpath).exists() )
11.1036 + docdir.setPath("doc/tex/vym.pdf");
11.1037 + if (!docdir.exists() )
11.1038 {
11.1039 // Try yet another one for Knoppix
11.1040 - docpath="/usr/share/doc/packages/vym/vym.pdf";
11.1041 - if (!QFile (docpath).exists() )
11.1042 + docdir.setPath("/usr/share/doc/packages/vym");
11.1043 + if (!docdir.exists() )
11.1044 {
11.1045 QMessageBox::critical(0,
11.1046 tr("Critcal error"),
11.1047 tr("Couldn't find the documentation\n"
11.1048 - "vym.pdf in various places."));
11.1049 + "vym.pdf in various directories."));
11.1050 return;
11.1051 }
11.1052 }
11.1053 }
11.1054 }
11.1055
11.1056 + QString docpath=docdir.path()+"/"+docname;
11.1057 Process *pdfProc = new Process();
11.1058 pdfProc->clearArguments();
11.1059 pdfProc->addArgument( settings.value("/mainwindow/readerPDF").toString());
11.1060 @@ -3467,7 +3478,7 @@
11.1061 // error handling
11.1062 QMessageBox::warning(0,
11.1063 tr("Warning"),
11.1064 - tr("Couldn't find a viewer to open %1.\n").arg("vym.pdf")+
11.1065 + tr("Couldn't find a viewer to open %1.\n").arg(docpath)+
11.1066 tr("Please use Settings->")+tr("Set application to open PDF files"));
11.1067 settingsPDF();
11.1068 return;
12.1 --- a/mainwindow.h Tue Oct 24 15:36:38 2006 +0000
12.2 +++ b/mainwindow.h Mon Oct 30 12:39:37 2006 +0000
12.3 @@ -115,8 +115,8 @@
12.4 void editImportAdd();
12.5 void editImportReplace();
12.6 void editSaveBranch();
12.7 - void editRemoveBranchKeepChilds();
12.8 - void editRemoveChilds();
12.9 + void editDeleteKeepChilds();
12.10 + void editDeleteChilds();
12.11 void editDeleteSelection();
12.12 void editUpperBranch();
12.13 void editLowerBranch();
12.14 @@ -194,6 +194,8 @@
12.15
12.16 Q3PtrList <QAction> actionListBranches;
12.17
12.18 + QColor currentColor;
12.19 +
12.20 QAction* actionFileSave;
12.21 QAction* actionFilePrint;
12.22 QAction* actionEditUndo;
12.23 @@ -223,8 +225,8 @@
12.24 QAction *actionEditAddBranchBefore;
12.25 QAction *actionEditAddBranchAbove;
12.26 QAction *actionEditAddBranchBelow;
12.27 - QAction *actionEditRemoveBranchKeepChilds;
12.28 - QAction *actionEditRemoveChilds;
12.29 + QAction *actionEditDeleteKeepChilds;
12.30 + QAction *actionEditDeleteChilds;
12.31 QAction *actionEditImportAdd;
12.32 QAction *actionEditImportReplace;
12.33 QAction *actionEditSaveBranch;
13.1 --- a/mapcenterobj.cpp Tue Oct 24 15:36:38 2006 +0000
13.2 +++ b/mapcenterobj.cpp Mon Oct 30 12:39:37 2006 +0000
13.3 @@ -187,39 +187,6 @@
13.4 version=s;
13.5 }
13.6
13.7 -bool MapCenterObj::checkVersion ()
13.8 -{
13.9 - // returns true, if vym is able to read file regarding
13.10 - // the version set with setVersion
13.11 - QString s1=version.section (".",0,0);
13.12 - QString s2=version.section (".",1,1);
13.13 - QString s3=version.section (".",2,2);
13.14 - bool ok;
13.15 - int vv1 =QString(__VYM_VERSION).section (".",0,0).toInt(&ok,10);
13.16 - int vv2 =QString(__VYM_VERSION).section (".",1,1).toInt(&ok,10);
13.17 - int vv3 =QString(__VYM_VERSION).section (".",2,2).toInt(&ok,10);
13.18 - int mv1=0;
13.19 - int mv2=0;
13.20 - int mv3=0;
13.21 - if (!s1.isEmpty() ) mv1=s1.toInt(&ok,10);
13.22 - if (!s2.isEmpty() ) mv2=s2.toInt(&ok,10);
13.23 - if (!s3.isEmpty() ) mv3=s3.toInt(&ok,10);
13.24 -
13.25 - if (vv1 > mv1)
13.26 - return true;
13.27 - if (vv1 < mv1)
13.28 - return false;
13.29 - if (vv2 > mv2)
13.30 - return true;
13.31 - if (vv2 < mv2)
13.32 - return false;
13.33 - if (vv3 > mv3)
13.34 - return true;
13.35 - if (vv3 < mv3)
13.36 - return false;
13.37 - return true;
13.38 -}
13.39 -
13.40 void MapCenterObj::setAuthor (const QString &s)
13.41 {
13.42 author=s;
14.1 --- a/mapcenterobj.h Tue Oct 24 15:36:38 2006 +0000
14.2 +++ b/mapcenterobj.h Mon Oct 30 12:39:37 2006 +0000
14.3 @@ -25,7 +25,6 @@
14.4 LinkableMapObj* findMapObj(QPoint,LinkableMapObj*); // find MapObj
14.5 virtual QString saveToDir (const QString&,const QString&,int, const QPoint&);// Save data recursivly to tempdir
14.6 void setVersion(const QString &);
14.7 - bool checkVersion(); // check if program version is higher than saved version
14.8 void setAuthor (const QString &);
14.9 QString getAuthor ();
14.10 void setComment (const QString &);
15.1 --- a/mapeditor.cpp Tue Oct 24 15:36:38 2006 +0000
15.2 +++ b/mapeditor.cpp Mon Oct 30 12:39:37 2006 +0000
15.3 @@ -85,7 +85,6 @@
15.4
15.5 printer=NULL;
15.6
15.7 - actColor=Qt::black; setColor (actColor);
15.8 defLinkColor=QColor (0,0,255);
15.9 defXLinkColor=QColor (180,180,180);
15.10 linkcolorhint=DefaultColor;
15.11 @@ -163,11 +162,6 @@
15.12 //cout <<"Destructor MapEditor\n";
15.13 }
15.14
15.15 -QColor MapEditor::getColor()
15.16 -{
15.17 - return actColor;
15.18 -}
15.19 -
15.20 QColor MapEditor::getBackgroundColor()
15.21 {
15.22 return mapCanvas->backgroundColor();
15.23 @@ -372,15 +366,24 @@
15.24 mapCenter);
15.25 }
15.26
15.27 -void MapEditor::saveStateChangingPart(LinkableMapObj *undoSel, const QString &comment)
15.28 +void MapEditor::saveStateChangingPart(LinkableMapObj *undoSel, LinkableMapObj* redoSel, const QString &rc, const QString &comment)
15.29 {
15.30 // save the selected part of the map, Undo will replace part of map
15.31 QString undoSelection="";
15.32 - if (undoSel) undoSelection=undoSel->getSelectString();
15.33 + if (undoSel)
15.34 + undoSelection=undoSel->getSelectString();
15.35 + else
15.36 + qWarning ("MapEditor::saveStateChangingPart no undoSel given!");
15.37 + QString redoSelection="";
15.38 + if (redoSel)
15.39 + redoSelection=undoSel->getSelectString();
15.40 + else
15.41 + qWarning ("MapEditor::saveStateChangingPart no redoSel given!");
15.42 +
15.43
15.44 saveState (PartOfMap,
15.45 undoSelection, "",
15.46 - "", "",
15.47 + redoSelection, rc,
15.48 comment,
15.49 undoSel);
15.50 }
15.51 @@ -407,8 +410,6 @@
15.52 // save the selected mainbranch of the map, Undo will insert part of map
15.53 saveState (PartOfMap,
15.54 undoSelection, QString("addMapInsert (\"PATH\",%1)").arg(((BranchObj*)redoSel)->getNum()),
15.55 -// undoSelection, QString("addMapInsert (\"PATH\",%1,%2)").arg(((BranchObj*)redoSel)->getNum())
15.56 -// .arg(((BranchObj*)redoSel)->x()).arg(((BranchObj*)redoSel)->y()),
15.57 redoSelection, "delete ()",
15.58 comment,
15.59 redoSel);
15.60 @@ -416,21 +417,6 @@
15.61 }
15.62 }
15.63
15.64 -void MapEditor::saveStateConstSelection(const QString &uc, const QString &rc, const QString &comment)
15.65 -{
15.66 - // selection does not change during action,
15.67 - // so just save commands for undo and redo
15.68 - // and use current selection
15.69 -
15.70 - QString sel;
15.71 - if (selection) sel=selection->getSelectString();
15.72 -
15.73 - saveState (UndoCommand,
15.74 - sel, uc,
15.75 - sel, rc,
15.76 - comment,
15.77 - NULL);
15.78 -}
15.79
15.80 void MapEditor::saveState(LinkableMapObj *undoSel, const QString &uc, LinkableMapObj *redoSel, const QString &rc, const QString &comment)
15.81 {
15.82 @@ -473,8 +459,6 @@
15.83 */
15.84 cout << "ME::saveState() "<<endl;
15.85
15.86 - setChanged();
15.87 -
15.88 int undosAvail=undoSet.readNumEntry ("/history/undosAvail",0);
15.89 int redosAvail=undoSet.readNumEntry ("/history/redosAvail",0);
15.90 int curStep=undoSet.readNumEntry ("/history/curStep",0);
15.91 @@ -529,6 +513,7 @@
15.92 undoSet.setEntry (QString("/history/step-%1/redoCommand").arg(curStep),redoCom);
15.93 undoSet.setEntry (QString("/history/step-%1/redoSelection").arg(curStep),redoSelection);
15.94 undoSet.setEntry (QString("/history/step-%1/comment").arg(curStep),comment);
15.95 + undoSet.setEntry (QString("/history/version"),__VYM_VERSION);
15.96 undoSet.writeSettings(histPath);
15.97
15.98 /* TODO remove after testing
15.99 @@ -547,6 +532,8 @@
15.100 cout << " ---------------------------"<<endl;
15.101
15.102 historyWindow.update (undoSet);
15.103 + setChanged();
15.104 + updateActions();
15.105 }
15.106
15.107 void MapEditor::parseAtom(const QString &atom)
15.108 @@ -554,7 +541,7 @@
15.109 API api;
15.110 QString s,t;
15.111 int x,y;
15.112 - bool ok;
15.113 + bool b,ok;
15.114
15.115 // Split string s into command and parameters
15.116 api.parseInput (atom);
15.117 @@ -636,6 +623,48 @@
15.118 addMapInsertInt(t,y);
15.119 }
15.120 }
15.121 + } else if (com=="colorItem")
15.122 + {
15.123 + if (!selection)
15.124 + {
15.125 + api.setError (Aborted,"Nothing selected");
15.126 + } else if ( typeid(*selection) != typeid(BranchObj) &&
15.127 + typeid(*selection) != typeid(MapCenterObj))
15.128 + {
15.129 + api.setError (Aborted,"Type of selection is not a branch");
15.130 + } else if (api.checkParamCount(1))
15.131 + {
15.132 + QColor c=api.parColor (ok,0);
15.133 + if (ok) colorItem (c);
15.134 + }
15.135 + } else if (com=="colorBranch")
15.136 + {
15.137 + if (!selection)
15.138 + {
15.139 + api.setError (Aborted,"Nothing selected");
15.140 + } else if ( typeid(*selection) != typeid(BranchObj) &&
15.141 + typeid(*selection) != typeid(MapCenterObj))
15.142 + {
15.143 + api.setError (Aborted,"Type of selection is not a branch");
15.144 + } else if (api.checkParamCount(1))
15.145 + {
15.146 + QColor c=api.parColor (ok,0);
15.147 + if (ok) colorBranch (c);
15.148 + }
15.149 + } else if (com=="cut")
15.150 + {
15.151 + if (!selection)
15.152 + {
15.153 + api.setError (Aborted,"Nothing selected");
15.154 + } else if ( typeid(*selection) != typeid(BranchObj) &&
15.155 + typeid(*selection) != typeid(MapCenterObj) &&
15.156 + typeid(*selection) != typeid(FloatImageObj) )
15.157 + {
15.158 + api.setError (Aborted,"Type of selection is not a branch or floatimage");
15.159 + } else if (api.checkParamCount(0))
15.160 + {
15.161 + cut();
15.162 + }
15.163 } else if (com=="delete")
15.164 {
15.165 if (!selection)
15.166 @@ -660,7 +689,20 @@
15.167 api.setError (Aborted,"Type of selection is not a branch");
15.168 } else if (api.checkParamCount(0))
15.169 {
15.170 - removeBranchKeepChilds();
15.171 + deleteKeepChilds();
15.172 + }
15.173 + } else if (com=="deleteChilds")
15.174 + {
15.175 + if (!selection)
15.176 + {
15.177 + api.setError (Aborted,"Nothing selected");
15.178 + } else if ( (typeid(*selection) != typeid(BranchObj) &&
15.179 + typeid(*selection) != typeid(MapCenterObj)) )
15.180 + {
15.181 + api.setError (Aborted,"Type of selection is not a branch");
15.182 + } else if (api.checkParamCount(0))
15.183 + {
15.184 + deleteChilds();
15.185 }
15.186 } else if (com=="linkBranchToPos")
15.187 {
15.188 @@ -744,8 +786,7 @@
15.189 if (ok) move (x,y);
15.190 }
15.191 }
15.192 - }
15.193 - else if (com=="moveRel")
15.194 + } else if (com=="moveRel")
15.195 {
15.196 if (!selection)
15.197 {
15.198 @@ -764,6 +805,19 @@
15.199 if (ok) moveRel (x,y);
15.200 }
15.201 }
15.202 + } else if (com=="paste")
15.203 + {
15.204 + if (!selection)
15.205 + {
15.206 + api.setError (Aborted,"Nothing selected");
15.207 + } else if ( typeid(*selection) != typeid(BranchObj) &&
15.208 + typeid(*selection) != typeid(MapCenterObj) )
15.209 + {
15.210 + api.setError (Aborted,"Type of selection is not a branch");
15.211 + } else if (api.checkParamCount(0))
15.212 + {
15.213 + paste();
15.214 + }
15.215 } else if (com=="setHeading")
15.216 {
15.217 if (!selection)
15.218 @@ -779,6 +833,20 @@
15.219 if (ok)
15.220 setHeading (s);
15.221 }
15.222 + } else if (com=="setHideExport")
15.223 + {
15.224 + if (!selection)
15.225 + {
15.226 + api.setError (Aborted,"Nothing selected");
15.227 + } else if ( typeid(*selection) != typeid(BranchObj) &&
15.228 + typeid(*selection) != typeid(FloatImageObj) )
15.229 + {
15.230 + api.setError (Aborted,"Type of selection is not a branch or floatimage");
15.231 + } else if (api.checkParamCount(1))
15.232 + {
15.233 + b=api.parBool(ok,0);
15.234 + if (ok) setHideExport (b);
15.235 + }
15.236 } else if (com=="setURL")
15.237 {
15.238 if (!selection)
15.239 @@ -808,27 +876,6 @@
15.240 if (ok) setVymLinkInt(s);
15.241 }
15.242 }
15.243 - else if (com=="setHideExport")
15.244 - {
15.245 - if (!selection)
15.246 - {
15.247 - api.setError (Aborted,"Nothing selected");
15.248 - } else if ( typeid(*selection) != typeid(BranchObj) &&
15.249 - typeid(*selection) != typeid(MapCenterObj) &&
15.250 - typeid(*selection) != typeid(FloatImageObj) )
15.251 - {
15.252 - api.setError (Aborted,"Type of selection is not a branch or floatimage");
15.253 - } else if (api.checkParamCount(2))
15.254 - {
15.255 - s=api.parString(ok,0);
15.256 - if (ok)
15.257 - {
15.258 - BranchObj* bo=(BranchObj*)selection;
15.259 - bo->activateStandardFlag(s);
15.260 - bo->updateFlagsToolbar();
15.261 - }
15.262 - }
15.263 - }
15.264 else if (com=="setFlag")
15.265 {
15.266 if (!selection)
15.267 @@ -1007,7 +1054,22 @@
15.268 // (map state is set later at end of load...)
15.269 } else
15.270 {
15.271 - saveStateChangingPart(selection,"Load map");
15.272 + if (!selection || (typeid(*selection) != typeid(BranchObj) &&
15.273 + typeid(*selection) != typeid (MapCenterObj)))
15.274 + return aborted;
15.275 + BranchObj *bo=(BranchObj*)selection;
15.276 + if (lmode==ImportAdd)
15.277 + saveStateChangingPart(
15.278 + selection,
15.279 + selection,
15.280 + QString("addMapInsert (%1)").arg(fname),
15.281 + QString("Add map %1 to %2").arg(fname).arg(getName(bo)));
15.282 + else
15.283 + saveStateChangingPart(
15.284 + selection,
15.285 + selection,
15.286 + QString("addMapReplace(%1)").arg(fname),
15.287 + QString("Add map %1 to %2").arg(fname).arg(getName(bo)));
15.288 }
15.289
15.290
15.291 @@ -1412,6 +1474,12 @@
15.292 QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
15.293 QString redoSelection=undoSet.readEntry (QString("/history/step-%1/redoSelection").arg(curStep));
15.294 QString comment=undoSet.readEntry (QString("/history/step-%1/comment").arg(curStep));
15.295 + QString version=undoSet.readEntry ("/history/version");
15.296 +
15.297 + if (!checkVersion(version))
15.298 + QMessageBox::warning(0,tr("Warning"),
15.299 + tr("Version %1 of saved undo/redo data\ndoes not match current vym version %2.").arg(version).arg(__VYM_VERSION));
15.300 +
15.301
15.302 // Find out current undo directory
15.303 QString bakMapDir=QDir::convertSeparators (QString(tmpMapDir+"/undo-%1").arg(curStep));
15.304 @@ -1485,6 +1553,11 @@
15.305 QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
15.306 QString redoSelection=undoSet.readEntry (QString("/history/step-%1/redoSelection").arg(curStep));
15.307 QString comment=undoSet.readEntry (QString("/history/step-%1/comment").arg(curStep));
15.308 + QString version=undoSet.readEntry ("/history/version");
15.309 +
15.310 + if (!checkVersion(version))
15.311 + QMessageBox::warning(0,tr("Warning"),
15.312 + tr("Version %1 of saved undo/redo data\ndoes not match current vym version %2.").arg(version).arg(__VYM_VERSION));
15.313
15.314 // Find out current undo directory
15.315 QString bakMapDir=QDir::convertSeparators (QString(tmpMapDir+"/undo-%1").arg(curStep));
15.316 @@ -1655,8 +1728,13 @@
15.317 if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.318 typeid(*selection) == typeid(MapCenterObj)))
15.319 {
15.320 - saveStateChangingPart(selection,QString("Paste to %1").arg( getName(selection)));
15.321 pasteNoSave();
15.322 + saveStateChangingPart(
15.323 + selection,
15.324 + selection,
15.325 + "paste ()",
15.326 + QString("Paste to %1").arg( getName(selection))
15.327 + );
15.328 mapCenter->reposition();
15.329 adjustCanvasSize();
15.330 }
15.331 @@ -1664,7 +1742,12 @@
15.332
15.333 void MapEditor::cut()
15.334 {
15.335 - saveStateChangingPart(selection->getParObj(),QString("Cut %1").arg(getName(selection)));
15.336 + saveStateChangingPart(
15.337 + selection->getParObj(),
15.338 + selection,
15.339 + "cut ()",
15.340 + QString("Cut %1").arg(getName(selection))
15.341 + );
15.342 copy();
15.343 cutNoSave();
15.344 mapCenter->reposition();
15.345 @@ -1766,8 +1849,10 @@
15.346 typeid(*selection) == typeid(MapCenterObj) ) )
15.347 {
15.348 editingBO=(BranchObj*)selection;
15.349 - saveStateConstSelection(
15.350 + saveState(
15.351 + selection,
15.352 "setHeading (\""+editingBO->getHeading()+"\")",
15.353 + selection,
15.354 "setHeading (\""+s+"\")",
15.355 QString("Set heading of %1 to \"%2\"").arg(getName(editingBO)).arg(s) );
15.356 editingBO->setHeading(s );
15.357 @@ -1870,11 +1955,12 @@
15.358
15.359 if (newbo)
15.360 {
15.361 - saveStateConstSelection (
15.362 - //QString ("delete (\"%1\")").arg(newbo->getSelectString()),
15.363 + saveState(
15.364 + selection, // FIXME sholdnt newbo be deleted here???
15.365 "delete ()",
15.366 + selection,
15.367 QString ("addBranch (%1)").arg(pos-2),
15.368 - QString ("Add new branch to %1").arg(getName(bo))); //TODO undoCommand
15.369 + QString ("Add new branch to %1").arg(getName(bo)));
15.370
15.371 mapCenter->reposition();
15.372 adjustCanvasSize();
15.373 @@ -1936,7 +2022,12 @@
15.374 {
15.375 FloatImageObj* fio=(FloatImageObj*)selection;
15.376 BranchObj* par=(BranchObj*)(fio->getParObj());
15.377 - saveStateChangingPart(par, QString("Delete %1").arg(getName(fio)));
15.378 + saveStateChangingPart(
15.379 + par,
15.380 + fio,
15.381 + "delete ()",
15.382 + QString("Delete %1").arg(getName(fio))
15.383 + );
15.384 fio->unselect();
15.385 selection=NULL;
15.386 par->removeFloatImage(fio);
15.387 @@ -2363,11 +2454,6 @@
15.388 }
15.389 }
15.390
15.391 -void MapEditor::setColor(QColor c)
15.392 -{
15.393 - actColor=c;
15.394 -}
15.395 -
15.396 void MapEditor::selectBackgroundColor()
15.397 {
15.398 QColor col = QColorDialog::getColor( mapCanvas->backgroundColor(), this );
15.399 @@ -2382,7 +2468,7 @@
15.400 mapCanvas->setBackgroundColor (c);
15.401 }
15.402
15.403 -QColor MapEditor::pickColor()
15.404 +QColor MapEditor::getCurrentHeadingColor()
15.405 {
15.406 if (selection)
15.407 {
15.408 @@ -2390,13 +2476,15 @@
15.409 typeid(*selection) == typeid(MapCenterObj))
15.410 {
15.411 BranchObj *bo=(BranchObj*)selection;
15.412 - actColor=bo->getColor();
15.413 + return bo->getColor();
15.414 }
15.415 }
15.416 - return actColor;
15.417 +
15.418 + QMessageBox::warning(0,tr("Warning"),tr("Can't get color of heading,\nthere's no branch selected"));
15.419 + return Qt::black;
15.420 }
15.421
15.422 -void MapEditor::colorItem()
15.423 +void MapEditor::colorItem(QColor c)
15.424 {
15.425 if (selection)
15.426 {
15.427 @@ -2404,13 +2492,18 @@
15.428 typeid(*selection) == typeid(MapCenterObj))
15.429 {
15.430 BranchObj *bo=(BranchObj*)selection;
15.431 - saveStateChangingPart(selection, QString("Set color of %1 to %2").arg(getName(bo)).arg(actColor.name())); //TODO undoCommand
15.432 - bo->setColor(actColor); // color branch
15.433 + saveStateChangingPart(
15.434 + selection,
15.435 + selection,
15.436 + QString ("colorItem (%1)").arg(c.name()),
15.437 + QString("Set color of %1 to %2").arg(getName(bo)).arg(c.name())
15.438 + ); //TODO with complete API: undoCommand
15.439 + bo->setColor(c); // color branch
15.440 }
15.441 }
15.442 }
15.443
15.444 -void MapEditor::colorBranch()
15.445 +void MapEditor::colorBranch(QColor c)
15.446 {
15.447 if (selection)
15.448 {
15.449 @@ -2418,8 +2511,13 @@
15.450 typeid(*selection) == typeid(MapCenterObj))
15.451 {
15.452 BranchObj *bo=(BranchObj*)selection;
15.453 - saveStateChangingPart(selection, QString ("Set color of %1 and childs to %2").arg(getName(bo)).arg(actColor.name())); //TODO undoCommand
15.454 - bo->setColorChilds(actColor); // color links, color childs
15.455 + saveStateChangingPart(
15.456 + selection,
15.457 + selection,
15.458 + QString ("colorBranch (%1)").arg(c.name()),
15.459 + QString ("Set color of %1 and childs to %2").arg(getName(bo)).arg(c.name())
15.460 + );
15.461 + bo->setColorChilds(c); // color links, color childs
15.462 }
15.463 }
15.464 }
15.465 @@ -2444,7 +2542,10 @@
15.466 u="unsetFlag";
15.467 r="setFlag";
15.468 }
15.469 - saveStateConstSelection(QString("%1 (\"%2\")").arg(u).arg(f),
15.470 + saveState(
15.471 + selection,
15.472 + QString("%1 (\"%2\")").arg(u).arg(f),
15.473 + selection,
15.474 QString("%1 (\"%2\")").arg(r).arg(f),
15.475 QString("Toggling standard flag \"%1\" of %2").arg(f).arg(getName(bo)));
15.476 bo->toggleStandardFlag (f,mainWindow->useFlagGroups());
15.477 @@ -2526,6 +2627,24 @@
15.478 itFind=NULL;
15.479 EOFind=false;
15.480 }
15.481 +void MapEditor::setURL(const QString &url)
15.482 +{
15.483 + if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.484 + typeid(*selection) == typeid(MapCenterObj)) )
15.485 + {
15.486 + BranchObj *bo=(BranchObj*)selection;
15.487 + QString oldurl=bo->getURL();
15.488 + bo->setURL (url);
15.489 + saveState (
15.490 + selection,
15.491 + QString ("setURL (\"%1\")").arg(oldurl),
15.492 + selection,
15.493 + QString ("setURL (\"%1\")").arg(url),
15.494 + QString ("set URL of %1 to %2").arg(getName(bo)).arg(url)
15.495 + );
15.496 + updateActions();
15.497 + }
15.498 +}
15.499
15.500 void MapEditor::editURL()
15.501 {
15.502 @@ -2538,12 +2657,8 @@
15.503 "VYM", tr("Enter URL:"), QLineEdit::Normal,
15.504 bo->getURL(), &ok, this );
15.505 if ( ok)
15.506 - {
15.507 // user entered something and pressed OK
15.508 - saveStateConstSelection("setURL (\""+bo->getURL()+"\")","setURL (\""+text+"\")", QString("Set URL of %1 to %21").arg(getName(bo)).arg(text));
15.509 - bo->setURL (text);
15.510 - updateActions();
15.511 - }
15.512 + setURL (text);
15.513 }
15.514 }
15.515
15.516 @@ -2578,12 +2693,7 @@
15.517 {
15.518 if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.519 typeid(*selection) == typeid(MapCenterObj)) )
15.520 - {
15.521 - BranchObj *bo=(BranchObj*)selection;
15.522 - saveStateConstSelection("setURL (\""+bo->getURL()+"\")","setURL (\""+bo->getHeading()+"\")",QString("Copy heading of %1 to URL").arg(getName(bo)));
15.523 - bo->setURL (bo->getHeading());
15.524 - updateActions();
15.525 - }
15.526 + setURL (((BranchObj*)selection)->getHeading());
15.527 }
15.528
15.529 void MapEditor::editBugzilla2URL()
15.530 @@ -2593,9 +2703,7 @@
15.531 {
15.532 BranchObj *bo=(BranchObj*)selection;
15.533 QString url= "https://bugzilla.novell.com/show_bug.cgi?id="+bo->getHeading();
15.534 - saveStateConstSelection("setURL (\""+bo->getURL()+"\")","setURL (\""+url+"\")",QString("Use heading of %1 as link to Novell Bugzilla").arg(getName(bo)));
15.535 - bo->setURL (url);
15.536 - updateActions();
15.537 + setURL (url);
15.538 }
15.539 }
15.540
15.541 @@ -2606,7 +2714,13 @@
15.542 {
15.543 BranchObj *bo=(BranchObj*)selection;
15.544 QString url= "http://keeper.suse.de:8080/webfate/match/id?value=ID"+bo->getHeading();
15.545 - saveStateConstSelection("setURL (\""+bo->getURL()+"\")","setURL (\""+url+"\")",QString("Use heading of %1 as link to FATE").arg(getName(bo)));
15.546 + saveState(
15.547 + selection,
15.548 + "setURL (\""+bo->getURL()+"\")",
15.549 + selection,
15.550 + "setURL (\""+url+"\")",
15.551 + QString("Use heading of %1 as link to FATE").arg(getName(bo))
15.552 + );
15.553 bo->setURL (url);
15.554 updateActions();
15.555 }
15.556 @@ -2628,7 +2742,13 @@
15.557 QString fn;
15.558 if ( fd->exec() == QDialog::Accepted )
15.559 {
15.560 - saveStateConstSelection("setVymLink (\""+bo->getVymLink()+"\")","setVymLink (\""+fd->selectedFile()+"\")",QString("Set vymlink of %1 to %2").arg(getName(bo)).arg(fd->selectedFile()));
15.561 + saveState(
15.562 + selection,
15.563 + "setVymLink (\""+bo->getVymLink()+"\")",
15.564 + selection,
15.565 + "setVymLink (\""+fd->selectedFile()+"\")",
15.566 + QString("Set vymlink of %1 to %2").arg(getName(bo)).arg(fd->selectedFile())
15.567 + );
15.568 bo->setVymLink (fd->selectedFile() );
15.569 updateActions();
15.570 mapCenter->reposition();
15.571 @@ -2644,7 +2764,13 @@
15.572 typeid(*selection) == typeid(MapCenterObj)) )
15.573 {
15.574 BranchObj *bo=(BranchObj*)selection;
15.575 - saveStateConstSelection("setVymLink (\""+bo->getVymLink()+"\")","setVymLink (\"\")",QString("Unset vymlink of %1").arg(getName(bo)));
15.576 + saveState(
15.577 + selection,
15.578 + "setVymLink (\""+bo->getVymLink()+"\")",
15.579 + selection,
15.580 + "setVymLink (\"\")",
15.581 + QString("Unset vymlink of %1").arg(getName(bo))
15.582 + );
15.583 bo->setVymLink ("" );
15.584 updateActions();
15.585 mapCenter->reposition();
15.586 @@ -2653,26 +2779,23 @@
15.587 }
15.588 }
15.589
15.590 -void MapEditor::toggleHideExport()
15.591 +void MapEditor::setHideExport(bool b)
15.592 {
15.593 if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.594 - typeid(*selection) == typeid(MapCenterObj)) ||
15.595 - (typeid(*selection)==typeid(FloatImageObj))
15.596 - )
15.597 - {
15.598 + typeid(*selection)==typeid(FloatImageObj)))
15.599 + {
15.600 OrnamentedObj *oo=(OrnamentedObj*)selection;
15.601 - QString s;
15.602 - if (oo->hideInExport())
15.603 - {
15.604 - oo->setHideInExport(false);
15.605 - s="Unset";
15.606 - }
15.607 - else
15.608 - {
15.609 - oo->setHideInExport(true);
15.610 - s="Set";
15.611 - }
15.612 - saveStateComplete(QString ("%1 hide export flag of %2").arg(s).arg(getName(selection))); //TODO undoCommand
15.613 + oo->setHideInExport (b);
15.614 + QString u= b ? "false" : "true";
15.615 + QString r=!b ? "false" : "true";
15.616 +
15.617 + saveState(
15.618 + selection,
15.619 + QString ("setHideExport (%1)").arg(u),
15.620 + selection,
15.621 + QString ("setHideExport (%1)").arg(r),
15.622 + QString ("Set HideExport flag of %1 to %2").arg(getName(oo)).arg (r)
15.623 + );
15.624 updateActions();
15.625 mapCenter->reposition();
15.626 adjustCanvasSize();
15.627 @@ -2680,6 +2803,13 @@
15.628 }
15.629 }
15.630
15.631 +void MapEditor::toggleHideExport()
15.632 +{
15.633 + if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.634 + typeid(*selection)==typeid(FloatImageObj)))
15.635 + setHideExport ( !((OrnamentedObj*)selection)->hideInExport() );
15.636 +}
15.637 +
15.638 QString MapEditor::getVymLink()
15.639 {
15.640 if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.641 @@ -2709,18 +2839,19 @@
15.642 }
15.643
15.644
15.645 -void MapEditor::removeBranchKeepChilds()
15.646 +void MapEditor::deleteKeepChilds()
15.647 {
15.648 if (selection && (typeid(*selection) == typeid(BranchObj) ))
15.649 {
15.650 BranchObj* bo=(BranchObj*)selection;
15.651 BranchObj* par=(BranchObj*)(bo->getParObj());
15.652 QPoint p=bo->getRelPos();
15.653 - QString s=QString("Remove %1 and keep its childs").arg(getName(bo));
15.654 - if (bo->getDepth()==1)
15.655 - saveStateComplete(s);
15.656 - else
15.657 - saveStateChangingPart(selection->getParObj(),s); // TODO undoCommand
15.658 + saveStateChangingPart(
15.659 + selection->getParObj(),
15.660 + selection,
15.661 + "deleteKeepChilds ()",
15.662 + QString("Remove %1 and keep its childs").arg(getName(bo))
15.663 + );
15.664
15.665 QString sel=selection->getSelectString();
15.666 unselect();
15.667 @@ -2733,12 +2864,17 @@
15.668 }
15.669 }
15.670
15.671 -void MapEditor::removeChilds()
15.672 +void MapEditor::deleteChilds()
15.673 {
15.674 - if (selection && (typeid(*selection) == typeid(BranchObj) ))
15.675 + if (selection && (typeid(*selection) == typeid(BranchObj) ||
15.676 + typeid(*selection)==typeid(MapCenterObj)))
15.677 {
15.678 - // TODO undoCommand
15.679 - saveStateChangingPart(selection->getParObj(), QString("Remove childs of branch %1").arg(getName(selection)));
15.680 + saveStateChangingPart(
15.681 + selection->getParObj(),
15.682 + selection,
15.683 + "deleteChilds ()",
15.684 + QString( "Remove childs of branch %1").arg(getName(selection))
15.685 + );
15.686 ((BranchObj*)selection)->removeChilds();
15.687 mapCenter->reposition();
15.688 }
15.689 @@ -2908,12 +3044,24 @@
15.690 BranchObj *bo=((BranchObj*)selection);
15.691 if (bo->countBranches()==0) return;
15.692 if (bo->getDepth()==0) return;
15.693 - QString s;
15.694 + QString u,r;
15.695 if (bo->isScrolled())
15.696 - s="Unscroll";
15.697 + {
15.698 + r="unscroll";
15.699 + u="scroll";
15.700 + }
15.701 else
15.702 - s="Scroll";
15.703 - saveStateChangingPart(selection, QString ("%1 %2").arg(s).arg(getName(bo)));
15.704 + {
15.705 + u="scroll";
15.706 + r="unscroll";
15.707 + }
15.708 + saveState(
15.709 + selection,
15.710 + QString ("%1 ()").arg(u),
15.711 + selection,
15.712 + QString ("%1 ()").arg(r),
15.713 + QString ("%1 %2").arg(r).arg(getName(bo))
15.714 + );
15.715 bo->toggleScroll();
15.716 adjustCanvasSize();
15.717 canvas()->update();
15.718 @@ -2953,17 +3101,25 @@
15.719 QString fn;
15.720 if ( fd->exec() == QDialog::Accepted )
15.721 {
15.722 - saveStateChangingPart(selection, QString("Add floatimage to %1").arg(getName(selection)));
15.723 // FIXME in QT4 use: lastImageDir=fd->directory();
15.724 lastImageDir=QDir (fd->dirPath());
15.725 QStringList flist = fd->selectedFiles();
15.726 QStringList::Iterator it = flist.begin();
15.727 + FloatImageObj *fio;
15.728 while( it != flist.end() )
15.729 {
15.730 fn = *it;
15.731 bo->addFloatImage();
15.732 - // TODO check if load was successful
15.733 - bo->getLastFloatImage()->load(*it);
15.734 + fio=bo->getLastFloatImage();
15.735 + fio->load(*it);
15.736 + // FIXME check if load of fio was successful
15.737 + saveState(
15.738 + (LinkableMapObj*)fio,
15.739 + "delete ()",
15.740 + selection,
15.741 + QString ("loadFloatImage (%1)").arg(*it),
15.742 + QString("Add floatimage %1 to %2").arg(*it).arg(getName(selection))
15.743 + );
15.744 bo->getLastFloatImage()->setOriginalFilename(fn);
15.745 ++it;
15.746 }
15.747 @@ -3618,8 +3774,10 @@
15.748 FloatImageObj *fo=(FloatImageObj*)selection;
15.749 QString pold=qpointToString(movingObj_orgRelPos);
15.750 QString pnow=qpointToString(fo->getRelPos());
15.751 - saveStateConstSelection(
15.752 + saveState(
15.753 + selection,
15.754 "moveRel "+pold,
15.755 + selection,
15.756 "moveRel "+pnow,
15.757 QString("Move %1 to relativ position %2").arg(getName(selection)).arg(pnow));
15.758
15.759 @@ -3815,7 +3973,7 @@
15.760 QPixmap pix;
15.761 if (Q3ImageDrag::decode(event, pix))
15.762 {
15.763 - addFloatImage(pix);
15.764 + addFloatImageInt(pix);
15.765 event->accept();
15.766 update=true;
15.767 } else
15.768 @@ -3914,20 +4072,19 @@
15.769 }
15.770 }
15.771
15.772 -void MapEditor::addFloatImage(const QPixmap &img)
15.773 +void MapEditor::addFloatImageInt (const QPixmap &img)
15.774 {
15.775 if (selection &&
15.776 (typeid(*selection) == typeid(BranchObj)) ||
15.777 (typeid(*selection) == typeid(MapCenterObj)) )
15.778 {
15.779 BranchObj *bo=((BranchObj*)selection);
15.780 - saveStateChangingPart(selection,QString("Add floatimage to %1").arg(getName(bo)));
15.781 + //FIXME XXX saveStateChangingPart(selection,QString("Add floatimage to %1").arg(getName(bo)));
15.782 //QString fn=fd->selectedFile();
15.783 //lastImageDir=fn.left(fn.findRev ("/"));
15.784 - bo->addFloatImage();
15.785 - // FIXME check if load was successful
15.786 - bo->getLastFloatImage()->load(img);
15.787 - //bo->getLastFloatImage()->setOriginalFilename(fn);
15.788 + FloatImageObj *fio=bo->addFloatImage();
15.789 + fio->load(img);
15.790 + fio->setOriginalFilename("Image added by Drag and Drop");
15.791 mapCenter->reposition();
15.792 adjustCanvasSize();
15.793 canvas()->update();
15.794 @@ -3949,7 +4106,7 @@
15.795 {
15.796 if (nop->state()==Q3NetworkProtocol::StDone) {
15.797 QPixmap img(imageBuffer->buffer());
15.798 - addFloatImage(img);
15.799 + addFloatImageInt (img);
15.800 }
15.801
15.802 if (imageBuffer) {
16.1 --- a/mapeditor.h Tue Oct 24 15:36:38 2006 +0000
16.2 +++ b/mapeditor.h Mon Oct 30 12:39:37 2006 +0000
16.3 @@ -20,7 +20,6 @@
16.4 public:
16.5 MapEditor(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
16.6 ~MapEditor();
16.7 - QColor getColor();
16.8 QColor getBackgroundColor();
16.9 MapCenterObj* getMapCenter();
16.10 Q3Canvas* getCanvas();
16.11 @@ -32,16 +31,15 @@
16.12 void makeTmpDirs(); // create temporary directories
16.13 QString saveToDir(const QString&,const QString &,bool, const QPoint &,LinkableMapObj*);
16.14 void saveStateComplete (const QString &);
16.15 - void saveStateChangingPart (LinkableMapObj *, const QString &);
16.16 + void saveStateChangingPart (LinkableMapObj *, LinkableMapObj *, const QString &, const QString &);
16.17 void saveStateRemovingPart (LinkableMapObj *, const QString &);
16.18 - void saveStateConstSelection (const QString &, const QString &, const QString &);
16.19 void saveState(LinkableMapObj *, const QString &, LinkableMapObj *, const QString &, const QString &);
16.20 void saveState(const QString &, const QString &, const QString &, const QString &, const QString &);
16.21 void saveState(const SaveMode&, const QString &, const QString &, const QString &, const QString &, const QString &, LinkableMapObj *);
16.22 public:
16.23 void parseAtom(const QString &);
16.24 private:
16.25 - void addFloatImage(const QPixmap &img);
16.26 + void addFloatImageInt(const QPixmap &img);
16.27
16.28 private slots:
16.29 void fetchImage(const QString &img);
16.30 @@ -123,16 +121,16 @@
16.31 void selectRightBranch();
16.32 void selectFirstBranch();
16.33 void selectLastBranch();
16.34 - void setColor(QColor);
16.35 void selectBackgroundColor();
16.36 void setBackgroundColor(QColor);
16.37 - QColor pickColor();
16.38 - void colorItem();
16.39 - void colorBranch();
16.40 + QColor getCurrentHeadingColor();
16.41 + void colorItem(QColor);
16.42 + void colorBranch(QColor);
16.43 void toggleStandardFlag(QString);
16.44 virtual void setViewCenter(); // needed for zooming
16.45 BranchObj* findText(QString,bool); // Find object
16.46 void findReset(); // Reset Find
16.47 + void setURL(const QString &); // set the URL
16.48 void editURL(); // edit the URL
16.49 QString getURL(); // returns URL of selection or ""
16.50 QStringList getURLs(); // returns URLs of subtree
16.51 @@ -143,9 +141,10 @@
16.52 void deleteVymLink(); // delete link to another map
16.53 QString getVymLink(); // return path to map
16.54 QStringList getVymLinks(); // return paths in subtree
16.55 + void setHideExport(bool); // toggle the export flag
16.56 void toggleHideExport(); // toggle the export flag
16.57 - void removeBranchKeepChilds(); // remove but keep childs
16.58 - void removeChilds(); // remove childs
16.59 + void deleteKeepChilds(); // remove but keep childs
16.60 + void deleteChilds(); // remove childs
16.61 void editMapInfo(); // dialog to enter author, ...
16.62 void updateActions(); // update e.g. format buttons
16.63 void updateNoteFlag(); // when TextEditor changes
16.64 @@ -198,7 +197,6 @@
16.65 bool adjustCanvasRequested; // collect requests until end of user event
16.66 BranchObj *editingBO; // entering Text into BO
16.67
16.68 - QColor actColor; // actual color
16.69 QColor defLinkColor; // default color for links
16.70 QColor defXLinkColor; // default color for xlinks
16.71 int defXLinkWidth; // default width for xlinks
17.1 --- a/ornamentedobj.cpp Tue Oct 24 15:36:38 2006 +0000
17.2 +++ b/ornamentedobj.cpp Mon Oct 30 12:39:37 2006 +0000
17.3 @@ -366,7 +366,7 @@
17.4 attribut("absPosY",QString().setNum(absPos.y(),10));
17.5 else
17.6 {
17.7 - if (depth==1)
17.8 + if (depth==1 || typeid (*this)==typeid (FloatImageObj))
17.9 posAttr=
17.10 attribut("relPosX",QString().setNum(relPos.x(),10)) +
17.11 attribut("relPosY",QString().setNum(relPos.y(),10));
18.1 --- a/texteditor.cpp Tue Oct 24 15:36:38 2006 +0000
18.2 +++ b/texteditor.cpp Mon Oct 30 12:39:37 2006 +0000
18.3 @@ -35,7 +35,7 @@
18.4 connect (e, SIGNAL( textChanged() ), this, SLOT( editorChanged() ) );
18.5 setCentralWidget( e );
18.6 statusBar()->message( tr("Ready","Statusbar message"), statusbarTime);
18.7 - setCaption(__VYM " - " +tr ("Note Editor"));
18.8 + setCaption(__VYM " - " +tr ("Note Editor","Window caption"));
18.9
18.10
18.11 connect(e, SIGNAL(currentCharFormatChanged(const QTextCharFormat &)),
18.12 @@ -196,11 +196,11 @@
18.13 {
18.14 QToolBar *tb = addToolBar ( tr("Note Actions") );
18.15 tb->setObjectName ("noteEditorFileActions");
18.16 - QMenu *fileMenu = menuBar()->addMenu( tr( "&Note" ));
18.17 + QMenu *fileMenu = menuBar()->addMenu( tr( "&Note","Menubar" ));
18.18
18.19 QAction *a;
18.20 a = new QAction( QPixmap( iconPath+"fileopen.png"), tr( "&Import..." ),this);
18.21 - a->setStatusTip (tr( "Import" ) );
18.22 + a->setStatusTip (tr( "Import","Status tip for Note menu" ) );
18.23 a->setShortcut( Qt::CTRL + Qt::Key_O );
18.24 connect( a, SIGNAL( activated() ), this, SLOT( textLoad() ) );
18.25 tb->addAction (a);
18.26 @@ -209,7 +209,7 @@
18.27
18.28 fileMenu->addSeparator();
18.29 a = new QAction( QPixmap(iconPath+"filesave.png" ), tr( "&Export..." ),this);
18.30 - a->setStatusTip (tr( "Export Note (HTML)" ) );
18.31 + a->setStatusTip (tr( "Export Note (HTML)","Status tip for Note menu" ) );
18.32 a->setShortcut( Qt::CTRL + Qt::Key_S );
18.33 connect( a, SIGNAL( activated() ), this, SLOT( textSave() ) );
18.34 tb->addAction (a);
18.35 @@ -217,13 +217,13 @@
18.36 actionFileSave=a;
18.37
18.38 a = new QAction( QPixmap(), tr( "Export &As... (HTML)" ), this);
18.39 - a->setStatusTip (tr( "Export Note As (HTML) " ));
18.40 + a->setStatusTip (tr( "Export Note As (HTML) ","Status tip for Note Menu" ));
18.41 connect( a, SIGNAL( activated() ), this, SLOT( textSaveAs() ) );
18.42 fileMenu->addAction (a);
18.43 actionFileSaveAs=a;
18.44
18.45 a = new QAction(QPixmap(), tr( "Export &As...(ASCII)" ), this);
18.46 - a->setStatusTip ( tr( "Export Note As (ASCII) " ) );
18.47 + a->setStatusTip ( tr( "Export Note As (ASCII) ","Status tip for note menu" ) );
18.48 a->setShortcut(Qt::ALT + Qt::Key_X );
18.49 connect( a, SIGNAL( activated() ), this, SLOT( textExportAsASCII() ) );
18.50 fileMenu->addAction (a);
18.51 @@ -231,7 +231,7 @@
18.52
18.53 fileMenu->addSeparator();
18.54 a = new QAction( QPixmap(iconPath+"fileprint.png" ), tr( "&Print..." ),this);
18.55 - a->setStatusTip (tr( "Print Note" ) );
18.56 + a->setStatusTip (tr( "Print Note","Status tip for note menu" ) );
18.57 a->setShortcut( Qt::CTRL + Qt::Key_P );
18.58 connect( a, SIGNAL( activated() ), this, SLOT( textPrint() ) );
18.59 tb->addAction (a);
18.60 @@ -247,7 +247,7 @@
18.61
18.62 QAction *a;
18.63 a = new QAction(QPixmap(iconPath+"undo.png"), tr( "&Undo" ), this );
18.64 - a->setStatusTip ( tr( "Undo" ) );
18.65 + a->setStatusTip ( tr( "Undo","Status tip for note menu" ) );
18.66 a->setShortcut(Qt::CTRL + Qt::Key_Z );
18.67 connect( a, SIGNAL( activated() ), e, SLOT( undo() ) );
18.68 editMenu->addAction (a);
18.69 @@ -255,7 +255,7 @@
18.70 actionEditUndo=a;
18.71
18.72 a = new QAction(QPixmap(iconPath+"redo.png" ), tr( "&Redo" ),this);
18.73 - a->setStatusTip ( tr( "Redo" ) );
18.74 + a->setStatusTip ( tr( "Redo","Status tip for note menu" ) );
18.75 a->setShortcut( Qt::CTRL + Qt::Key_Y );
18.76 connect( a, SIGNAL( activated() ), e, SLOT( redo() ) );
18.77 editMenu->addAction (a);
18.78 @@ -264,14 +264,14 @@
18.79
18.80 editMenu->addSeparator();
18.81 a = new QAction(QPixmap(), tr( "Select and copy &all" ),this);
18.82 - a->setStatusTip ( tr( "Select and copy all" ) );
18.83 + a->setStatusTip ( tr( "Select and copy all","Status tip for note menu" ) );
18.84 a->setShortcut( Qt::CTRL + Qt::Key_A );
18.85 connect( a, SIGNAL( activated() ), this, SLOT( editCopyAll() ) );
18.86 editMenu->addAction (a);
18.87
18.88 editMenu->addSeparator();
18.89 a = new QAction(QPixmap(iconPath+"editcopy.png" ), tr( "&Copy" ),this);
18.90 - a->setStatusTip ( tr( "Copy" ) );
18.91 + a->setStatusTip ( tr( "Copy","Status tip for note menu" ) );
18.92 a->setShortcut( Qt::CTRL + Qt::Key_C );
18.93 connect( a, SIGNAL( activated() ), e, SLOT( copy() ) );
18.94 editMenu->addAction (a);
18.95 @@ -279,7 +279,7 @@
18.96 actionEditCopy=a;
18.97
18.98 a = new QAction(QPixmap(iconPath+"editcut.png" ), tr( "Cu&t" ),this);
18.99 - a->setStatusTip ( tr( "Cut" ) );
18.100 + a->setStatusTip ( tr( "Cut","Status tip for note menu" ) );
18.101 a->setShortcut( Qt::CTRL + Qt::Key_X );
18.102 connect( a, SIGNAL( activated() ), e, SLOT( cut() ) );
18.103 editMenu->addAction (a);
18.104 @@ -287,7 +287,7 @@
18.105 actionEditCut=a;
18.106
18.107 a = new QAction(QPixmap(iconPath+"editpaste.png" ), tr( "&Paste" ),this);
18.108 - a->setStatusTip ( tr( "Paste" ) );
18.109 + a->setStatusTip ( tr( "Paste","Status tip for note menu" ) );
18.110 a->setShortcut( Qt::CTRL + Qt::Key_V );
18.111 connect( a, SIGNAL( activated() ), e, SLOT( paste() ) );
18.112 editMenu->addAction (a);
18.113 @@ -295,7 +295,7 @@
18.114 actionEditPaste=a;
18.115
18.116 a = new QAction( QPixmap( iconPath+"edittrash.png"), tr( "&Delete All" ), this);
18.117 - a->setStatusTip (tr( "Delete all" ) );
18.118 + a->setStatusTip (tr( "Delete all","Status tip for note menu" ) );
18.119 connect( a, SIGNAL( activated() ), e, SLOT( clear() ) );
18.120 editMenu->addAction (a);
18.121 tb->addAction (a);
18.122 @@ -312,7 +312,7 @@
18.123 QAction *a;
18.124
18.125 a = new QAction( QPixmap(iconPath+"formatfixedfont.png"), tr( "&Font hint" ), Qt::ALT + Qt::Key_I, this, "fontHint" );
18.126 - a->setStatusTip (tr( "Toggle font hint for the whole text" ) );
18.127 + a->setStatusTip (tr( "Toggle font hint for the whole text","Status tip for note menu" ) );
18.128 a->setToggleAction (true);
18.129 a->setOn (settings.value("/noteeditor/fonts/useFixedByDefault",false).toBool() );
18.130 connect( a, SIGNAL( activated() ), this, SLOT( toggleFonthint() ) );
18.131 @@ -429,19 +429,19 @@
18.132
18.133 QAction *a;
18.134 a = new QAction(tr( "Set &fixed font" ), this);
18.135 - a->setStatusTip ( tr( "Set fixed font" ));
18.136 + a->setStatusTip ( tr( "Set fixed font","Status tip for note menu" ));
18.137 connect( a, SIGNAL( activated() ), this, SLOT( setFixedFont() ) );
18.138 settingsMenu->addAction (a);
18.139 actionSettingsFixedFont=a;
18.140
18.141 a = new QAction(tr( "Set &variable font" ), this);
18.142 - a->setStatusTip ( tr( "Set variable font" ) );
18.143 + a->setStatusTip ( tr( "Set variable font","Status tip for note menu" ) );
18.144 connect( a, SIGNAL( activated() ), this, SLOT( setVarFont() ) );
18.145 settingsMenu->addAction (a);
18.146 actionSettingsVarFont=a;
18.147
18.148 a = new QAction(tr( "&fixed font is default" ), this);
18.149 - a->setStatusTip (tr( "Used fixed font by default" ) );
18.150 + a->setStatusTip (tr( "Used fixed font by default","Status tip for note menu" ) );
18.151 a->setToggleAction (true);
18.152 // set state later in constructor...
18.153 settingsMenu->addAction (a);
18.154 @@ -559,9 +559,7 @@
18.155 if (file.exists())
18.156 {
18.157 QMessageBox mb( __VYM,
18.158 - tr("The file ") + fn +
18.159 - tr(" exists already. "
18.160 - "Do you want to overwrite it?"),
18.161 + tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
18.162 QMessageBox::Warning,
18.163 QMessageBox::Yes | QMessageBox::Default,
18.164 QMessageBox::Cancel | QMessageBox::Escape,
18.165 @@ -585,7 +583,7 @@
18.166 return;
18.167 }
18.168 }
18.169 - statusBar()->message(tr( "Couldn't export note ") + fn, statusbarTime );
18.170 + statusBar()->message(tr( "Couldn't export note ","dialog 'save note as'") + fn, statusbarTime );
18.171 }
18.172
18.173
18.174 @@ -635,10 +633,8 @@
18.175 QFile file (fn);
18.176 if (file.exists())
18.177 {
18.178 - QMessageBox mb( "VYM",
18.179 - tr("The file ") + fn +
18.180 - tr(" exists already. "
18.181 - "Do you want to overwrite it?"),
18.182 + QMessageBox mb( __VYM,
18.183 + tr("The file %1\nexists already.\nDo you want to overwrite it?","dialog 'save note as'").arg(fn),
18.184 QMessageBox::Warning,
18.185 QMessageBox::Yes | QMessageBox::Default,
18.186 QMessageBox::Cancel | QMessageBox::Escape,
18.187 @@ -673,7 +669,7 @@
18.188 QPrinter printer;
18.189
18.190 QPrintDialog *dialog = new QPrintDialog(&printer, this);
18.191 - dialog->setWindowTitle(tr("Print Document"));
18.192 + dialog->setWindowTitle(tr("Print Note"));
18.193 if (dialog->exec() != QDialog::Accepted)
18.194 return;
18.195
19.1 --- a/version.h Tue Oct 24 15:36:38 2006 +0000
19.2 +++ b/version.h Mon Oct 30 12:39:37 2006 +0000
19.3 @@ -1,8 +1,13 @@
19.4 #ifndef VERSION_H
19.5 #define VERSION_H
19.6
19.7 +#include <QString>
19.8 +
19.9 #define __VYM "VYM"
19.10 #define __VYM_VERSION "1.8.58"
19.11 -#define __BUILD_DATE "October 24, 2006"
19.12 +#define __BUILD_DATE "October 25, 2006"
19.13 +
19.14 +
19.15 +bool checkVersion(const QString &);
19.16
19.17 #endif
20.1 --- a/vym.pro Tue Oct 24 15:36:38 2006 +0000
20.2 +++ b/vym.pro Mon Oct 30 12:39:37 2006 +0000
20.3 @@ -82,6 +82,7 @@
20.4 showtextdialog.cpp \
20.5 selection.cpp \
20.6 texteditor.cpp \
20.7 + version.cpp \
20.8 xml.cpp \
20.9 xsltproc.cpp \
20.10 settings.cpp \
21.1 --- a/xml.cpp Tue Oct 24 15:36:38 2006 +0000
21.2 +++ b/xml.cpp Mon Oct 30 12:39:37 2006 +0000
21.3 @@ -51,14 +51,18 @@
21.4 const QString& eName, const QXmlAttributes& atts )
21.5 {
21.6 QColor col;
21.7 - //cout << "startElement <"<<eName<<"> state="<<state <<" laststate="<<laststate<<" loadMode="<<loadMode<<endl;
21.8 + /* Testing
21.9 + cout << "startElement <"<< eName.ascii()<<
21.10 + "> state="<<state <<
21.11 + " laststate="<<laststate<<
21.12 + " loadMode="<<loadMode<<endl;
21.13 + */
21.14 if ( state == StateInit && (eName == "vymmap") )
21.15 {
21.16 state = StateMap;
21.17 if (!atts.value( "version").isEmpty() )
21.18 {
21.19 - mc->setVersion(atts.value( "version" ));
21.20 - if (!mc->checkVersion())
21.21 + if (!checkVersion(atts.value("version")))
21.22 QMessageBox::warning( 0, "Warning: Version Problem" ,
21.23 "<h3>Map is newer than VYM</h3>"
21.24 "<p>The map you are just trying to load was "
21.25 @@ -66,6 +70,8 @@
21.26 "The version of this vym is " __VYM_VERSION
21.27 ". If you run into problems after pressing "
21.28 "the ok-button below, updating vym should help.");
21.29 + else
21.30 + mc->setVersion(atts.value( "version" ));
21.31
21.32 }
21.33 if (loadMode==NewMap)