# HG changeset patch
# User insilmaril
# Date 1157718609 0
# Node ID c79df732d09524805c1e75821a551a990aad84ca
# Parent 5f6e176e97185ed6099dea2f0fe9bd2b540b04a4
rows in history window can be selected to undo/redo actions
diff -r 5f6e176e9718 -r c79df732d095 aboutdialog.cpp
--- a/aboutdialog.cpp Wed Sep 06 12:47:06 2006 +0000
+++ b/aboutdialog.cpp Fri Sep 08 12:30:09 2006 +0000
@@ -173,7 +173,7 @@
tabs->showPage (credits);
okbutton =new QPushButton (this,"okbutton");
- okbutton->setText (tr("Ok"));
+ okbutton->setText (tr("Ok","Ok Button"));
okbutton->setMaximumSize (QSize (50,30));
okbutton->setAutoDefault (true);
mainLayout->addWidget( okbutton);
diff -r 5f6e176e9718 -r c79df732d095 demos/todo.vym
Binary file demos/todo.vym has changed
diff -r 5f6e176e9718 -r c79df732d095 historywindow.cpp
--- a/historywindow.cpp Wed Sep 06 12:47:06 2006 +0000
+++ b/historywindow.cpp Fri Sep 08 12:30:09 2006 +0000
@@ -1,4 +1,5 @@
#include "historywindow.h"
+#include "mapeditor.h"
HistoryWindow::HistoryWindow (QWidget *parent):QDialog (parent)
{
@@ -19,28 +20,109 @@
ui.historyTable->setHorizontalHeaderItem(2, item);
ui.historyTable->setSelectionBehavior (QAbstractItemView::SelectRows);
+
+ connect ( ui.undoButton, SIGNAL (clicked()), this, SLOT (undo()));
+ connect ( ui.redoButton, SIGNAL (clicked()), this, SLOT (redo()));
+ connect ( ui.historyTable, SIGNAL (itemSelectionChanged()), this, SLOT (select()));
}
+void HistoryWindow::updateRow(int row, int step, SimpleSettings &set)
+{
+ QTableWidgetItem *item;
+
+ item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/redoCommand").arg(step)));
+ ui.historyTable->setItem(row, 0, item);
+
+ item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/comment").arg(step)));
+ ui.historyTable->setItem(row, 1, item);
+
+ item=new QTableWidgetItem(set.readEntry(QString("/history/step-%1/undoCommand").arg(step)));
+ ui.historyTable->setItem(row, 2, item);
+}
+
void HistoryWindow::update(SimpleSettings &set)
{
- //int rows=set.readNumEntry("/history/undosTotal");
- //ui.historyTable->setRowCount (rows);
+ int undosAvail=set.readNumEntry("/history/undosAvail",0);
+ int redosAvail=set.readNumEntry("/history/redosAvail",0);
+ int stepsTotal=set.readNumEntry("/history/stepsTotal",0);
+ int curStep=set.readNumEntry ("/history/curStep");
+ int i;
+ int s=curStep;
+ int r=undosAvail-1;
+ QTableWidgetItem *item;
- int i;
- for (i=0;i<= set.readNumEntry("/history/undosAvail",0); i++)
+ // Update buttons
+ if (undosAvail<1)
+ ui.undoButton->setEnabled (false);
+ else
+ ui.undoButton->setEnabled (true);
+
+ if (redosAvail<1)
+ ui.redoButton->setEnabled (false);
+ else
+ ui.redoButton->setEnabled (true);
+
+ // Update table
+ for (i=undosAvail; i>0; i--)
{
- QTableWidgetItem *item;
+ updateRow (r,s,set);
+ r--;
+ s--;
+ if (s<1) s=stepsTotal;
+ }
+
+ // Generated the "now" row
+ QColor c(255,200,120);
+ for (i=0;i<=2;i++)
+ {
+ if (i!=1)
+ {
+ item=new QTableWidgetItem("");
+ item->setBackgroundColor (c);
+ ui.historyTable->setItem(undosAvail, i, item);
+ }
+ }
+ item=new QTableWidgetItem(" - " +tr("Current state","current bar in history hwindow")+ " - ");
+ item->setBackgroundColor (c);
+ ui.historyTable->setItem(undosAvail, 1, item);
- item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/redoCommand").arg(i)));
- ui.historyTable->setItem(i, 0, item);
- item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/comment").arg(i)));
- ui.historyTable->setItem(i, 1, item);
+ s=curStep;
+ s++; if (s>stepsTotal) s=1;
- item=new QTableWidgetItem(set.readEntry(QString("/history/step-%1/undoCommand").arg(i)));
- ui.historyTable->setItem(i, 2, item);
+ for (i=1;i<= redosAvail; i++)
+ {
+ updateRow (undosAvail+i,s,set);
+ s++; if (s>stepsTotal) s=1;
}
ui.historyTable->resizeColumnsToContents();
}
+
+void HistoryWindow::setME (MapEditor *me)
+{
+ mapEditor=me;
+}
+
+void HistoryWindow::setStepsTotal (int st)
+{
+ // Number of steps + "current" bar
+ ui.historyTable->setRowCount (st+1);
+
+}
+
+void HistoryWindow::undo()
+{
+ mapEditor->undo();
+}
+
+void HistoryWindow::redo()
+{
+ mapEditor->redo();
+}
+
+void HistoryWindow::select()
+{
+ mapEditor->gotoStep (ui.historyTable->row (ui.historyTable->selectedItems().first()));
+}
diff -r 5f6e176e9718 -r c79df732d095 historywindow.h
--- a/historywindow.h Wed Sep 06 12:47:06 2006 +0000
+++ b/historywindow.h Fri Sep 08 12:30:09 2006 +0000
@@ -1,9 +1,13 @@
#ifndef HISTORYWINDOW_H
#define HISTORYWINDOW_H
+//#include "mapeditor.h"
#include "settings.h"
#include "ui_historywindow.h"
+
+class MapEditor;
+
/////////////////////////////////////////////////////////////////////////////
class HistoryWindow:public QDialog
{
@@ -12,10 +16,18 @@
public:
HistoryWindow(QWidget* parent = 0);
void update (SimpleSettings &);
-
+ void setME (MapEditor *);
+ void setStepsTotal (int);
+
+private slots:
+ void undo();
+ void redo();
+ void select();
private:
+ void updateRow (int, int, SimpleSettings &);
Ui::HistoryWindow ui;
+ MapEditor *mapEditor;
};
diff -r 5f6e176e9718 -r c79df732d095 lang/vym_de.ts
--- a/lang/vym_de.ts Wed Sep 06 12:47:06 2006 +0000
+++ b/lang/vym_de.ts Fri Sep 08 12:30:09 2006 +0000
@@ -3,6 +3,11 @@
<name>AboutDialog</name>
<message>
<source>Ok</source>
+ <translation type="obsolete">Ok</translation>
+ </message>
+ <message>
+ <source>Ok</source>
+ <comment>Ok Button</comment>
<translation>Ok</translation>
</message>
</context>
@@ -327,12 +332,60 @@
<source>Find Text</source>
<translation>Text suchen</translation>
</message>
+ <message>
+ <source>Text to find:</source>
+ <translation>Suchen nach:</translation>
+ </message>
+</context>
+<context>
+ <name>HistoryWindow</name>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <translation type="unfinished">Wiederherstellen</translation>
+ </message>
+ <message>
+ <source>New Row</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Comment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation type="unfinished">Rückgängig</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="unfinished">Schliessen</translation>
+ </message>
+ <message>
+ <source>Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>now</source>
+ <comment>now bar in history hwindow</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Main</name>
<message>
<source>&File</source>
- <translation>&Datei</translation>
+ <translation type="obsolete">&Datei</translation>
</message>
<message>
<source>New map</source>
@@ -492,7 +545,7 @@
</message>
<message>
<source>Jump to map</source>
- <translation>Gehe zu einer weiteren Map.</translation>
+ <translation type="obsolete">Gehe zu einer weiteren Map.</translation>
</message>
<message>
<source>Edit link to another vym map</source>
@@ -1217,11 +1270,11 @@
</message>
<message>
<source>Pasting into new branch</source>
- <translation>In neuen Zweig einfügen</translation>
+ <translation type="obsolete">In neuen Zweig einfügen</translation>
</message>
<message>
<source>pasting into new branch</source>
- <translation>In neuen Zweig einfügen</translation>
+ <translation type="obsolete">In neuen Zweig einfügen</translation>
</message>
<message>
<source>Delete key for deleting branches</source>
@@ -1669,10 +1722,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Couldn't find configuration for export to Open Office
</source>
<translation type="unfinished"></translation>
@@ -1681,6 +1730,44 @@
<source>No matches found for "%1"</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>&Map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all URLs in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open xlinked map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all vym links in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>URLs and vymLinks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before load
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before save
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MapEditor</name>
@@ -1889,7 +1976,7 @@
</message>
<message>
<source>vym - save image as</source>
- <translation>vym - Speichere Bild als</translation>
+ <translation type="obsolete">vym - Speichere Bild als</translation>
</message>
<message>
<source>vym - Save image as </source>
@@ -2098,7 +2185,7 @@
</message>
<message>
<source>Save image as %1</source>
- <translation>Speichere Bild unter %1</translation>
+ <translation type="obsolete">Speichere Bild unter %1</translation>
</message>
<message>
<source>Choose directory structure to import</source>
@@ -2122,6 +2209,128 @@
</message>
<message>
<source>Warning</source>
+ <translation type="obsolete">Warnung</translation>
+ </message>
+ <message>
+ <source>Couldn't find script %1
+to notifiy Browsers of changed bookmarks.</source>
+ <translation type="obsolete">Konnte das Script %1
+nicht finden, das nötig ist um die
+Browser auf die geänderten Lesezeichen
+hinzuweisen. </translation>
+ </message>
+ <message>
+ <source>History for </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Save image</source>
+ <translation type="unfinished">Speichere Bild</translation>
+ </message>
+</context>
+<context>
+ <name>QMessageBox</name>
+ <message>
+ <source>Critical Error</source>
+ <translation type="obsolete">Kritischer Fehler</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>new branch</source>
+ <translation type="obsolete">Neuer Zweig</translation>
+ </message>
+ <message>
+ <source>New Map</source>
+ <translation type="obsolete">Neue Map</translation>
+ </message>
+ <message>
+ <source>This is not an image.</source>
+ <translation>Das ist kein Bild.</translation>
+ </message>
+ <message>
+ <source>Critical Export Error</source>
+ <translation>Kritischer Fehler beim Exportieren</translation>
+ </message>
+ <message>
+ <source>Could not write %1</source>
+ <translation>%1 konnte nicht </translation>
+ </message>
+ <message>
+ <source>Export failed.</source>
+ <translation>Export fehlgeschlagen.</translation>
+ </message>
+ <message>
+ <source>Check "%1" in
+%2</source>
+ <translation>Bitte "%1" prüfen in
+%2</translation>
+ </message>
+ <message>
+ <source>Could not read %1</source>
+ <translation>%1 konnte nicht gelesen werden</translation>
+ </message>
+ <message>
+ <source>Critical Error</source>
+ <translation>Kritischer Fehler</translation>
+ </message>
+ <message>
+ <source>Couldn't start zip to compress data.</source>
+ <translation>Konnte zip nicht starten, um Daten zu komprimieren.</translation>
+ </message>
+ <message>
+ <source>zip didn't exit normally</source>
+ <translation>zip wurde nicht richtig beendet</translation>
+ </message>
+ <message>
+ <source>Couldn't start unzip to decompress data.</source>
+ <translation>Konnte unzip nicht starten, um Daten zu dekomprimieren.</translation>
+ </message>
+ <message>
+ <source>unzip didn't exit normally</source>
+ <translation>unzip wurde nicht richtig beendet</translation>
+ </message>
+ <message>
+ <source>Could not start %1</source>
+ <translation>%1 konnte nicht gestartet werden</translation>
+ </message>
+ <message>
+ <source>%1 didn't exit normally</source>
+ <translation>%1 wurde nicht richtig beendet</translation>
+ </message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation>Die Datei %1 gibt es bereits.
+Wollen Sie sie überschreiben?</translation>
+ </message>
+ <message>
+ <source>Overwrite</source>
+ <translation>Überschreiben</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
+ <message>
+ <source>Sorry, no preview for
+multiple selected files.</source>
+ <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>
@@ -2132,119 +2341,14 @@
Browser auf die geänderten Lesezeichen
hinzuweisen. </translation>
</message>
-</context>
-<context>
- <name>QMessageBox</name>
- <message>
- <source>Critical Error</source>
- <translation type="obsolete">Kritischer Fehler</translation>
- </message>
-</context>
-<context>
- <name>QObject</name>
- <message>
- <source>new branch</source>
- <translation type="obsolete">Neuer Zweig</translation>
- </message>
- <message>
- <source>New Map</source>
- <translation type="obsolete">Neue Map</translation>
- </message>
- <message>
- <source>This is not an image.</source>
- <translation>Das ist kein Bild.</translation>
- </message>
- <message>
- <source>Critical Export Error</source>
- <translation>Kritischer Fehler beim Exportieren</translation>
- </message>
- <message>
- <source>Could not write %1</source>
- <translation>%1 konnte nicht </translation>
- </message>
- <message>
- <source>Export failed.</source>
- <translation>Export fehlgeschlagen.</translation>
- </message>
- <message>
- <source>Check "%1" in
-%2</source>
- <translation>Bitte "%1" prüfen in
-%2</translation>
- </message>
- <message>
- <source>Could not read %1</source>
- <translation>%1 konnte nicht gelesen werden</translation>
- </message>
- <message>
- <source>Critical Error</source>
- <translation>Kritischer Fehler</translation>
- </message>
- <message>
- <source>Couldn't start zip to compress data.</source>
- <translation>Konnte zip nicht starten, um Daten zu komprimieren.</translation>
- </message>
- <message>
- <source>zip didn't exit normally</source>
- <translation>zip wurde nicht richtig beendet</translation>
- </message>
- <message>
- <source>Couldn't start unzip to decompress data.</source>
- <translation>Konnte unzip nicht starten, um Daten zu dekomprimieren.</translation>
- </message>
- <message>
- <source>unzip didn't exit normally</source>
- <translation>unzip wurde nicht richtig beendet</translation>
- </message>
- <message>
- <source>Could not start %1</source>
- <translation>%1 konnte nicht gestartet werden</translation>
- </message>
- <message>
- <source>%1 didn't exit normally</source>
- <translation>%1 wurde nicht richtig beendet</translation>
- </message>
- <message>
- <source>The file %1 exists already.
-Do you want to overwrite it?</source>
- <translation>Die Datei %1 gibt es bereits.
-Wollen Sie sie überschreiben?</translation>
- </message>
- <message>
- <source>Overwrite</source>
- <translation>Überschreiben</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
- </message>
- <message>
- <source>Sorry, no preview for
-multiple selected files.</source>
- <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>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't access temporary directory
+</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2255,18 +2359,22 @@
</message>
<message>
<source>Close</source>
- <translation type="obsolete">Schliessen</translation>
+ <translation type="unfinished">Schliessen</translation>
</message>
<message>
<source>History of %1</source>
<translation type="obsolete">Verlauf von %1</translation>
</message>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TextEditor</name>
<message>
<source>&File</source>
- <translation>&Datei</translation>
+ <translation type="obsolete">&Datei</translation>
</message>
<message>
<source>Import</source>
@@ -2525,19 +2633,23 @@
<translation>F&ormat</translation>
</message>
<message>
- <source>File Actions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit Actions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Format Actions</source>
+ <translation type="unfinished">Format Actions</translation>
+ </message>
+ <message>
+ <source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Print Document</source>
+ <source>Note Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Note</source>
<translation type="unfinished"></translation>
</message>
</context>
diff -r 5f6e176e9718 -r c79df732d095 lang/vym_en.ts
--- a/lang/vym_en.ts Wed Sep 06 12:47:06 2006 +0000
+++ b/lang/vym_en.ts Fri Sep 08 12:30:09 2006 +0000
@@ -3,19 +3,11 @@
<name>AboutDialog</name>
<message>
<source>Ok</source>
+ <comment>Ok Button</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>EditXLinkDialog</name>
-</context>
-<context>
- <name>ExportXHTMLDialog</name>
-</context>
-<context>
- <name>ExtraInfoDialog</name>
-</context>
-<context>
<name>FindWindow</name>
<message>
<source>Clear</source>
@@ -33,14 +25,58 @@
<source>Find Text</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Text to find:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HistoryWindow</name>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>New Row</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Comment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>now</source>
+ <comment>now bar in history hwindow</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Main</name>
<message>
- <source>&File</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>New map</source>
<comment>File menu</comment>
<translation type="unfinished"></translation>
@@ -191,10 +227,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Jump to map</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit link to another vym map</source>
<translation type="unfinished"></translation>
</message>
@@ -615,14 +647,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Delete key for deleting branches</source>
<translation type="unfinished"></translation>
</message>
@@ -1028,10 +1052,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Couldn't find configuration for export to Open Office
</source>
<translation type="unfinished"></translation>
@@ -1040,6 +1060,44 @@
<source>No matches found for "%1"</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>&Map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all URLs in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open xlinked map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all vym links in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>URLs and vymLinks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before load
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before save
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MapEditor</name>
@@ -1080,10 +1138,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>vym - save image as</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Critical Import Error</source>
<translation type="unfinished"></translation>
</message>
@@ -1122,10 +1176,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save image as %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Choose directory structure to import</source>
<translation type="unfinished"></translation>
</message>
@@ -1134,12 +1184,11 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Warning</source>
+ <source>History for </source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Couldn't find script %1
-to notifiy Browsers of changed bookmarks.</source>
+ <source>Save image</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1234,17 +1283,30 @@
to notifiy Browsers of changed bookmarks.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't access temporary directory
+</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ShowTextDialog</name>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>TextEditor</name>
<message>
- <source>&File</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Import</source>
<translation type="unfinished"></translation>
</message>
@@ -1465,10 +1527,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>File Actions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit Actions</source>
<translation type="unfinished"></translation>
</message>
@@ -1480,8 +1538,13 @@
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>WarningDialog</name>
+ <message>
+ <source>Note Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Note</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -r 5f6e176e9718 -r c79df732d095 lang/vym_es.ts
--- a/lang/vym_es.ts Wed Sep 06 12:47:06 2006 +0000
+++ b/lang/vym_es.ts Fri Sep 08 12:30:09 2006 +0000
@@ -3,6 +3,11 @@
<name>AboutDialog</name>
<message>
<source>Ok</source>
+ <translation type="obsolete">Ok</translation>
+ </message>
+ <message>
+ <source>Ok</source>
+ <comment>Ok Button</comment>
<translation type="unfinished">Ok</translation>
</message>
</context>
@@ -272,12 +277,60 @@
<source>Find Text</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Text to find:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HistoryWindow</name>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <translation type="unfinished">Rehacer</translation>
+ </message>
+ <message>
+ <source>New Row</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Comment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation type="unfinished">Deshacer</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="unfinished">Cerrar</translation>
+ </message>
+ <message>
+ <source>Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>now</source>
+ <comment>now bar in history hwindow</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Main</name>
<message>
<source>&File</source>
- <translation>&Archivo</translation>
+ <translation type="obsolete">&Archivo</translation>
</message>
<message>
<source>New map</source>
@@ -447,7 +500,7 @@
</message>
<message>
<source>Jump to map</source>
- <translation>Saltar al mapa</translation>
+ <translation type="obsolete">Saltar al mapa</translation>
</message>
<message>
<source>Edit link to another vym map</source>
@@ -1077,14 +1130,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Delete key for deleting branches</source>
<translation type="unfinished"></translation>
</message>
@@ -1474,10 +1519,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Couldn't find configuration for export to Open Office
</source>
<translation type="unfinished"></translation>
@@ -1486,6 +1527,44 @@
<source>No matches found for "%1"</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>&Map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all URLs in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open xlinked map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all vym links in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>URLs and vymLinks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before load
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before save
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MapEditor</name>
@@ -1583,7 +1662,7 @@
</message>
<message>
<source>vym - save image as</source>
- <translation>vym - guardar imagen como</translation>
+ <translation type="obsolete">vym - guardar imagen como</translation>
</message>
<message>
<source>vym - Save image as </source>
@@ -1749,10 +1828,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save image as %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Choose directory structure to import</source>
<translation type="unfinished"></translation>
</message>
@@ -1762,6 +1837,101 @@
</message>
<message>
<source>Warning</source>
+ <translation type="obsolete">Advertencia</translation>
+ </message>
+ <message>
+ <source>History for </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Save image</source>
+ <translation type="unfinished">Guardar imagen</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>This is not an image.</source>
+ <translation>Esto no es una imagen.</translation>
+ </message>
+ <message>
+ <source>Critical Export Error</source>
+ <translation type="unfinished">Error de exportación crítico</translation>
+ </message>
+ <message>
+ <source>Could not write %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Export failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Check "%1" in
+%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Could not read %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Critical Error</source>
+ <translation type="unfinished">Error crítico</translation>
+ </message>
+ <message>
+ <source>Couldn't start zip to compress data.</source>
+ <translation type="unfinished">No pudo iniciar zip para comprimir datos.</translation>
+ </message>
+ <message>
+ <source>zip didn't exit normally</source>
+ <translation type="unfinished">zip no salió normalmente</translation>
+ </message>
+ <message>
+ <source>Couldn't start unzip to decompress data.</source>
+ <translation type="unfinished">No pudo iniciar zip para descomprimir datos.</translation>
+ </message>
+ <message>
+ <source>unzip didn't exit normally</source>
+ <translation type="unfinished">unzip no salió normalmente</translation>
+ </message>
+ <message>
+ <source>Could not start %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>%1 didn't exit normally</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Overwrite</source>
+ <translation type="unfinished">Sobreescribir</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancelar</translation>
+ </message>
+ <message>
+ <source>Sorry, no preview for
+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>
@@ -1769,96 +1939,13 @@
to notifiy Browsers of changed bookmarks.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>QObject</name>
- <message>
- <source>This is not an image.</source>
- <translation>Esto no es una imagen.</translation>
- </message>
- <message>
- <source>Critical Export Error</source>
- <translation type="unfinished">Error de exportación crítico</translation>
- </message>
- <message>
- <source>Could not write %1</source>
+ <message>
+ <source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Export failed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Check "%1" in
-%2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Could not read %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Critical Error</source>
- <translation type="unfinished">Error crítico</translation>
- </message>
- <message>
- <source>Couldn't start zip to compress data.</source>
- <translation type="unfinished">No pudo iniciar zip para comprimir datos.</translation>
- </message>
- <message>
- <source>zip didn't exit normally</source>
- <translation type="unfinished">zip no salió normalmente</translation>
- </message>
- <message>
- <source>Couldn't start unzip to decompress data.</source>
- <translation type="unfinished">No pudo iniciar zip para descomprimir datos.</translation>
- </message>
- <message>
- <source>unzip didn't exit normally</source>
- <translation type="unfinished">unzip no salió normalmente</translation>
- </message>
- <message>
- <source>Could not start %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>%1 didn't exit normally</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>The file %1 exists already.
-Do you want to overwrite it?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Overwrite</source>
- <translation type="unfinished">Sobreescribir</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation type="unfinished">Cancelar</translation>
- </message>
- <message>
- <source>Sorry, no preview for
-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>
+ <source>Couldn't access temporary directory
+</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1870,14 +1957,18 @@
</message>
<message>
<source>Close</source>
- <translation type="obsolete">Cerrar</translation>
+ <translation type="unfinished">Cerrar</translation>
+ </message>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TextEditor</name>
<message>
<source>&File</source>
- <translation>&Archivo</translation>
+ <translation type="obsolete">&Archivo</translation>
</message>
<message>
<source>Import</source>
@@ -2112,10 +2203,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>File Actions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit Actions</source>
<translation type="unfinished"></translation>
</message>
@@ -2127,6 +2214,14 @@
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Note Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Note</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>WarningDialog</name>
diff -r 5f6e176e9718 -r c79df732d095 lang/vym_it.ts
--- a/lang/vym_it.ts Wed Sep 06 12:47:06 2006 +0000
+++ b/lang/vym_it.ts Fri Sep 08 12:30:09 2006 +0000
@@ -3,6 +3,11 @@
<name>AboutDialog</name>
<message>
<source>Ok</source>
+ <translation type="obsolete">Ok</translation>
+ </message>
+ <message>
+ <source>Ok</source>
+ <comment>Ok Button</comment>
<translation type="unfinished">Ok</translation>
</message>
</context>
@@ -274,12 +279,60 @@
<source>Find Text</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Text to find:</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HistoryWindow</name>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Redo</source>
+ <translation type="unfinished">Rifai</translation>
+ </message>
+ <message>
+ <source>New Row</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Comment</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo</source>
+ <translation type="unfinished">Annulla</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation type="unfinished">Chiudi</translation>
+ </message>
+ <message>
+ <source>Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Undo action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>now</source>
+ <comment>now bar in history hwindow</comment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Main</name>
<message>
<source>&File</source>
- <translation>&File</translation>
+ <translation type="obsolete">&File</translation>
</message>
<message>
<source>New map</source>
@@ -449,7 +502,7 @@
</message>
<message>
<source>Jump to map</source>
- <translation>Salta ad una mappa</translation>
+ <translation type="obsolete">Salta ad una mappa</translation>
</message>
<message>
<source>Edit link to another vym map</source>
@@ -1268,14 +1321,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>pasting into new branch</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Delete key for deleting branches</source>
<translation type="unfinished"></translation>
</message>
@@ -1483,10 +1528,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>%1...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Couldn't find configuration for export to Open Office
</source>
<translation type="unfinished"></translation>
@@ -1495,6 +1536,44 @@
<source>No matches found for "%1"</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>&Map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all URLs in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open xlinked map</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Open all vym links in subtree</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>URLs and vymLinks</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before load
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Couldn't create temporary directory before save
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MapEditor</name>
@@ -1592,7 +1671,7 @@
</message>
<message>
<source>vym - save image as</source>
- <translation>vym - salva immagine come</translation>
+ <translation type="obsolete">vym - salva immagine come</translation>
</message>
<message>
<source>vym - Save image as </source>
@@ -1745,10 +1824,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Save image as %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>The file %1 exists already.
Do you want to overwrite it?</source>
<translation type="unfinished"></translation>
@@ -1767,6 +1842,101 @@
</message>
<message>
<source>Warning</source>
+ <translation type="obsolete">Attenzione</translation>
+ </message>
+ <message>
+ <source>History for </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Save image</source>
+ <translation type="unfinished">Salva immagine</translation>
+ </message>
+</context>
+<context>
+ <name>QObject</name>
+ <message>
+ <source>This is not an image.</source>
+ <translation>Questa non è un immagine.</translation>
+ </message>
+ <message>
+ <source>The file %1 exists already.
+Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Overwrite</source>
+ <translation type="unfinished">Sovvrascrivi</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="unfinished">Cancella</translation>
+ </message>
+ <message>
+ <source>Critical Export Error</source>
+ <translation type="unfinished">Errore critico nell'esportazione</translation>
+ </message>
+ <message>
+ <source>Could not write %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Export failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Check "%1" in
+%2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Could not read %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Critical Error</source>
+ <translation type="unfinished">Errore Critico</translation>
+ </message>
+ <message>
+ <source>Couldn't start zip to compress data.</source>
+ <translation type="unfinished">Non è possibile iniziare lo zip per la decompressione dei dati.</translation>
+ </message>
+ <message>
+ <source>zip didn't exit normally</source>
+ <translation type="unfinished">lo zip non è finito normalmente</translation>
+ </message>
+ <message>
+ <source>Couldn't start unzip to decompress data.</source>
+ <translation type="unfinished">Non è possibile iniziare l'unzip per la decompressione dei dati.</translation>
+ </message>
+ <message>
+ <source>unzip didn't exit normally</source>
+ <translation type="unfinished">unzip non è finito normalmente</translation>
+ </message>
+ <message>
+ <source>Sorry, no preview for
+multiple selected files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Could not start %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <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>
@@ -1774,96 +1944,13 @@
to notifiy Browsers of changed bookmarks.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>QObject</name>
- <message>
- <source>This is not an image.</source>
- <translation>Questa non è un immagine.</translation>
- </message>
- <message>
- <source>The file %1 exists already.
-Do you want to overwrite it?</source>
+ <message>
+ <source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Overwrite</source>
- <translation type="unfinished">Sovvrascrivi</translation>
- </message>
- <message>
- <source>Cancel</source>
- <translation type="unfinished">Cancella</translation>
- </message>
- <message>
- <source>Critical Export Error</source>
- <translation type="unfinished">Errore critico nell'esportazione</translation>
- </message>
- <message>
- <source>Could not write %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Export failed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Check "%1" in
-%2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Could not read %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Critical Error</source>
- <translation type="unfinished">Errore Critico</translation>
- </message>
- <message>
- <source>Couldn't start zip to compress data.</source>
- <translation type="unfinished">Non è possibile iniziare lo zip per la decompressione dei dati.</translation>
- </message>
- <message>
- <source>zip didn't exit normally</source>
- <translation type="unfinished">lo zip non è finito normalmente</translation>
- </message>
- <message>
- <source>Couldn't start unzip to decompress data.</source>
- <translation type="unfinished">Non è possibile iniziare l'unzip per la decompressione dei dati.</translation>
- </message>
- <message>
- <source>unzip didn't exit normally</source>
- <translation type="unfinished">unzip non è finito normalmente</translation>
- </message>
- <message>
- <source>Sorry, no preview for
-multiple selected files.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>Could not start %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <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>
+ <source>Couldn't access temporary directory
+</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1875,14 +1962,18 @@
</message>
<message>
<source>Close</source>
- <translation type="obsolete">Chiudi</translation>
+ <translation type="unfinished">Chiudi</translation>
+ </message>
+ <message>
+ <source>Dialog</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TextEditor</name>
<message>
<source>&File</source>
- <translation>&File</translation>
+ <translation type="obsolete">&File</translation>
</message>
<message>
<source>Import</source>
@@ -2117,10 +2208,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>File Actions</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Edit Actions</source>
<translation type="unfinished"></translation>
</message>
@@ -2132,6 +2219,14 @@
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Note Actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>&Note</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>WarningDialog</name>
diff -r 5f6e176e9718 -r c79df732d095 mapeditor.cpp
--- a/mapeditor.cpp Wed Sep 06 12:47:06 2006 +0000
+++ b/mapeditor.cpp Fri Sep 08 12:30:09 2006 +0000
@@ -209,7 +209,8 @@
fileName=tr("unnamed");
mapName="";
- undosTotal=settings.readNumEntry("/mapeditor/undoLevels",50);
+ stepsTotal=settings.readNumEntry("/mapeditor/stepsTotal",5);
+ undoSet.setEntry ("/history/stepsTotal",QString::number(stepsTotal));
// Initialize find routine
itFind=NULL;
@@ -232,6 +233,11 @@
updateViewCenter();
mapCenter->reposition(); // for positioning heading
+
+ // Initialize history window;
+ historyWindow.setME(this);
+ historyWindow.setStepsTotal(stepsTotal);
+ historyWindow.update (undoSet);
}
MapEditor::~MapEditor()
@@ -545,11 +551,12 @@
setChanged();
int undosAvail=undoSet.readNumEntry ("/history/undosAvail",0);
+ int redosAvail=undoSet.readNumEntry ("/history/redosAvail",0);
int curStep=undoSet.readNumEntry ("/history/curStep",0);
// Find out current undo directory
- if (undosAvail<undosTotal) undosAvail++;
+ if (undosAvail<stepsTotal) undosAvail++;
curStep++;
- if (curStep>undosTotal) curStep=1;
+ if (curStep>stepsTotal) curStep=1;
QString backupXML;
QString bakMapDir=QDir::convertSeparators (QString(tmpMapDir+"/undo-%1").arg(curStep));
@@ -594,8 +601,9 @@
/* TODO remove after testing
*/
//cout << " into="<< histPath.toStdString()<<endl;
- cout << " undosTotal="<<undosTotal<<
+ cout << " stepsTotal="<<stepsTotal<<
", undosAvail="<<undosAvail<<
+ ", redosAvail="<<redosAvail<<
", curStep="<<curStep<<endl;
cout << " ---------------------------"<<endl;
cout << " comment="<<comment.toStdString()<<endl;
@@ -1292,10 +1300,13 @@
int curStep=undoSet.readNumEntry (QString("/history/curStep"));
int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
- if (redosAvail>0) redosAvail--;
- if (undosAvail<undosTotal) undosAvail++;
+ // Can we undo at all?
+ if (redosAvail<1) return;
+ redosAvail--;
+
+ if (undosAvail<stepsTotal) undosAvail++;
curStep++;
- if (curStep>undosTotal) curStep=1;
+ if (curStep>stepsTotal) curStep=1;
QString undoCommand= undoSet.readEntry (QString("/history/step-%1/undoCommand").arg(curStep));
QString undoSelection=undoSet.readEntry (QString("/history/step-%1/undoSelection").arg(curStep));
QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
@@ -1335,6 +1346,7 @@
undoSet.setEntry ("/history/curStep",QString::number(curStep));
undoSet.writeSettings(histPath);
+ historyWindow.update (undoSet);
updateActions();
/* TODO remove testing
@@ -1356,6 +1368,10 @@
int curStep=undoSet.readNumEntry (QString("/history/curStep"));
int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
+
+ // Can we undo at all?
+ if (undosAvail<1) return;
+
QString undoCommand= undoSet.readEntry (QString("/history/step-%1/undoCommand").arg(curStep));
QString undoSelection=undoSet.readEntry (QString("/history/step-%1/undoSelection").arg(curStep));
QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
@@ -1387,7 +1403,7 @@
undosAvail--;
curStep--;
- if (curStep<1) curStep=undosTotal;
+ if (curStep<1) curStep=stepsTotal;
redosAvail++;
@@ -1405,9 +1421,30 @@
undoSet.setEntry ("/history/curStep",QString::number(curStep));
undoSet.writeSettings(histPath);
+ historyWindow.update (undoSet);
updateActions();
}
+void MapEditor::gotoStep (int i)
+{
+ // Restore variables
+ int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
+
+ if (i<0) return;
+
+ // Clicking above current steps let's us undo things
+ if (i<undosAvail)
+ {
+ for (int j=0; j<undosAvail-i; j++) undo();
+ return;
+ }
+ // Clicking below current steps let's us rendo things
+ if (i>undosAvail)
+ for (int j=undosAvail; j<i; j++) redo();
+
+ // And ignore clicking the current row ;-)
+}
+
void MapEditor::undoXML(const QString &undoSel, const QString &bakMapPath)
{
QString bakMapDir=bakMapPath.left(bakMapPath.findRev("/"));
diff -r 5f6e176e9718 -r c79df732d095 mapeditor.h
--- a/mapeditor.h Wed Sep 06 12:47:06 2006 +0000
+++ b/mapeditor.h Fri Sep 08 12:30:09 2006 +0000
@@ -91,6 +91,7 @@
void copy(); // copy branch to clipboard
void redo(); // redo last action
void undo(); // undo last action
+ void gotoStep (int);// goto a step in history
private:
void undoXML(const QString &, const QString &);
void pasteNoSave(); // paste clipboard to branch
@@ -249,7 +250,7 @@
bool isInteractive; // non interactive don't need tmpdirs
QString tmpMapDir; // tmp directory with undo history
QString histPath; // Path to history file
- int undosTotal; // total number of undos
+ int stepsTotal; // total number of steps (undos+redos)
SimpleSettings undoSet; // undo/redo commands
bool blockReposition; // block while load or undo
bool blockSaveState; // block while load or undo
@@ -262,9 +263,9 @@
void resizeEvent( QResizeEvent * );
- Q3UrlOperator *urlOperator;
- QDataStream *imageData;
- QBuffer *imageBuffer;
+ Q3UrlOperator *urlOperator;
+ QDataStream *imageData;
+ QBuffer *imageBuffer;
HistoryWindow historyWindow;
diff -r 5f6e176e9718 -r c79df732d095 tex/vym.changelog
--- a/tex/vym.changelog Wed Sep 06 12:47:06 2006 +0000
+++ b/tex/vym.changelog Fri Sep 08 12:30:09 2006 +0000
@@ -1,5 +1,5 @@
-------------------------------------------------------------------
-Wed Sep 6 14:43:09 CEST 2006 - uwedr
+Wed Sep 8 14:43:09 CEST 2006 - uwedr
- Version: 1.8.56
- Feature: New History window, started to port designer stuff to QT4
diff -r 5f6e176e9718 -r c79df732d095 version.h
--- a/version.h Wed Sep 06 12:47:06 2006 +0000
+++ b/version.h Fri Sep 08 12:30:09 2006 +0000
@@ -3,6 +3,6 @@
#define __VYM "VYM"
#define __VYM_VERSION "1.8.55"
-#define __BUILD_DATE "September 5, 2006"
+#define __BUILD_DATE "September 8, 2006"
#endif