1.1 --- a/lang/vym_de.ts Mon May 15 07:32:10 2006 +0000
1.2 +++ b/lang/vym_de.ts Mon May 15 07:32:11 2006 +0000
1.3 @@ -572,7 +572,7 @@
1.4 </message>
1.5 <message>
1.6 <source>&Format</source>
1.7 - <translation>&Format</translation>
1.8 + <translation type="obsolete">&Format</translation>
1.9 </message>
1.10 <message>
1.11 <source>Set Color</source>
1.12 @@ -690,7 +690,7 @@
1.13 </message>
1.14 <message>
1.15 <source>Toggle Note Editor</source>
1.16 - <translation>Zeige Notiz Editor</translation>
1.17 + <translation type="obsolete">Zeige Notiz Editor</translation>
1.18 </message>
1.19 <message>
1.20 <source>&Next Window</source>
1.21 @@ -1614,6 +1614,22 @@
1.22 </message>
1.23 <message>
1.24 <source>Toggle history window</source>
1.25 + <translation type="obsolete">Zeige Verlaufsfenster</translation>
1.26 + </message>
1.27 + <message>
1.28 + <source>Firefox Bookmarks</source>
1.29 + <translation>Firefox Lesezeichen</translation>
1.30 + </message>
1.31 + <message>
1.32 + <source>F&ormat</source>
1.33 + <translation>F&ormat</translation>
1.34 + </message>
1.35 + <message>
1.36 + <source>Show Note Editor</source>
1.37 + <translation>Zeige Notiz Editor</translation>
1.38 + </message>
1.39 + <message>
1.40 + <source>Show history window</source>
1.41 <translation>Zeige Verlaufsfenster</translation>
1.42 </message>
1.43 </context>
1.44 @@ -2159,6 +2175,28 @@
1.45 <translation>Leider keine Vorschau
1.46 möglich für Mehrfachausahl.</translation>
1.47 </message>
1.48 + <message>
1.49 + <source>Exporting the %1 bookmarks will overwrite
1.50 +your existing bookmarks file.</source>
1.51 + <translation>Das Exportieren der %1 Lesezeichen wird die
1.52 +bestehende Datei mit Lesezeichen überschreiben.</translation>
1.53 + </message>
1.54 + <message>
1.55 + <source>Warning: Overwriting %1 bookmarks</source>
1.56 + <translation>Warnung: Überschreiben der %1 Lesezeichen</translation>
1.57 + </message>
1.58 + <message>
1.59 + <source>Warning</source>
1.60 + <translation>Warnung</translation>
1.61 + </message>
1.62 + <message>
1.63 + <source>Couldn't find script %1
1.64 +to notifiy Browsers of changed bookmarks.</source>
1.65 + <translation>Konnte das Script %1
1.66 +nicht finden, das nötig ist um die
1.67 +Browser auf die geänderten Lesezeichen
1.68 +hinzuweisen. </translation>
1.69 + </message>
1.70 </context>
1.71 <context>
1.72 <name>ShowTextDialog</name>
1.73 @@ -2275,7 +2313,7 @@
1.74 </message>
1.75 <message>
1.76 <source>&Format</source>
1.77 - <translation>&Format</translation>
1.78 + <translation type="obsolete">&Format</translation>
1.79 </message>
1.80 <message>
1.81 <source>Use fixed font</source>
1.82 @@ -2433,5 +2471,44 @@
1.83 <source>Note Editor</source>
1.84 <translation>Notiz Editor</translation>
1.85 </message>
1.86 + <message>
1.87 + <source>F&ormat</source>
1.88 + <translation>F&ormat</translation>
1.89 + </message>
1.90 +</context>
1.91 +<context>
1.92 + <name>WarningDialog</name>
1.93 + <message>
1.94 + <source>VYM - Warning : Foo...</source>
1.95 + <translation>VYM - Warnung: ...</translation>
1.96 + </message>
1.97 + <message>
1.98 + <source>textLabel</source>
1.99 + <translation type="unfinished"></translation>
1.100 + </message>
1.101 + <message>
1.102 + <source>showAgainBox</source>
1.103 + <translation type="unfinished"></translation>
1.104 + </message>
1.105 + <message>
1.106 + <source>cancelButton</source>
1.107 + <translation type="unfinished"></translation>
1.108 + </message>
1.109 + <message>
1.110 + <source>okButton</source>
1.111 + <translation type="unfinished"></translation>
1.112 + </message>
1.113 + <message>
1.114 + <source>Proceed</source>
1.115 + <translation>Weiter</translation>
1.116 + </message>
1.117 + <message>
1.118 + <source>Show this message again</source>
1.119 + <translation>Diese Meldung das nächste Mal wieder zeigen</translation>
1.120 + </message>
1.121 + <message>
1.122 + <source>Cancel</source>
1.123 + <translation>Abbrechen</translation>
1.124 + </message>
1.125 </context>
1.126 </TS>
2.1 --- a/lang/vym_en.ts Mon May 15 07:32:10 2006 +0000
2.2 +++ b/lang/vym_en.ts Mon May 15 07:32:11 2006 +0000
2.3 @@ -468,10 +468,6 @@
2.4 <translation type="unfinished"></translation>
2.5 </message>
2.6 <message>
2.7 - <source>&Format</source>
2.8 - <translation type="unfinished"></translation>
2.9 - </message>
2.10 - <message>
2.11 <source>Set Color</source>
2.12 <translation type="unfinished"></translation>
2.13 </message>
2.14 @@ -581,10 +577,6 @@
2.15 <translation type="unfinished"></translation>
2.16 </message>
2.17 <message>
2.18 - <source>Toggle Note Editor</source>
2.19 - <translation type="unfinished"></translation>
2.20 - </message>
2.21 - <message>
2.22 <source>&Next Window</source>
2.23 <translation type="unfinished"></translation>
2.24 </message>
2.25 @@ -1181,7 +1173,19 @@
2.26 <translation type="unfinished"></translation>
2.27 </message>
2.28 <message>
2.29 - <source>Toggle history window</source>
2.30 + <source>Firefox Bookmarks</source>
2.31 + <translation type="unfinished"></translation>
2.32 + </message>
2.33 + <message>
2.34 + <source>F&ormat</source>
2.35 + <translation type="unfinished"></translation>
2.36 + </message>
2.37 + <message>
2.38 + <source>Show Note Editor</source>
2.39 + <translation type="unfinished"></translation>
2.40 + </message>
2.41 + <message>
2.42 + <source>Show history window</source>
2.43 <translation type="unfinished"></translation>
2.44 </message>
2.45 </context>
2.46 @@ -1360,6 +1364,24 @@
2.47 multiple selected files.</source>
2.48 <translation type="unfinished"></translation>
2.49 </message>
2.50 + <message>
2.51 + <source>Exporting the %1 bookmarks will overwrite
2.52 +your existing bookmarks file.</source>
2.53 + <translation type="unfinished"></translation>
2.54 + </message>
2.55 + <message>
2.56 + <source>Warning: Overwriting %1 bookmarks</source>
2.57 + <translation type="unfinished"></translation>
2.58 + </message>
2.59 + <message>
2.60 + <source>Warning</source>
2.61 + <translation type="unfinished"></translation>
2.62 + </message>
2.63 + <message>
2.64 + <source>Couldn't find script %1
2.65 +to notifiy Browsers of changed bookmarks.</source>
2.66 + <translation type="unfinished"></translation>
2.67 + </message>
2.68 </context>
2.69 <context>
2.70 <name>ShowTextDialog</name>
2.71 @@ -1499,10 +1521,6 @@
2.72 <translation type="unfinished"></translation>
2.73 </message>
2.74 <message>
2.75 - <source>&Format</source>
2.76 - <translation type="unfinished"></translation>
2.77 - </message>
2.78 - <message>
2.79 <source>Toggle font hint for the whole text</source>
2.80 <translation type="unfinished"></translation>
2.81 </message>
2.82 @@ -1610,5 +1628,44 @@
2.83 <source>Note Editor</source>
2.84 <translation type="unfinished"></translation>
2.85 </message>
2.86 + <message>
2.87 + <source>F&ormat</source>
2.88 + <translation type="unfinished"></translation>
2.89 + </message>
2.90 +</context>
2.91 +<context>
2.92 + <name>WarningDialog</name>
2.93 + <message>
2.94 + <source>VYM - Warning : Foo...</source>
2.95 + <translation type="unfinished"></translation>
2.96 + </message>
2.97 + <message>
2.98 + <source>textLabel</source>
2.99 + <translation type="unfinished"></translation>
2.100 + </message>
2.101 + <message>
2.102 + <source>showAgainBox</source>
2.103 + <translation type="unfinished"></translation>
2.104 + </message>
2.105 + <message>
2.106 + <source>cancelButton</source>
2.107 + <translation type="unfinished"></translation>
2.108 + </message>
2.109 + <message>
2.110 + <source>okButton</source>
2.111 + <translation type="unfinished"></translation>
2.112 + </message>
2.113 + <message>
2.114 + <source>Proceed</source>
2.115 + <translation type="unfinished"></translation>
2.116 + </message>
2.117 + <message>
2.118 + <source>Show this message again</source>
2.119 + <translation type="unfinished"></translation>
2.120 + </message>
2.121 + <message>
2.122 + <source>Cancel</source>
2.123 + <translation type="unfinished"></translation>
2.124 + </message>
2.125 </context>
2.126 </TS>
3.1 --- a/lang/vym_es.ts Mon May 15 07:32:10 2006 +0000
3.2 +++ b/lang/vym_es.ts Mon May 15 07:32:11 2006 +0000
3.3 @@ -592,7 +592,7 @@
3.4 </message>
3.5 <message>
3.6 <source>&Format</source>
3.7 - <translation>&Formato</translation>
3.8 + <translation type="obsolete">&Formato</translation>
3.9 </message>
3.10 <message>
3.11 <source>Set Color</source>
3.12 @@ -710,7 +710,7 @@
3.13 </message>
3.14 <message>
3.15 <source>Toggle Note Editor</source>
3.16 - <translation>Acomodar Editor de notas</translation>
3.17 + <translation type="obsolete">Acomodar Editor de notas</translation>
3.18 </message>
3.19 <message>
3.20 <source>&Next Window</source>
3.21 @@ -1471,7 +1471,19 @@
3.22 <translation type="unfinished"></translation>
3.23 </message>
3.24 <message>
3.25 - <source>Toggle history window</source>
3.26 + <source>Firefox Bookmarks</source>
3.27 + <translation type="unfinished"></translation>
3.28 + </message>
3.29 + <message>
3.30 + <source>F&ormat</source>
3.31 + <translation type="unfinished"></translation>
3.32 + </message>
3.33 + <message>
3.34 + <source>Show Note Editor</source>
3.35 + <translation type="unfinished"></translation>
3.36 + </message>
3.37 + <message>
3.38 + <source>Show history window</source>
3.39 <translation type="unfinished"></translation>
3.40 </message>
3.41 </context>
3.42 @@ -1831,6 +1843,24 @@
3.43 multiple selected files.</source>
3.44 <translation type="unfinished"></translation>
3.45 </message>
3.46 + <message>
3.47 + <source>Exporting the %1 bookmarks will overwrite
3.48 +your existing bookmarks file.</source>
3.49 + <translation type="unfinished"></translation>
3.50 + </message>
3.51 + <message>
3.52 + <source>Warning: Overwriting %1 bookmarks</source>
3.53 + <translation type="unfinished"></translation>
3.54 + </message>
3.55 + <message>
3.56 + <source>Warning</source>
3.57 + <translation type="unfinished">Advertencia</translation>
3.58 + </message>
3.59 + <message>
3.60 + <source>Couldn't find script %1
3.61 +to notifiy Browsers of changed bookmarks.</source>
3.62 + <translation type="unfinished"></translation>
3.63 + </message>
3.64 </context>
3.65 <context>
3.66 <name>ShowTextDialog</name>
3.67 @@ -1971,7 +2001,7 @@
3.68 </message>
3.69 <message>
3.70 <source>&Format</source>
3.71 - <translation>&Formato</translation>
3.72 + <translation type="obsolete">&Formato</translation>
3.73 </message>
3.74 <message>
3.75 <source>Toggle font hint for the whole text</source>
3.76 @@ -2081,5 +2111,44 @@
3.77 <source>Note Editor</source>
3.78 <translation type="unfinished"></translation>
3.79 </message>
3.80 + <message>
3.81 + <source>F&ormat</source>
3.82 + <translation type="unfinished"></translation>
3.83 + </message>
3.84 +</context>
3.85 +<context>
3.86 + <name>WarningDialog</name>
3.87 + <message>
3.88 + <source>VYM - Warning : Foo...</source>
3.89 + <translation type="unfinished"></translation>
3.90 + </message>
3.91 + <message>
3.92 + <source>textLabel</source>
3.93 + <translation type="unfinished"></translation>
3.94 + </message>
3.95 + <message>
3.96 + <source>showAgainBox</source>
3.97 + <translation type="unfinished"></translation>
3.98 + </message>
3.99 + <message>
3.100 + <source>cancelButton</source>
3.101 + <translation type="unfinished"></translation>
3.102 + </message>
3.103 + <message>
3.104 + <source>okButton</source>
3.105 + <translation type="unfinished"></translation>
3.106 + </message>
3.107 + <message>
3.108 + <source>Proceed</source>
3.109 + <translation type="unfinished"></translation>
3.110 + </message>
3.111 + <message>
3.112 + <source>Show this message again</source>
3.113 + <translation type="unfinished"></translation>
3.114 + </message>
3.115 + <message>
3.116 + <source>Cancel</source>
3.117 + <translation type="unfinished">Cancelar</translation>
3.118 + </message>
3.119 </context>
3.120 </TS>
4.1 --- a/lang/vym_it.ts Mon May 15 07:32:10 2006 +0000
4.2 +++ b/lang/vym_it.ts Mon May 15 07:32:11 2006 +0000
4.3 @@ -594,7 +594,7 @@
4.4 </message>
4.5 <message>
4.6 <source>&Format</source>
4.7 - <translation>&Formato</translation>
4.8 + <translation type="obsolete">&Formato</translation>
4.9 </message>
4.10 <message>
4.11 <source>Set Color</source>
4.12 @@ -712,7 +712,7 @@
4.13 </message>
4.14 <message>
4.15 <source>Toggle Note Editor</source>
4.16 - <translation>Mostra l'Editor di Note</translation>
4.17 + <translation type="obsolete">Mostra l'Editor di Note</translation>
4.18 </message>
4.19 <message>
4.20 <source>&Next Window</source>
4.21 @@ -1480,7 +1480,19 @@
4.22 <translation type="unfinished"></translation>
4.23 </message>
4.24 <message>
4.25 - <source>Toggle history window</source>
4.26 + <source>Firefox Bookmarks</source>
4.27 + <translation type="unfinished"></translation>
4.28 + </message>
4.29 + <message>
4.30 + <source>F&ormat</source>
4.31 + <translation type="unfinished"></translation>
4.32 + </message>
4.33 + <message>
4.34 + <source>Show Note Editor</source>
4.35 + <translation type="unfinished"></translation>
4.36 + </message>
4.37 + <message>
4.38 + <source>Show history window</source>
4.39 <translation type="unfinished"></translation>
4.40 </message>
4.41 </context>
4.42 @@ -1836,6 +1848,24 @@
4.43 <source>%1 didn't exit normally</source>
4.44 <translation type="unfinished"></translation>
4.45 </message>
4.46 + <message>
4.47 + <source>Exporting the %1 bookmarks will overwrite
4.48 +your existing bookmarks file.</source>
4.49 + <translation type="unfinished"></translation>
4.50 + </message>
4.51 + <message>
4.52 + <source>Warning: Overwriting %1 bookmarks</source>
4.53 + <translation type="unfinished"></translation>
4.54 + </message>
4.55 + <message>
4.56 + <source>Warning</source>
4.57 + <translation type="unfinished">Attenzione</translation>
4.58 + </message>
4.59 + <message>
4.60 + <source>Couldn't find script %1
4.61 +to notifiy Browsers of changed bookmarks.</source>
4.62 + <translation type="unfinished"></translation>
4.63 + </message>
4.64 </context>
4.65 <context>
4.66 <name>ShowTextDialog</name>
4.67 @@ -1976,7 +2006,7 @@
4.68 </message>
4.69 <message>
4.70 <source>&Format</source>
4.71 - <translation>&Formato</translation>
4.72 + <translation type="obsolete">&Formato</translation>
4.73 </message>
4.74 <message>
4.75 <source>Toggle font hint for the whole text</source>
4.76 @@ -2086,5 +2116,44 @@
4.77 <source>Su&perscript</source>
4.78 <translation type="unfinished"></translation>
4.79 </message>
4.80 + <message>
4.81 + <source>F&ormat</source>
4.82 + <translation type="unfinished"></translation>
4.83 + </message>
4.84 +</context>
4.85 +<context>
4.86 + <name>WarningDialog</name>
4.87 + <message>
4.88 + <source>VYM - Warning : Foo...</source>
4.89 + <translation type="unfinished"></translation>
4.90 + </message>
4.91 + <message>
4.92 + <source>textLabel</source>
4.93 + <translation type="unfinished"></translation>
4.94 + </message>
4.95 + <message>
4.96 + <source>showAgainBox</source>
4.97 + <translation type="unfinished"></translation>
4.98 + </message>
4.99 + <message>
4.100 + <source>cancelButton</source>
4.101 + <translation type="unfinished"></translation>
4.102 + </message>
4.103 + <message>
4.104 + <source>okButton</source>
4.105 + <translation type="unfinished"></translation>
4.106 + </message>
4.107 + <message>
4.108 + <source>Proceed</source>
4.109 + <translation type="unfinished"></translation>
4.110 + </message>
4.111 + <message>
4.112 + <source>Show this message again</source>
4.113 + <translation type="unfinished"></translation>
4.114 + </message>
4.115 + <message>
4.116 + <source>Cancel</source>
4.117 + <translation type="unfinished">Cancella</translation>
4.118 + </message>
4.119 </context>
4.120 </TS>
5.1 --- a/mapeditor.cpp Mon May 15 07:32:10 2006 +0000
5.2 +++ b/mapeditor.cpp Mon May 15 07:32:11 2006 +0000
5.3 @@ -3189,16 +3189,26 @@
5.4 updateActions();
5.5 canvasContextMenu->popup(e->globalPos() );
5.6 }
5.7 + e->accept();
5.8 }
5.9
5.10 void MapEditor::contentsMousePressEvent(QMouseEvent* e)
5.11 {
5.12 + // Ignore right clicks, these will go to context menus
5.13 + if (e->button() == QMouseEvent::RightButton )
5.14 + {
5.15 + e->ignore();
5.16 + return;
5.17 + }
5.18 +
5.19 // Finish open lineEdits
5.20 if (lineedit) finishedLineEdit();
5.21
5.22 QPoint p = inverseWorldMatrix().map(e->pos());
5.23 LinkableMapObj* lmo=mapCenter->findMapObj(p, NULL);
5.24
5.25 + e->accept();
5.26 +
5.27 //Take care of clickdesystem flags _or_ modifier modes
5.28 //
5.29 if (lmo && (typeid(*lmo)==typeid(BranchObj) ||
6.1 --- a/tex/vym.changelog Mon May 15 07:32:10 2006 +0000
6.2 +++ b/tex/vym.changelog Mon May 15 07:32:11 2006 +0000
6.3 @@ -1,3 +1,10 @@
6.4 +-------------------------------------------------------------------
6.5 +Tue May 9 10:05:52 CEST 2006 - uwedr
6.6 +
6.7 +- Version: 1.7.17
6.8 +- Bugfix: Right click e.g. on URL Flag opened URL _and_ context menu
6.9 +- Bugfix: Deleting selection works also if Delkey is disabled.
6.10 +
6.11 -------------------------------------------------------------------
6.12 Mon May 8 10:29:25 CEST 2006 - uwedr
6.13
7.1 --- a/version.h Mon May 15 07:32:10 2006 +0000
7.2 +++ b/version.h Mon May 15 07:32:11 2006 +0000
7.3 @@ -2,7 +2,7 @@
7.4 #define VERSION_H
7.5
7.6 #define __VYM "VYM"
7.7 -#define __VYM_VERSION "1.7.16"
7.8 -#define __BUILD_DATE "May 8, 2006"
7.9 +#define __VYM_VERSION "1.7.17"
7.10 +#define __BUILD_DATE "May 9, 2006"
7.11
7.12 #endif