# HG changeset patch
# User insilmaril
# Date 1147678331 0
# Node ID 8f04006214dc8d2fa1df284fd5f9061a59caeb2c
# Parent 33310803546cfe84607e71de6676eccf3ce2ecf8
1.7.17
diff -r 33310803546c -r 8f04006214dc lang/vym_de.ts
--- a/lang/vym_de.ts Mon May 15 07:32:10 2006 +0000
+++ b/lang/vym_de.ts Mon May 15 07:32:11 2006 +0000
@@ -572,7 +572,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Format</translation>
+ <translation type="obsolete">&Format</translation>
</message>
<message>
<source>Set Color</source>
@@ -690,7 +690,7 @@
</message>
<message>
<source>Toggle Note Editor</source>
- <translation>Zeige Notiz Editor</translation>
+ <translation type="obsolete">Zeige Notiz Editor</translation>
</message>
<message>
<source>&Next Window</source>
@@ -1614,6 +1614,22 @@
</message>
<message>
<source>Toggle history window</source>
+ <translation type="obsolete">Zeige Verlaufsfenster</translation>
+ </message>
+ <message>
+ <source>Firefox Bookmarks</source>
+ <translation>Firefox Lesezeichen</translation>
+ </message>
+ <message>
+ <source>F&ormat</source>
+ <translation>F&ormat</translation>
+ </message>
+ <message>
+ <source>Show Note Editor</source>
+ <translation>Zeige Notiz Editor</translation>
+ </message>
+ <message>
+ <source>Show history window</source>
<translation>Zeige Verlaufsfenster</translation>
</message>
</context>
@@ -2159,6 +2175,28 @@
<translation>Leider keine Vorschau
möglich für Mehrfachausahl.</translation>
</message>
+ <message>
+ <source>Exporting the %1 bookmarks will overwrite
+your existing bookmarks file.</source>
+ <translation>Das Exportieren der %1 Lesezeichen wird die
+bestehende Datei mit Lesezeichen überschreiben.</translation>
+ </message>
+ <message>
+ <source>Warning: Overwriting %1 bookmarks</source>
+ <translation>Warnung: Überschreiben der %1 Lesezeichen</translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation>Warnung</translation>
+ </message>
+ <message>
+ <source>Couldn't find script %1
+to notifiy Browsers of changed bookmarks.</source>
+ <translation>Konnte das Script %1
+nicht finden, das nötig ist um die
+Browser auf die geänderten Lesezeichen
+hinzuweisen. </translation>
+ </message>
</context>
<context>
<name>ShowTextDialog</name>
@@ -2275,7 +2313,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Format</translation>
+ <translation type="obsolete">&Format</translation>
</message>
<message>
<source>Use fixed font</source>
@@ -2433,5 +2471,44 @@
<source>Note Editor</source>
<translation>Notiz Editor</translation>
</message>
+ <message>
+ <source>F&ormat</source>
+ <translation>F&ormat</translation>
+ </message>
+</context>
+<context>
+ <name>WarningDialog</name>
+ <message>
+ <source>VYM - Warning : Foo...</source>
+ <translation>VYM - Warnung: ...</translation>
+ </message>
+ <message>
+ <source>textLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>showAgainBox</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>cancelButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>okButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Proceed</source>
+ <translation>Weiter</translation>
+ </message>
+ <message>
+ <source>Show this message again</source>
+ <translation>Diese Meldung das nächste Mal wieder zeigen</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
</context>
</TS>
diff -r 33310803546c -r 8f04006214dc lang/vym_en.ts
--- a/lang/vym_en.ts Mon May 15 07:32:10 2006 +0000
+++ b/lang/vym_en.ts Mon May 15 07:32:11 2006 +0000
@@ -468,10 +468,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>&Format</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Set Color</source>
<translation type="unfinished"></translation>
</message>
@@ -581,10 +577,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Toggle Note Editor</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>&Next Window</source>
<translation type="unfinished"></translation>
</message>
@@ -1181,7 +1173,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Toggle history window</source>
+ <source>Firefox Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show Note Editor</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show history window</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1360,6 +1364,24 @@
multiple selected files.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Exporting the %1 bookmarks will overwrite
+your existing bookmarks file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning: Overwriting %1 bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't find script %1
+to notifiy Browsers of changed bookmarks.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShowTextDialog</name>
@@ -1499,10 +1521,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>&Format</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Toggle font hint for the whole text</source>
<translation type="unfinished"></translation>
</message>
@@ -1610,5 +1628,44 @@
<source>Note Editor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>WarningDialog</name>
+ <message>
+ <source>VYM - Warning : Foo...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>textLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>showAgainBox</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>cancelButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>okButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Proceed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show this message again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -r 33310803546c -r 8f04006214dc lang/vym_es.ts
--- a/lang/vym_es.ts Mon May 15 07:32:10 2006 +0000
+++ b/lang/vym_es.ts Mon May 15 07:32:11 2006 +0000
@@ -592,7 +592,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Formato</translation>
+ <translation type="obsolete">&Formato</translation>
</message>
<message>
<source>Set Color</source>
@@ -710,7 +710,7 @@
</message>
<message>
<source>Toggle Note Editor</source>
- <translation>Acomodar Editor de notas</translation>
+ <translation type="obsolete">Acomodar Editor de notas</translation>
</message>
<message>
<source>&Next Window</source>
@@ -1471,7 +1471,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Toggle history window</source>
+ <source>Firefox Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show Note Editor</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show history window</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1831,6 +1843,24 @@
multiple selected files.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Exporting the %1 bookmarks will overwrite
+your existing bookmarks file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning: Overwriting %1 bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation type="unfinished">Advertencia</translation>
+ </message>
+ <message>
+ <source>Couldn't find script %1
+to notifiy Browsers of changed bookmarks.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShowTextDialog</name>
@@ -1971,7 +2001,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Formato</translation>
+ <translation type="obsolete">&Formato</translation>
</message>
<message>
<source>Toggle font hint for the whole text</source>
@@ -2081,5 +2111,44 @@
<source>Note Editor</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>WarningDialog</name>
+ <message>
+ <source>VYM - Warning : Foo...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>textLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>showAgainBox</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>cancelButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>okButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Proceed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show this message again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancelar</translation>
+ </message>
</context>
</TS>
diff -r 33310803546c -r 8f04006214dc lang/vym_it.ts
--- a/lang/vym_it.ts Mon May 15 07:32:10 2006 +0000
+++ b/lang/vym_it.ts Mon May 15 07:32:11 2006 +0000
@@ -594,7 +594,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Formato</translation>
+ <translation type="obsolete">&Formato</translation>
</message>
<message>
<source>Set Color</source>
@@ -712,7 +712,7 @@
</message>
<message>
<source>Toggle Note Editor</source>
- <translation>Mostra l'Editor di Note</translation>
+ <translation type="obsolete">Mostra l'Editor di Note</translation>
</message>
<message>
<source>&Next Window</source>
@@ -1480,7 +1480,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Toggle history window</source>
+ <source>Firefox Bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show Note Editor</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show history window</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1836,6 +1848,24 @@
<source>%1 didn't exit normally</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Exporting the %1 bookmarks will overwrite
+your existing bookmarks file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning: Overwriting %1 bookmarks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Warning</source>
+ <translation type="unfinished">Attenzione</translation>
+ </message>
+ <message>
+ <source>Couldn't find script %1
+to notifiy Browsers of changed bookmarks.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShowTextDialog</name>
@@ -1976,7 +2006,7 @@
</message>
<message>
<source>&Format</source>
- <translation>&Formato</translation>
+ <translation type="obsolete">&Formato</translation>
</message>
<message>
<source>Toggle font hint for the whole text</source>
@@ -2086,5 +2116,44 @@
<source>Su&perscript</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>F&ormat</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>WarningDialog</name>
+ <message>
+ <source>VYM - Warning : Foo...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>textLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>showAgainBox</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>cancelButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>okButton</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Proceed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Show this message again</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancella</translation>
+ </message>
</context>
</TS>
diff -r 33310803546c -r 8f04006214dc mapeditor.cpp
--- a/mapeditor.cpp Mon May 15 07:32:10 2006 +0000
+++ b/mapeditor.cpp Mon May 15 07:32:11 2006 +0000
@@ -3189,16 +3189,26 @@
updateActions();
canvasContextMenu->popup(e->globalPos() );
}
+ e->accept();
}
void MapEditor::contentsMousePressEvent(QMouseEvent* e)
{
+ // Ignore right clicks, these will go to context menus
+ if (e->button() == QMouseEvent::RightButton )
+ {
+ e->ignore();
+ return;
+ }
+
// Finish open lineEdits
if (lineedit) finishedLineEdit();
QPoint p = inverseWorldMatrix().map(e->pos());
LinkableMapObj* lmo=mapCenter->findMapObj(p, NULL);
+ e->accept();
+
//Take care of clickdesystem flags _or_ modifier modes
//
if (lmo && (typeid(*lmo)==typeid(BranchObj) ||
diff -r 33310803546c -r 8f04006214dc tex/vym.changelog
--- a/tex/vym.changelog Mon May 15 07:32:10 2006 +0000
+++ b/tex/vym.changelog Mon May 15 07:32:11 2006 +0000
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 9 10:05:52 CEST 2006 - uwedr
+
+- Version: 1.7.17
+- Bugfix: Right click e.g. on URL Flag opened URL _and_ context menu
+- Bugfix: Deleting selection works also if Delkey is disabled.
+
-------------------------------------------------------------------
Mon May 8 10:29:25 CEST 2006 - uwedr
diff -r 33310803546c -r 8f04006214dc version.h
--- a/version.h Mon May 15 07:32:10 2006 +0000
+++ b/version.h Mon May 15 07:32:11 2006 +0000
@@ -2,7 +2,7 @@
#define VERSION_H
#define __VYM "VYM"
-#define __VYM_VERSION "1.7.16"
-#define __BUILD_DATE "May 8, 2006"
+#define __VYM_VERSION "1.7.17"
+#define __BUILD_DATE "May 9, 2006"
#endif