# 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 @@ &Format - &Format + &Format Set Color @@ -690,7 +690,7 @@ Toggle Note Editor - Zeige Notiz Editor + Zeige Notiz Editor &Next Window @@ -1614,6 +1614,22 @@ Toggle history window + Zeige Verlaufsfenster + + + Firefox Bookmarks + Firefox Lesezeichen + + + F&ormat + F&ormat + + + Show Note Editor + Zeige Notiz Editor + + + Show history window Zeige Verlaufsfenster @@ -2159,6 +2175,28 @@ Leider keine Vorschau möglich für Mehrfachausahl. + + Exporting the %1 bookmarks will overwrite +your existing bookmarks file. + Das Exportieren der %1 Lesezeichen wird die +bestehende Datei mit Lesezeichen überschreiben. + + + Warning: Overwriting %1 bookmarks + Warnung: Überschreiben der %1 Lesezeichen + + + Warning + Warnung + + + Couldn't find script %1 +to notifiy Browsers of changed bookmarks. + Konnte das Script %1 +nicht finden, das nötig ist um die +Browser auf die geänderten Lesezeichen +hinzuweisen. + ShowTextDialog @@ -2275,7 +2313,7 @@ &Format - &Format + &Format Use fixed font @@ -2433,5 +2471,44 @@ Note Editor Notiz Editor + + F&ormat + F&ormat + + + + WarningDialog + + VYM - Warning : Foo... + VYM - Warnung: ... + + + textLabel + + + + showAgainBox + + + + cancelButton + + + + okButton + + + + Proceed + Weiter + + + Show this message again + Diese Meldung das nächste Mal wieder zeigen + + + Cancel + Abbrechen + 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 @@ - &Format - - - Set Color @@ -581,10 +577,6 @@ - Toggle Note Editor - - - &Next Window @@ -1181,7 +1173,19 @@ - Toggle history window + Firefox Bookmarks + + + + F&ormat + + + + Show Note Editor + + + + Show history window @@ -1360,6 +1364,24 @@ multiple selected files. + + Exporting the %1 bookmarks will overwrite +your existing bookmarks file. + + + + Warning: Overwriting %1 bookmarks + + + + Warning + + + + Couldn't find script %1 +to notifiy Browsers of changed bookmarks. + + ShowTextDialog @@ -1499,10 +1521,6 @@ - &Format - - - Toggle font hint for the whole text @@ -1610,5 +1628,44 @@ Note Editor + + F&ormat + + + + + WarningDialog + + VYM - Warning : Foo... + + + + textLabel + + + + showAgainBox + + + + cancelButton + + + + okButton + + + + Proceed + + + + Show this message again + + + + Cancel + + 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 @@ &Format - &Formato + &Formato Set Color @@ -710,7 +710,7 @@ Toggle Note Editor - Acomodar Editor de notas + Acomodar Editor de notas &Next Window @@ -1471,7 +1471,19 @@ - Toggle history window + Firefox Bookmarks + + + + F&ormat + + + + Show Note Editor + + + + Show history window @@ -1831,6 +1843,24 @@ multiple selected files. + + Exporting the %1 bookmarks will overwrite +your existing bookmarks file. + + + + Warning: Overwriting %1 bookmarks + + + + Warning + Advertencia + + + Couldn't find script %1 +to notifiy Browsers of changed bookmarks. + + ShowTextDialog @@ -1971,7 +2001,7 @@ &Format - &Formato + &Formato Toggle font hint for the whole text @@ -2081,5 +2111,44 @@ Note Editor + + F&ormat + + + + + WarningDialog + + VYM - Warning : Foo... + + + + textLabel + + + + showAgainBox + + + + cancelButton + + + + okButton + + + + Proceed + + + + Show this message again + + + + Cancel + Cancelar + 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 @@ &Format - &Formato + &Formato Set Color @@ -712,7 +712,7 @@ Toggle Note Editor - Mostra l'Editor di Note + Mostra l'Editor di Note &Next Window @@ -1480,7 +1480,19 @@ - Toggle history window + Firefox Bookmarks + + + + F&ormat + + + + Show Note Editor + + + + Show history window @@ -1836,6 +1848,24 @@ %1 didn't exit normally + + Exporting the %1 bookmarks will overwrite +your existing bookmarks file. + + + + Warning: Overwriting %1 bookmarks + + + + Warning + Attenzione + + + Couldn't find script %1 +to notifiy Browsers of changed bookmarks. + + ShowTextDialog @@ -1976,7 +2006,7 @@ &Format - &Formato + &Formato Toggle font hint for the whole text @@ -2086,5 +2116,44 @@ Su&perscript + + F&ormat + + + + + WarningDialog + + VYM - Warning : Foo... + + + + textLabel + + + + showAgainBox + + + + cancelButton + + + + okButton + + + + Proceed + + + + Show this message again + + + + Cancel + Cancella + 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