1.1 --- a/aboutdialog.cpp Wed Sep 06 12:47:06 2006 +0000
1.2 +++ b/aboutdialog.cpp Fri Sep 08 12:30:09 2006 +0000
1.3 @@ -173,7 +173,7 @@
1.4 tabs->showPage (credits);
1.5
1.6 okbutton =new QPushButton (this,"okbutton");
1.7 - okbutton->setText (tr("Ok"));
1.8 + okbutton->setText (tr("Ok","Ok Button"));
1.9 okbutton->setMaximumSize (QSize (50,30));
1.10 okbutton->setAutoDefault (true);
1.11 mainLayout->addWidget( okbutton);
2.1 Binary file demos/todo.vym has changed
3.1 --- a/historywindow.cpp Wed Sep 06 12:47:06 2006 +0000
3.2 +++ b/historywindow.cpp Fri Sep 08 12:30:09 2006 +0000
3.3 @@ -1,4 +1,5 @@
3.4 #include "historywindow.h"
3.5 +#include "mapeditor.h"
3.6
3.7 HistoryWindow::HistoryWindow (QWidget *parent):QDialog (parent)
3.8 {
3.9 @@ -19,28 +20,109 @@
3.10 ui.historyTable->setHorizontalHeaderItem(2, item);
3.11
3.12 ui.historyTable->setSelectionBehavior (QAbstractItemView::SelectRows);
3.13 +
3.14 + connect ( ui.undoButton, SIGNAL (clicked()), this, SLOT (undo()));
3.15 + connect ( ui.redoButton, SIGNAL (clicked()), this, SLOT (redo()));
3.16 + connect ( ui.historyTable, SIGNAL (itemSelectionChanged()), this, SLOT (select()));
3.17 }
3.18
3.19
3.20 +void HistoryWindow::updateRow(int row, int step, SimpleSettings &set)
3.21 +{
3.22 + QTableWidgetItem *item;
3.23 +
3.24 + item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/redoCommand").arg(step)));
3.25 + ui.historyTable->setItem(row, 0, item);
3.26 +
3.27 + item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/comment").arg(step)));
3.28 + ui.historyTable->setItem(row, 1, item);
3.29 +
3.30 + item=new QTableWidgetItem(set.readEntry(QString("/history/step-%1/undoCommand").arg(step)));
3.31 + ui.historyTable->setItem(row, 2, item);
3.32 +}
3.33 +
3.34 void HistoryWindow::update(SimpleSettings &set)
3.35 {
3.36 - //int rows=set.readNumEntry("/history/undosTotal");
3.37 - //ui.historyTable->setRowCount (rows);
3.38 + int undosAvail=set.readNumEntry("/history/undosAvail",0);
3.39 + int redosAvail=set.readNumEntry("/history/redosAvail",0);
3.40 + int stepsTotal=set.readNumEntry("/history/stepsTotal",0);
3.41 + int curStep=set.readNumEntry ("/history/curStep");
3.42 + int i;
3.43 + int s=curStep;
3.44 + int r=undosAvail-1;
3.45 + QTableWidgetItem *item;
3.46
3.47 - int i;
3.48 - for (i=0;i<= set.readNumEntry("/history/undosAvail",0); i++)
3.49 + // Update buttons
3.50 + if (undosAvail<1)
3.51 + ui.undoButton->setEnabled (false);
3.52 + else
3.53 + ui.undoButton->setEnabled (true);
3.54 +
3.55 + if (redosAvail<1)
3.56 + ui.redoButton->setEnabled (false);
3.57 + else
3.58 + ui.redoButton->setEnabled (true);
3.59 +
3.60 + // Update table
3.61 + for (i=undosAvail; i>0; i--)
3.62 {
3.63 - QTableWidgetItem *item;
3.64 + updateRow (r,s,set);
3.65 + r--;
3.66 + s--;
3.67 + if (s<1) s=stepsTotal;
3.68 + }
3.69 +
3.70 + // Generated the "now" row
3.71 + QColor c(255,200,120);
3.72 + for (i=0;i<=2;i++)
3.73 + {
3.74 + if (i!=1)
3.75 + {
3.76 + item=new QTableWidgetItem("");
3.77 + item->setBackgroundColor (c);
3.78 + ui.historyTable->setItem(undosAvail, i, item);
3.79 + }
3.80 + }
3.81 + item=new QTableWidgetItem(" - " +tr("Current state","current bar in history hwindow")+ " - ");
3.82 + item->setBackgroundColor (c);
3.83 + ui.historyTable->setItem(undosAvail, 1, item);
3.84
3.85 - item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/redoCommand").arg(i)));
3.86 - ui.historyTable->setItem(i, 0, item);
3.87
3.88 - item= new QTableWidgetItem(set.readEntry(QString("/history/step-%1/comment").arg(i)));
3.89 - ui.historyTable->setItem(i, 1, item);
3.90 + s=curStep;
3.91 + s++; if (s>stepsTotal) s=1;
3.92
3.93 - item=new QTableWidgetItem(set.readEntry(QString("/history/step-%1/undoCommand").arg(i)));
3.94 - ui.historyTable->setItem(i, 2, item);
3.95 + for (i=1;i<= redosAvail; i++)
3.96 + {
3.97 + updateRow (undosAvail+i,s,set);
3.98 + s++; if (s>stepsTotal) s=1;
3.99 }
3.100
3.101 ui.historyTable->resizeColumnsToContents();
3.102 }
3.103 +
3.104 +void HistoryWindow::setME (MapEditor *me)
3.105 +{
3.106 + mapEditor=me;
3.107 +}
3.108 +
3.109 +void HistoryWindow::setStepsTotal (int st)
3.110 +{
3.111 + // Number of steps + "current" bar
3.112 + ui.historyTable->setRowCount (st+1);
3.113 +
3.114 +}
3.115 +
3.116 +void HistoryWindow::undo()
3.117 +{
3.118 + mapEditor->undo();
3.119 +}
3.120 +
3.121 +void HistoryWindow::redo()
3.122 +{
3.123 + mapEditor->redo();
3.124 +}
3.125 +
3.126 +void HistoryWindow::select()
3.127 +{
3.128 + mapEditor->gotoStep (ui.historyTable->row (ui.historyTable->selectedItems().first()));
3.129 +}
4.1 --- a/historywindow.h Wed Sep 06 12:47:06 2006 +0000
4.2 +++ b/historywindow.h Fri Sep 08 12:30:09 2006 +0000
4.3 @@ -1,9 +1,13 @@
4.4 #ifndef HISTORYWINDOW_H
4.5 #define HISTORYWINDOW_H
4.6
4.7 +//#include "mapeditor.h"
4.8 #include "settings.h"
4.9 #include "ui_historywindow.h"
4.10
4.11 +
4.12 +class MapEditor;
4.13 +
4.14 /////////////////////////////////////////////////////////////////////////////
4.15 class HistoryWindow:public QDialog
4.16 {
4.17 @@ -12,10 +16,18 @@
4.18 public:
4.19 HistoryWindow(QWidget* parent = 0);
4.20 void update (SimpleSettings &);
4.21 -
4.22 + void setME (MapEditor *);
4.23 + void setStepsTotal (int);
4.24 +
4.25 +private slots:
4.26 + void undo();
4.27 + void redo();
4.28 + void select();
4.29
4.30 private:
4.31 + void updateRow (int, int, SimpleSettings &);
4.32 Ui::HistoryWindow ui;
4.33 + MapEditor *mapEditor;
4.34 };
4.35
4.36
5.1 --- a/lang/vym_de.ts Wed Sep 06 12:47:06 2006 +0000
5.2 +++ b/lang/vym_de.ts Fri Sep 08 12:30:09 2006 +0000
5.3 @@ -3,6 +3,11 @@
5.4 <name>AboutDialog</name>
5.5 <message>
5.6 <source>Ok</source>
5.7 + <translation type="obsolete">Ok</translation>
5.8 + </message>
5.9 + <message>
5.10 + <source>Ok</source>
5.11 + <comment>Ok Button</comment>
5.12 <translation>Ok</translation>
5.13 </message>
5.14 </context>
5.15 @@ -327,12 +332,60 @@
5.16 <source>Find Text</source>
5.17 <translation>Text suchen</translation>
5.18 </message>
5.19 + <message>
5.20 + <source>Text to find:</source>
5.21 + <translation>Suchen nach:</translation>
5.22 + </message>
5.23 +</context>
5.24 +<context>
5.25 + <name>HistoryWindow</name>
5.26 + <message>
5.27 + <source>Dialog</source>
5.28 + <translation type="unfinished"></translation>
5.29 + </message>
5.30 + <message>
5.31 + <source>Redo</source>
5.32 + <translation type="unfinished">Wiederherstellen</translation>
5.33 + </message>
5.34 + <message>
5.35 + <source>New Row</source>
5.36 + <translation type="unfinished"></translation>
5.37 + </message>
5.38 + <message>
5.39 + <source>Time</source>
5.40 + <translation type="unfinished"></translation>
5.41 + </message>
5.42 + <message>
5.43 + <source>Comment</source>
5.44 + <translation type="unfinished"></translation>
5.45 + </message>
5.46 + <message>
5.47 + <source>Undo</source>
5.48 + <translation type="unfinished">Rückgängig</translation>
5.49 + </message>
5.50 + <message>
5.51 + <source>Close</source>
5.52 + <translation type="unfinished">Schliessen</translation>
5.53 + </message>
5.54 + <message>
5.55 + <source>Action</source>
5.56 + <translation type="unfinished"></translation>
5.57 + </message>
5.58 + <message>
5.59 + <source>Undo action</source>
5.60 + <translation type="unfinished"></translation>
5.61 + </message>
5.62 + <message>
5.63 + <source>now</source>
5.64 + <comment>now bar in history hwindow</comment>
5.65 + <translation type="unfinished"></translation>
5.66 + </message>
5.67 </context>
5.68 <context>
5.69 <name>Main</name>
5.70 <message>
5.71 <source>&File</source>
5.72 - <translation>&Datei</translation>
5.73 + <translation type="obsolete">&Datei</translation>
5.74 </message>
5.75 <message>
5.76 <source>New map</source>
5.77 @@ -492,7 +545,7 @@
5.78 </message>
5.79 <message>
5.80 <source>Jump to map</source>
5.81 - <translation>Gehe zu einer weiteren Map.</translation>
5.82 + <translation type="obsolete">Gehe zu einer weiteren Map.</translation>
5.83 </message>
5.84 <message>
5.85 <source>Edit link to another vym map</source>
5.86 @@ -1217,11 +1270,11 @@
5.87 </message>
5.88 <message>
5.89 <source>Pasting into new branch</source>
5.90 - <translation>In neuen Zweig einfügen</translation>
5.91 + <translation type="obsolete">In neuen Zweig einfügen</translation>
5.92 </message>
5.93 <message>
5.94 <source>pasting into new branch</source>
5.95 - <translation>In neuen Zweig einfügen</translation>
5.96 + <translation type="obsolete">In neuen Zweig einfügen</translation>
5.97 </message>
5.98 <message>
5.99 <source>Delete key for deleting branches</source>
5.100 @@ -1669,10 +1722,6 @@
5.101 <translation type="unfinished"></translation>
5.102 </message>
5.103 <message>
5.104 - <source>%1...</source>
5.105 - <translation type="unfinished"></translation>
5.106 - </message>
5.107 - <message>
5.108 <source>Couldn't find configuration for export to Open Office
5.109 </source>
5.110 <translation type="unfinished"></translation>
5.111 @@ -1681,6 +1730,44 @@
5.112 <source>No matches found for "%1"</source>
5.113 <translation type="unfinished"></translation>
5.114 </message>
5.115 + <message>
5.116 + <source>&Map</source>
5.117 + <translation type="unfinished"></translation>
5.118 + </message>
5.119 + <message>
5.120 + <source>&Actions</source>
5.121 + <translation type="unfinished"></translation>
5.122 + </message>
5.123 + <message>
5.124 + <source>Open all URLs in subtree</source>
5.125 + <translation type="unfinished"></translation>
5.126 + </message>
5.127 + <message>
5.128 + <source>Open xlinked map</source>
5.129 + <translation type="unfinished"></translation>
5.130 + </message>
5.131 + <message>
5.132 + <source>Open all vym links in subtree</source>
5.133 + <translation type="unfinished"></translation>
5.134 + </message>
5.135 + <message>
5.136 + <source>URLs and vymLinks</source>
5.137 + <translation type="unfinished"></translation>
5.138 + </message>
5.139 + <message>
5.140 + <source>Couldn't create temporary directory before load
5.141 +</source>
5.142 + <translation type="unfinished"></translation>
5.143 + </message>
5.144 + <message>
5.145 + <source>Couldn't create temporary directory before save
5.146 +</source>
5.147 + <translation type="unfinished"></translation>
5.148 + </message>
5.149 + <message>
5.150 + <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
5.151 + <translation type="unfinished"></translation>
5.152 + </message>
5.153 </context>
5.154 <context>
5.155 <name>MapEditor</name>
5.156 @@ -1889,7 +1976,7 @@
5.157 </message>
5.158 <message>
5.159 <source>vym - save image as</source>
5.160 - <translation>vym - Speichere Bild als</translation>
5.161 + <translation type="obsolete">vym - Speichere Bild als</translation>
5.162 </message>
5.163 <message>
5.164 <source>vym - Save image as </source>
5.165 @@ -2098,7 +2185,7 @@
5.166 </message>
5.167 <message>
5.168 <source>Save image as %1</source>
5.169 - <translation>Speichere Bild unter %1</translation>
5.170 + <translation type="obsolete">Speichere Bild unter %1</translation>
5.171 </message>
5.172 <message>
5.173 <source>Choose directory structure to import</source>
5.174 @@ -2122,6 +2209,128 @@
5.175 </message>
5.176 <message>
5.177 <source>Warning</source>
5.178 + <translation type="obsolete">Warnung</translation>
5.179 + </message>
5.180 + <message>
5.181 + <source>Couldn't find script %1
5.182 +to notifiy Browsers of changed bookmarks.</source>
5.183 + <translation type="obsolete">Konnte das Script %1
5.184 +nicht finden, das nötig ist um die
5.185 +Browser auf die geänderten Lesezeichen
5.186 +hinzuweisen. </translation>
5.187 + </message>
5.188 + <message>
5.189 + <source>History for </source>
5.190 + <translation type="unfinished"></translation>
5.191 + </message>
5.192 + <message>
5.193 + <source>Save image</source>
5.194 + <translation type="unfinished">Speichere Bild</translation>
5.195 + </message>
5.196 +</context>
5.197 +<context>
5.198 + <name>QMessageBox</name>
5.199 + <message>
5.200 + <source>Critical Error</source>
5.201 + <translation type="obsolete">Kritischer Fehler</translation>
5.202 + </message>
5.203 +</context>
5.204 +<context>
5.205 + <name>QObject</name>
5.206 + <message>
5.207 + <source>new branch</source>
5.208 + <translation type="obsolete">Neuer Zweig</translation>
5.209 + </message>
5.210 + <message>
5.211 + <source>New Map</source>
5.212 + <translation type="obsolete">Neue Map</translation>
5.213 + </message>
5.214 + <message>
5.215 + <source>This is not an image.</source>
5.216 + <translation>Das ist kein Bild.</translation>
5.217 + </message>
5.218 + <message>
5.219 + <source>Critical Export Error</source>
5.220 + <translation>Kritischer Fehler beim Exportieren</translation>
5.221 + </message>
5.222 + <message>
5.223 + <source>Could not write %1</source>
5.224 + <translation>%1 konnte nicht </translation>
5.225 + </message>
5.226 + <message>
5.227 + <source>Export failed.</source>
5.228 + <translation>Export fehlgeschlagen.</translation>
5.229 + </message>
5.230 + <message>
5.231 + <source>Check "%1" in
5.232 +%2</source>
5.233 + <translation>Bitte "%1" prüfen in
5.234 +%2</translation>
5.235 + </message>
5.236 + <message>
5.237 + <source>Could not read %1</source>
5.238 + <translation>%1 konnte nicht gelesen werden</translation>
5.239 + </message>
5.240 + <message>
5.241 + <source>Critical Error</source>
5.242 + <translation>Kritischer Fehler</translation>
5.243 + </message>
5.244 + <message>
5.245 + <source>Couldn't start zip to compress data.</source>
5.246 + <translation>Konnte zip nicht starten, um Daten zu komprimieren.</translation>
5.247 + </message>
5.248 + <message>
5.249 + <source>zip didn't exit normally</source>
5.250 + <translation>zip wurde nicht richtig beendet</translation>
5.251 + </message>
5.252 + <message>
5.253 + <source>Couldn't start unzip to decompress data.</source>
5.254 + <translation>Konnte unzip nicht starten, um Daten zu dekomprimieren.</translation>
5.255 + </message>
5.256 + <message>
5.257 + <source>unzip didn't exit normally</source>
5.258 + <translation>unzip wurde nicht richtig beendet</translation>
5.259 + </message>
5.260 + <message>
5.261 + <source>Could not start %1</source>
5.262 + <translation>%1 konnte nicht gestartet werden</translation>
5.263 + </message>
5.264 + <message>
5.265 + <source>%1 didn't exit normally</source>
5.266 + <translation>%1 wurde nicht richtig beendet</translation>
5.267 + </message>
5.268 + <message>
5.269 + <source>The file %1 exists already.
5.270 +Do you want to overwrite it?</source>
5.271 + <translation>Die Datei %1 gibt es bereits.
5.272 +Wollen Sie sie überschreiben?</translation>
5.273 + </message>
5.274 + <message>
5.275 + <source>Overwrite</source>
5.276 + <translation>Überschreiben</translation>
5.277 + </message>
5.278 + <message>
5.279 + <source>Cancel</source>
5.280 + <translation>Abbrechen</translation>
5.281 + </message>
5.282 + <message>
5.283 + <source>Sorry, no preview for
5.284 +multiple selected files.</source>
5.285 + <translation>Leider keine Vorschau
5.286 +möglich für Mehrfachausahl.</translation>
5.287 + </message>
5.288 + <message>
5.289 + <source>Exporting the %1 bookmarks will overwrite
5.290 +your existing bookmarks file.</source>
5.291 + <translation>Das Exportieren der %1 Lesezeichen wird die
5.292 +bestehende Datei mit Lesezeichen überschreiben.</translation>
5.293 + </message>
5.294 + <message>
5.295 + <source>Warning: Overwriting %1 bookmarks</source>
5.296 + <translation>Warnung: Überschreiben der %1 Lesezeichen</translation>
5.297 + </message>
5.298 + <message>
5.299 + <source>Warning</source>
5.300 <translation>Warnung</translation>
5.301 </message>
5.302 <message>
5.303 @@ -2132,119 +2341,14 @@
5.304 Browser auf die geänderten Lesezeichen
5.305 hinzuweisen. </translation>
5.306 </message>
5.307 -</context>
5.308 -<context>
5.309 - <name>QMessageBox</name>
5.310 - <message>
5.311 - <source>Critical Error</source>
5.312 - <translation type="obsolete">Kritischer Fehler</translation>
5.313 - </message>
5.314 -</context>
5.315 -<context>
5.316 - <name>QObject</name>
5.317 - <message>
5.318 - <source>new branch</source>
5.319 - <translation type="obsolete">Neuer Zweig</translation>
5.320 - </message>
5.321 - <message>
5.322 - <source>New Map</source>
5.323 - <translation type="obsolete">Neue Map</translation>
5.324 - </message>
5.325 - <message>
5.326 - <source>This is not an image.</source>
5.327 - <translation>Das ist kein Bild.</translation>
5.328 - </message>
5.329 - <message>
5.330 - <source>Critical Export Error</source>
5.331 - <translation>Kritischer Fehler beim Exportieren</translation>
5.332 - </message>
5.333 - <message>
5.334 - <source>Could not write %1</source>
5.335 - <translation>%1 konnte nicht </translation>
5.336 - </message>
5.337 - <message>
5.338 - <source>Export failed.</source>
5.339 - <translation>Export fehlgeschlagen.</translation>
5.340 - </message>
5.341 - <message>
5.342 - <source>Check "%1" in
5.343 -%2</source>
5.344 - <translation>Bitte "%1" prüfen in
5.345 -%2</translation>
5.346 - </message>
5.347 - <message>
5.348 - <source>Could not read %1</source>
5.349 - <translation>%1 konnte nicht gelesen werden</translation>
5.350 - </message>
5.351 - <message>
5.352 - <source>Critical Error</source>
5.353 - <translation>Kritischer Fehler</translation>
5.354 - </message>
5.355 - <message>
5.356 - <source>Couldn't start zip to compress data.</source>
5.357 - <translation>Konnte zip nicht starten, um Daten zu komprimieren.</translation>
5.358 - </message>
5.359 - <message>
5.360 - <source>zip didn't exit normally</source>
5.361 - <translation>zip wurde nicht richtig beendet</translation>
5.362 - </message>
5.363 - <message>
5.364 - <source>Couldn't start unzip to decompress data.</source>
5.365 - <translation>Konnte unzip nicht starten, um Daten zu dekomprimieren.</translation>
5.366 - </message>
5.367 - <message>
5.368 - <source>unzip didn't exit normally</source>
5.369 - <translation>unzip wurde nicht richtig beendet</translation>
5.370 - </message>
5.371 - <message>
5.372 - <source>Could not start %1</source>
5.373 - <translation>%1 konnte nicht gestartet werden</translation>
5.374 - </message>
5.375 - <message>
5.376 - <source>%1 didn't exit normally</source>
5.377 - <translation>%1 wurde nicht richtig beendet</translation>
5.378 - </message>
5.379 - <message>
5.380 - <source>The file %1 exists already.
5.381 -Do you want to overwrite it?</source>
5.382 - <translation>Die Datei %1 gibt es bereits.
5.383 -Wollen Sie sie überschreiben?</translation>
5.384 - </message>
5.385 - <message>
5.386 - <source>Overwrite</source>
5.387 - <translation>Überschreiben</translation>
5.388 - </message>
5.389 - <message>
5.390 - <source>Cancel</source>
5.391 - <translation>Abbrechen</translation>
5.392 - </message>
5.393 - <message>
5.394 - <source>Sorry, no preview for
5.395 -multiple selected files.</source>
5.396 - <translation>Leider keine Vorschau
5.397 -möglich für Mehrfachausahl.</translation>
5.398 - </message>
5.399 - <message>
5.400 - <source>Exporting the %1 bookmarks will overwrite
5.401 -your existing bookmarks file.</source>
5.402 - <translation>Das Exportieren der %1 Lesezeichen wird die
5.403 -bestehende Datei mit Lesezeichen überschreiben.</translation>
5.404 - </message>
5.405 - <message>
5.406 - <source>Warning: Overwriting %1 bookmarks</source>
5.407 - <translation>Warnung: Überschreiben der %1 Lesezeichen</translation>
5.408 - </message>
5.409 - <message>
5.410 - <source>Warning</source>
5.411 - <translation>Warnung</translation>
5.412 - </message>
5.413 - <message>
5.414 - <source>Couldn't find script %1
5.415 -to notifiy Browsers of changed bookmarks.</source>
5.416 - <translation>Konnte das Script %1
5.417 -nicht finden, das nötig ist um die
5.418 -Browser auf die geänderten Lesezeichen
5.419 -hinzuweisen. </translation>
5.420 + <message>
5.421 + <source>Error</source>
5.422 + <translation type="unfinished"></translation>
5.423 + </message>
5.424 + <message>
5.425 + <source>Couldn't access temporary directory
5.426 +</source>
5.427 + <translation type="unfinished"></translation>
5.428 </message>
5.429 </context>
5.430 <context>
5.431 @@ -2255,18 +2359,22 @@
5.432 </message>
5.433 <message>
5.434 <source>Close</source>
5.435 - <translation type="obsolete">Schliessen</translation>
5.436 + <translation type="unfinished">Schliessen</translation>
5.437 </message>
5.438 <message>
5.439 <source>History of %1</source>
5.440 <translation type="obsolete">Verlauf von %1</translation>
5.441 </message>
5.442 + <message>
5.443 + <source>Dialog</source>
5.444 + <translation type="unfinished"></translation>
5.445 + </message>
5.446 </context>
5.447 <context>
5.448 <name>TextEditor</name>
5.449 <message>
5.450 <source>&File</source>
5.451 - <translation>&Datei</translation>
5.452 + <translation type="obsolete">&Datei</translation>
5.453 </message>
5.454 <message>
5.455 <source>Import</source>
5.456 @@ -2525,19 +2633,23 @@
5.457 <translation>F&ormat</translation>
5.458 </message>
5.459 <message>
5.460 - <source>File Actions</source>
5.461 - <translation type="unfinished"></translation>
5.462 - </message>
5.463 - <message>
5.464 <source>Edit Actions</source>
5.465 <translation type="unfinished"></translation>
5.466 </message>
5.467 <message>
5.468 <source>Format Actions</source>
5.469 + <translation type="unfinished">Format Actions</translation>
5.470 + </message>
5.471 + <message>
5.472 + <source>Print Document</source>
5.473 <translation type="unfinished"></translation>
5.474 </message>
5.475 <message>
5.476 - <source>Print Document</source>
5.477 + <source>Note Actions</source>
5.478 + <translation type="unfinished"></translation>
5.479 + </message>
5.480 + <message>
5.481 + <source>&Note</source>
5.482 <translation type="unfinished"></translation>
5.483 </message>
5.484 </context>
6.1 --- a/lang/vym_en.ts Wed Sep 06 12:47:06 2006 +0000
6.2 +++ b/lang/vym_en.ts Fri Sep 08 12:30:09 2006 +0000
6.3 @@ -3,19 +3,11 @@
6.4 <name>AboutDialog</name>
6.5 <message>
6.6 <source>Ok</source>
6.7 + <comment>Ok Button</comment>
6.8 <translation type="unfinished"></translation>
6.9 </message>
6.10 </context>
6.11 <context>
6.12 - <name>EditXLinkDialog</name>
6.13 -</context>
6.14 -<context>
6.15 - <name>ExportXHTMLDialog</name>
6.16 -</context>
6.17 -<context>
6.18 - <name>ExtraInfoDialog</name>
6.19 -</context>
6.20 -<context>
6.21 <name>FindWindow</name>
6.22 <message>
6.23 <source>Clear</source>
6.24 @@ -33,14 +25,58 @@
6.25 <source>Find Text</source>
6.26 <translation type="unfinished"></translation>
6.27 </message>
6.28 + <message>
6.29 + <source>Text to find:</source>
6.30 + <translation type="unfinished"></translation>
6.31 + </message>
6.32 +</context>
6.33 +<context>
6.34 + <name>HistoryWindow</name>
6.35 + <message>
6.36 + <source>Dialog</source>
6.37 + <translation type="unfinished"></translation>
6.38 + </message>
6.39 + <message>
6.40 + <source>Redo</source>
6.41 + <translation type="unfinished"></translation>
6.42 + </message>
6.43 + <message>
6.44 + <source>New Row</source>
6.45 + <translation type="unfinished"></translation>
6.46 + </message>
6.47 + <message>
6.48 + <source>Time</source>
6.49 + <translation type="unfinished"></translation>
6.50 + </message>
6.51 + <message>
6.52 + <source>Comment</source>
6.53 + <translation type="unfinished"></translation>
6.54 + </message>
6.55 + <message>
6.56 + <source>Undo</source>
6.57 + <translation type="unfinished"></translation>
6.58 + </message>
6.59 + <message>
6.60 + <source>Close</source>
6.61 + <translation type="unfinished"></translation>
6.62 + </message>
6.63 + <message>
6.64 + <source>Action</source>
6.65 + <translation type="unfinished"></translation>
6.66 + </message>
6.67 + <message>
6.68 + <source>Undo action</source>
6.69 + <translation type="unfinished"></translation>
6.70 + </message>
6.71 + <message>
6.72 + <source>now</source>
6.73 + <comment>now bar in history hwindow</comment>
6.74 + <translation type="unfinished"></translation>
6.75 + </message>
6.76 </context>
6.77 <context>
6.78 <name>Main</name>
6.79 <message>
6.80 - <source>&File</source>
6.81 - <translation type="unfinished"></translation>
6.82 - </message>
6.83 - <message>
6.84 <source>New map</source>
6.85 <comment>File menu</comment>
6.86 <translation type="unfinished"></translation>
6.87 @@ -191,10 +227,6 @@
6.88 <translation type="unfinished"></translation>
6.89 </message>
6.90 <message>
6.91 - <source>Jump to map</source>
6.92 - <translation type="unfinished"></translation>
6.93 - </message>
6.94 - <message>
6.95 <source>Edit link to another vym map</source>
6.96 <translation type="unfinished"></translation>
6.97 </message>
6.98 @@ -615,14 +647,6 @@
6.99 <translation type="unfinished"></translation>
6.100 </message>
6.101 <message>
6.102 - <source>Pasting into new branch</source>
6.103 - <translation type="unfinished"></translation>
6.104 - </message>
6.105 - <message>
6.106 - <source>pasting into new branch</source>
6.107 - <translation type="unfinished"></translation>
6.108 - </message>
6.109 - <message>
6.110 <source>Delete key for deleting branches</source>
6.111 <translation type="unfinished"></translation>
6.112 </message>
6.113 @@ -1028,10 +1052,6 @@
6.114 <translation type="unfinished"></translation>
6.115 </message>
6.116 <message>
6.117 - <source>%1...</source>
6.118 - <translation type="unfinished"></translation>
6.119 - </message>
6.120 - <message>
6.121 <source>Couldn't find configuration for export to Open Office
6.122 </source>
6.123 <translation type="unfinished"></translation>
6.124 @@ -1040,6 +1060,44 @@
6.125 <source>No matches found for "%1"</source>
6.126 <translation type="unfinished"></translation>
6.127 </message>
6.128 + <message>
6.129 + <source>&Map</source>
6.130 + <translation type="unfinished"></translation>
6.131 + </message>
6.132 + <message>
6.133 + <source>&Actions</source>
6.134 + <translation type="unfinished"></translation>
6.135 + </message>
6.136 + <message>
6.137 + <source>Open all URLs in subtree</source>
6.138 + <translation type="unfinished"></translation>
6.139 + </message>
6.140 + <message>
6.141 + <source>Open xlinked map</source>
6.142 + <translation type="unfinished"></translation>
6.143 + </message>
6.144 + <message>
6.145 + <source>Open all vym links in subtree</source>
6.146 + <translation type="unfinished"></translation>
6.147 + </message>
6.148 + <message>
6.149 + <source>URLs and vymLinks</source>
6.150 + <translation type="unfinished"></translation>
6.151 + </message>
6.152 + <message>
6.153 + <source>Couldn't create temporary directory before load
6.154 +</source>
6.155 + <translation type="unfinished"></translation>
6.156 + </message>
6.157 + <message>
6.158 + <source>Couldn't create temporary directory before save
6.159 +</source>
6.160 + <translation type="unfinished"></translation>
6.161 + </message>
6.162 + <message>
6.163 + <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
6.164 + <translation type="unfinished"></translation>
6.165 + </message>
6.166 </context>
6.167 <context>
6.168 <name>MapEditor</name>
6.169 @@ -1080,10 +1138,6 @@
6.170 <translation type="unfinished"></translation>
6.171 </message>
6.172 <message>
6.173 - <source>vym - save image as</source>
6.174 - <translation type="unfinished"></translation>
6.175 - </message>
6.176 - <message>
6.177 <source>Critical Import Error</source>
6.178 <translation type="unfinished"></translation>
6.179 </message>
6.180 @@ -1122,10 +1176,6 @@
6.181 <translation type="unfinished"></translation>
6.182 </message>
6.183 <message>
6.184 - <source>Save image as %1</source>
6.185 - <translation type="unfinished"></translation>
6.186 - </message>
6.187 - <message>
6.188 <source>Choose directory structure to import</source>
6.189 <translation type="unfinished"></translation>
6.190 </message>
6.191 @@ -1134,12 +1184,11 @@
6.192 <translation type="unfinished"></translation>
6.193 </message>
6.194 <message>
6.195 - <source>Warning</source>
6.196 + <source>History for </source>
6.197 <translation type="unfinished"></translation>
6.198 </message>
6.199 <message>
6.200 - <source>Couldn't find script %1
6.201 -to notifiy Browsers of changed bookmarks.</source>
6.202 + <source>Save image</source>
6.203 <translation type="unfinished"></translation>
6.204 </message>
6.205 </context>
6.206 @@ -1234,17 +1283,30 @@
6.207 to notifiy Browsers of changed bookmarks.</source>
6.208 <translation type="unfinished"></translation>
6.209 </message>
6.210 + <message>
6.211 + <source>Error</source>
6.212 + <translation type="unfinished"></translation>
6.213 + </message>
6.214 + <message>
6.215 + <source>Couldn't access temporary directory
6.216 +</source>
6.217 + <translation type="unfinished"></translation>
6.218 + </message>
6.219 </context>
6.220 <context>
6.221 <name>ShowTextDialog</name>
6.222 + <message>
6.223 + <source>Dialog</source>
6.224 + <translation type="unfinished"></translation>
6.225 + </message>
6.226 + <message>
6.227 + <source>Close</source>
6.228 + <translation type="unfinished"></translation>
6.229 + </message>
6.230 </context>
6.231 <context>
6.232 <name>TextEditor</name>
6.233 <message>
6.234 - <source>&File</source>
6.235 - <translation type="unfinished"></translation>
6.236 - </message>
6.237 - <message>
6.238 <source>Import</source>
6.239 <translation type="unfinished"></translation>
6.240 </message>
6.241 @@ -1465,10 +1527,6 @@
6.242 <translation type="unfinished"></translation>
6.243 </message>
6.244 <message>
6.245 - <source>File Actions</source>
6.246 - <translation type="unfinished"></translation>
6.247 - </message>
6.248 - <message>
6.249 <source>Edit Actions</source>
6.250 <translation type="unfinished"></translation>
6.251 </message>
6.252 @@ -1480,8 +1538,13 @@
6.253 <source>Print Document</source>
6.254 <translation type="unfinished"></translation>
6.255 </message>
6.256 -</context>
6.257 -<context>
6.258 - <name>WarningDialog</name>
6.259 + <message>
6.260 + <source>Note Actions</source>
6.261 + <translation type="unfinished"></translation>
6.262 + </message>
6.263 + <message>
6.264 + <source>&Note</source>
6.265 + <translation type="unfinished"></translation>
6.266 + </message>
6.267 </context>
6.268 </TS>
7.1 --- a/lang/vym_es.ts Wed Sep 06 12:47:06 2006 +0000
7.2 +++ b/lang/vym_es.ts Fri Sep 08 12:30:09 2006 +0000
7.3 @@ -3,6 +3,11 @@
7.4 <name>AboutDialog</name>
7.5 <message>
7.6 <source>Ok</source>
7.7 + <translation type="obsolete">Ok</translation>
7.8 + </message>
7.9 + <message>
7.10 + <source>Ok</source>
7.11 + <comment>Ok Button</comment>
7.12 <translation type="unfinished">Ok</translation>
7.13 </message>
7.14 </context>
7.15 @@ -272,12 +277,60 @@
7.16 <source>Find Text</source>
7.17 <translation type="unfinished"></translation>
7.18 </message>
7.19 + <message>
7.20 + <source>Text to find:</source>
7.21 + <translation type="unfinished"></translation>
7.22 + </message>
7.23 +</context>
7.24 +<context>
7.25 + <name>HistoryWindow</name>
7.26 + <message>
7.27 + <source>Dialog</source>
7.28 + <translation type="unfinished"></translation>
7.29 + </message>
7.30 + <message>
7.31 + <source>Redo</source>
7.32 + <translation type="unfinished">Rehacer</translation>
7.33 + </message>
7.34 + <message>
7.35 + <source>New Row</source>
7.36 + <translation type="unfinished"></translation>
7.37 + </message>
7.38 + <message>
7.39 + <source>Time</source>
7.40 + <translation type="unfinished"></translation>
7.41 + </message>
7.42 + <message>
7.43 + <source>Comment</source>
7.44 + <translation type="unfinished"></translation>
7.45 + </message>
7.46 + <message>
7.47 + <source>Undo</source>
7.48 + <translation type="unfinished">Deshacer</translation>
7.49 + </message>
7.50 + <message>
7.51 + <source>Close</source>
7.52 + <translation type="unfinished">Cerrar</translation>
7.53 + </message>
7.54 + <message>
7.55 + <source>Action</source>
7.56 + <translation type="unfinished"></translation>
7.57 + </message>
7.58 + <message>
7.59 + <source>Undo action</source>
7.60 + <translation type="unfinished"></translation>
7.61 + </message>
7.62 + <message>
7.63 + <source>now</source>
7.64 + <comment>now bar in history hwindow</comment>
7.65 + <translation type="unfinished"></translation>
7.66 + </message>
7.67 </context>
7.68 <context>
7.69 <name>Main</name>
7.70 <message>
7.71 <source>&File</source>
7.72 - <translation>&Archivo</translation>
7.73 + <translation type="obsolete">&Archivo</translation>
7.74 </message>
7.75 <message>
7.76 <source>New map</source>
7.77 @@ -447,7 +500,7 @@
7.78 </message>
7.79 <message>
7.80 <source>Jump to map</source>
7.81 - <translation>Saltar al mapa</translation>
7.82 + <translation type="obsolete">Saltar al mapa</translation>
7.83 </message>
7.84 <message>
7.85 <source>Edit link to another vym map</source>
7.86 @@ -1077,14 +1130,6 @@
7.87 <translation type="unfinished"></translation>
7.88 </message>
7.89 <message>
7.90 - <source>Pasting into new branch</source>
7.91 - <translation type="unfinished"></translation>
7.92 - </message>
7.93 - <message>
7.94 - <source>pasting into new branch</source>
7.95 - <translation type="unfinished"></translation>
7.96 - </message>
7.97 - <message>
7.98 <source>Delete key for deleting branches</source>
7.99 <translation type="unfinished"></translation>
7.100 </message>
7.101 @@ -1474,10 +1519,6 @@
7.102 <translation type="unfinished"></translation>
7.103 </message>
7.104 <message>
7.105 - <source>%1...</source>
7.106 - <translation type="unfinished"></translation>
7.107 - </message>
7.108 - <message>
7.109 <source>Couldn't find configuration for export to Open Office
7.110 </source>
7.111 <translation type="unfinished"></translation>
7.112 @@ -1486,6 +1527,44 @@
7.113 <source>No matches found for "%1"</source>
7.114 <translation type="unfinished"></translation>
7.115 </message>
7.116 + <message>
7.117 + <source>&Map</source>
7.118 + <translation type="unfinished"></translation>
7.119 + </message>
7.120 + <message>
7.121 + <source>&Actions</source>
7.122 + <translation type="unfinished"></translation>
7.123 + </message>
7.124 + <message>
7.125 + <source>Open all URLs in subtree</source>
7.126 + <translation type="unfinished"></translation>
7.127 + </message>
7.128 + <message>
7.129 + <source>Open xlinked map</source>
7.130 + <translation type="unfinished"></translation>
7.131 + </message>
7.132 + <message>
7.133 + <source>Open all vym links in subtree</source>
7.134 + <translation type="unfinished"></translation>
7.135 + </message>
7.136 + <message>
7.137 + <source>URLs and vymLinks</source>
7.138 + <translation type="unfinished"></translation>
7.139 + </message>
7.140 + <message>
7.141 + <source>Couldn't create temporary directory before load
7.142 +</source>
7.143 + <translation type="unfinished"></translation>
7.144 + </message>
7.145 + <message>
7.146 + <source>Couldn't create temporary directory before save
7.147 +</source>
7.148 + <translation type="unfinished"></translation>
7.149 + </message>
7.150 + <message>
7.151 + <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
7.152 + <translation type="unfinished"></translation>
7.153 + </message>
7.154 </context>
7.155 <context>
7.156 <name>MapEditor</name>
7.157 @@ -1583,7 +1662,7 @@
7.158 </message>
7.159 <message>
7.160 <source>vym - save image as</source>
7.161 - <translation>vym - guardar imagen como</translation>
7.162 + <translation type="obsolete">vym - guardar imagen como</translation>
7.163 </message>
7.164 <message>
7.165 <source>vym - Save image as </source>
7.166 @@ -1749,10 +1828,6 @@
7.167 <translation type="unfinished"></translation>
7.168 </message>
7.169 <message>
7.170 - <source>Save image as %1</source>
7.171 - <translation type="unfinished"></translation>
7.172 - </message>
7.173 - <message>
7.174 <source>Choose directory structure to import</source>
7.175 <translation type="unfinished"></translation>
7.176 </message>
7.177 @@ -1762,6 +1837,101 @@
7.178 </message>
7.179 <message>
7.180 <source>Warning</source>
7.181 + <translation type="obsolete">Advertencia</translation>
7.182 + </message>
7.183 + <message>
7.184 + <source>History for </source>
7.185 + <translation type="unfinished"></translation>
7.186 + </message>
7.187 + <message>
7.188 + <source>Save image</source>
7.189 + <translation type="unfinished">Guardar imagen</translation>
7.190 + </message>
7.191 +</context>
7.192 +<context>
7.193 + <name>QObject</name>
7.194 + <message>
7.195 + <source>This is not an image.</source>
7.196 + <translation>Esto no es una imagen.</translation>
7.197 + </message>
7.198 + <message>
7.199 + <source>Critical Export Error</source>
7.200 + <translation type="unfinished">Error de exportación crítico</translation>
7.201 + </message>
7.202 + <message>
7.203 + <source>Could not write %1</source>
7.204 + <translation type="unfinished"></translation>
7.205 + </message>
7.206 + <message>
7.207 + <source>Export failed.</source>
7.208 + <translation type="unfinished"></translation>
7.209 + </message>
7.210 + <message>
7.211 + <source>Check "%1" in
7.212 +%2</source>
7.213 + <translation type="unfinished"></translation>
7.214 + </message>
7.215 + <message>
7.216 + <source>Could not read %1</source>
7.217 + <translation type="unfinished"></translation>
7.218 + </message>
7.219 + <message>
7.220 + <source>Critical Error</source>
7.221 + <translation type="unfinished">Error crítico</translation>
7.222 + </message>
7.223 + <message>
7.224 + <source>Couldn't start zip to compress data.</source>
7.225 + <translation type="unfinished">No pudo iniciar zip para comprimir datos.</translation>
7.226 + </message>
7.227 + <message>
7.228 + <source>zip didn't exit normally</source>
7.229 + <translation type="unfinished">zip no salió normalmente</translation>
7.230 + </message>
7.231 + <message>
7.232 + <source>Couldn't start unzip to decompress data.</source>
7.233 + <translation type="unfinished">No pudo iniciar zip para descomprimir datos.</translation>
7.234 + </message>
7.235 + <message>
7.236 + <source>unzip didn't exit normally</source>
7.237 + <translation type="unfinished">unzip no salió normalmente</translation>
7.238 + </message>
7.239 + <message>
7.240 + <source>Could not start %1</source>
7.241 + <translation type="unfinished"></translation>
7.242 + </message>
7.243 + <message>
7.244 + <source>%1 didn't exit normally</source>
7.245 + <translation type="unfinished"></translation>
7.246 + </message>
7.247 + <message>
7.248 + <source>The file %1 exists already.
7.249 +Do you want to overwrite it?</source>
7.250 + <translation type="unfinished"></translation>
7.251 + </message>
7.252 + <message>
7.253 + <source>Overwrite</source>
7.254 + <translation type="unfinished">Sobreescribir</translation>
7.255 + </message>
7.256 + <message>
7.257 + <source>Cancel</source>
7.258 + <translation type="unfinished">Cancelar</translation>
7.259 + </message>
7.260 + <message>
7.261 + <source>Sorry, no preview for
7.262 +multiple selected files.</source>
7.263 + <translation type="unfinished"></translation>
7.264 + </message>
7.265 + <message>
7.266 + <source>Exporting the %1 bookmarks will overwrite
7.267 +your existing bookmarks file.</source>
7.268 + <translation type="unfinished"></translation>
7.269 + </message>
7.270 + <message>
7.271 + <source>Warning: Overwriting %1 bookmarks</source>
7.272 + <translation type="unfinished"></translation>
7.273 + </message>
7.274 + <message>
7.275 + <source>Warning</source>
7.276 <translation type="unfinished">Advertencia</translation>
7.277 </message>
7.278 <message>
7.279 @@ -1769,96 +1939,13 @@
7.280 to notifiy Browsers of changed bookmarks.</source>
7.281 <translation type="unfinished"></translation>
7.282 </message>
7.283 -</context>
7.284 -<context>
7.285 - <name>QObject</name>
7.286 - <message>
7.287 - <source>This is not an image.</source>
7.288 - <translation>Esto no es una imagen.</translation>
7.289 - </message>
7.290 - <message>
7.291 - <source>Critical Export Error</source>
7.292 - <translation type="unfinished">Error de exportación crítico</translation>
7.293 - </message>
7.294 - <message>
7.295 - <source>Could not write %1</source>
7.296 + <message>
7.297 + <source>Error</source>
7.298 <translation type="unfinished"></translation>
7.299 </message>
7.300 <message>
7.301 - <source>Export failed.</source>
7.302 - <translation type="unfinished"></translation>
7.303 - </message>
7.304 - <message>
7.305 - <source>Check "%1" in
7.306 -%2</source>
7.307 - <translation type="unfinished"></translation>
7.308 - </message>
7.309 - <message>
7.310 - <source>Could not read %1</source>
7.311 - <translation type="unfinished"></translation>
7.312 - </message>
7.313 - <message>
7.314 - <source>Critical Error</source>
7.315 - <translation type="unfinished">Error crítico</translation>
7.316 - </message>
7.317 - <message>
7.318 - <source>Couldn't start zip to compress data.</source>
7.319 - <translation type="unfinished">No pudo iniciar zip para comprimir datos.</translation>
7.320 - </message>
7.321 - <message>
7.322 - <source>zip didn't exit normally</source>
7.323 - <translation type="unfinished">zip no salió normalmente</translation>
7.324 - </message>
7.325 - <message>
7.326 - <source>Couldn't start unzip to decompress data.</source>
7.327 - <translation type="unfinished">No pudo iniciar zip para descomprimir datos.</translation>
7.328 - </message>
7.329 - <message>
7.330 - <source>unzip didn't exit normally</source>
7.331 - <translation type="unfinished">unzip no salió normalmente</translation>
7.332 - </message>
7.333 - <message>
7.334 - <source>Could not start %1</source>
7.335 - <translation type="unfinished"></translation>
7.336 - </message>
7.337 - <message>
7.338 - <source>%1 didn't exit normally</source>
7.339 - <translation type="unfinished"></translation>
7.340 - </message>
7.341 - <message>
7.342 - <source>The file %1 exists already.
7.343 -Do you want to overwrite it?</source>
7.344 - <translation type="unfinished"></translation>
7.345 - </message>
7.346 - <message>
7.347 - <source>Overwrite</source>
7.348 - <translation type="unfinished">Sobreescribir</translation>
7.349 - </message>
7.350 - <message>
7.351 - <source>Cancel</source>
7.352 - <translation type="unfinished">Cancelar</translation>
7.353 - </message>
7.354 - <message>
7.355 - <source>Sorry, no preview for
7.356 -multiple selected files.</source>
7.357 - <translation type="unfinished"></translation>
7.358 - </message>
7.359 - <message>
7.360 - <source>Exporting the %1 bookmarks will overwrite
7.361 -your existing bookmarks file.</source>
7.362 - <translation type="unfinished"></translation>
7.363 - </message>
7.364 - <message>
7.365 - <source>Warning: Overwriting %1 bookmarks</source>
7.366 - <translation type="unfinished"></translation>
7.367 - </message>
7.368 - <message>
7.369 - <source>Warning</source>
7.370 - <translation type="unfinished">Advertencia</translation>
7.371 - </message>
7.372 - <message>
7.373 - <source>Couldn't find script %1
7.374 -to notifiy Browsers of changed bookmarks.</source>
7.375 + <source>Couldn't access temporary directory
7.376 +</source>
7.377 <translation type="unfinished"></translation>
7.378 </message>
7.379 </context>
7.380 @@ -1870,14 +1957,18 @@
7.381 </message>
7.382 <message>
7.383 <source>Close</source>
7.384 - <translation type="obsolete">Cerrar</translation>
7.385 + <translation type="unfinished">Cerrar</translation>
7.386 + </message>
7.387 + <message>
7.388 + <source>Dialog</source>
7.389 + <translation type="unfinished"></translation>
7.390 </message>
7.391 </context>
7.392 <context>
7.393 <name>TextEditor</name>
7.394 <message>
7.395 <source>&File</source>
7.396 - <translation>&Archivo</translation>
7.397 + <translation type="obsolete">&Archivo</translation>
7.398 </message>
7.399 <message>
7.400 <source>Import</source>
7.401 @@ -2112,10 +2203,6 @@
7.402 <translation type="unfinished"></translation>
7.403 </message>
7.404 <message>
7.405 - <source>File Actions</source>
7.406 - <translation type="unfinished"></translation>
7.407 - </message>
7.408 - <message>
7.409 <source>Edit Actions</source>
7.410 <translation type="unfinished"></translation>
7.411 </message>
7.412 @@ -2127,6 +2214,14 @@
7.413 <source>Print Document</source>
7.414 <translation type="unfinished"></translation>
7.415 </message>
7.416 + <message>
7.417 + <source>Note Actions</source>
7.418 + <translation type="unfinished"></translation>
7.419 + </message>
7.420 + <message>
7.421 + <source>&Note</source>
7.422 + <translation type="unfinished"></translation>
7.423 + </message>
7.424 </context>
7.425 <context>
7.426 <name>WarningDialog</name>
8.1 --- a/lang/vym_it.ts Wed Sep 06 12:47:06 2006 +0000
8.2 +++ b/lang/vym_it.ts Fri Sep 08 12:30:09 2006 +0000
8.3 @@ -3,6 +3,11 @@
8.4 <name>AboutDialog</name>
8.5 <message>
8.6 <source>Ok</source>
8.7 + <translation type="obsolete">Ok</translation>
8.8 + </message>
8.9 + <message>
8.10 + <source>Ok</source>
8.11 + <comment>Ok Button</comment>
8.12 <translation type="unfinished">Ok</translation>
8.13 </message>
8.14 </context>
8.15 @@ -274,12 +279,60 @@
8.16 <source>Find Text</source>
8.17 <translation type="unfinished"></translation>
8.18 </message>
8.19 + <message>
8.20 + <source>Text to find:</source>
8.21 + <translation type="unfinished"></translation>
8.22 + </message>
8.23 +</context>
8.24 +<context>
8.25 + <name>HistoryWindow</name>
8.26 + <message>
8.27 + <source>Dialog</source>
8.28 + <translation type="unfinished"></translation>
8.29 + </message>
8.30 + <message>
8.31 + <source>Redo</source>
8.32 + <translation type="unfinished">Rifai</translation>
8.33 + </message>
8.34 + <message>
8.35 + <source>New Row</source>
8.36 + <translation type="unfinished"></translation>
8.37 + </message>
8.38 + <message>
8.39 + <source>Time</source>
8.40 + <translation type="unfinished"></translation>
8.41 + </message>
8.42 + <message>
8.43 + <source>Comment</source>
8.44 + <translation type="unfinished"></translation>
8.45 + </message>
8.46 + <message>
8.47 + <source>Undo</source>
8.48 + <translation type="unfinished">Annulla</translation>
8.49 + </message>
8.50 + <message>
8.51 + <source>Close</source>
8.52 + <translation type="unfinished">Chiudi</translation>
8.53 + </message>
8.54 + <message>
8.55 + <source>Action</source>
8.56 + <translation type="unfinished"></translation>
8.57 + </message>
8.58 + <message>
8.59 + <source>Undo action</source>
8.60 + <translation type="unfinished"></translation>
8.61 + </message>
8.62 + <message>
8.63 + <source>now</source>
8.64 + <comment>now bar in history hwindow</comment>
8.65 + <translation type="unfinished"></translation>
8.66 + </message>
8.67 </context>
8.68 <context>
8.69 <name>Main</name>
8.70 <message>
8.71 <source>&File</source>
8.72 - <translation>&File</translation>
8.73 + <translation type="obsolete">&File</translation>
8.74 </message>
8.75 <message>
8.76 <source>New map</source>
8.77 @@ -449,7 +502,7 @@
8.78 </message>
8.79 <message>
8.80 <source>Jump to map</source>
8.81 - <translation>Salta ad una mappa</translation>
8.82 + <translation type="obsolete">Salta ad una mappa</translation>
8.83 </message>
8.84 <message>
8.85 <source>Edit link to another vym map</source>
8.86 @@ -1268,14 +1321,6 @@
8.87 <translation type="unfinished"></translation>
8.88 </message>
8.89 <message>
8.90 - <source>Pasting into new branch</source>
8.91 - <translation type="unfinished"></translation>
8.92 - </message>
8.93 - <message>
8.94 - <source>pasting into new branch</source>
8.95 - <translation type="unfinished"></translation>
8.96 - </message>
8.97 - <message>
8.98 <source>Delete key for deleting branches</source>
8.99 <translation type="unfinished"></translation>
8.100 </message>
8.101 @@ -1483,10 +1528,6 @@
8.102 <translation type="unfinished"></translation>
8.103 </message>
8.104 <message>
8.105 - <source>%1...</source>
8.106 - <translation type="unfinished"></translation>
8.107 - </message>
8.108 - <message>
8.109 <source>Couldn't find configuration for export to Open Office
8.110 </source>
8.111 <translation type="unfinished"></translation>
8.112 @@ -1495,6 +1536,44 @@
8.113 <source>No matches found for "%1"</source>
8.114 <translation type="unfinished"></translation>
8.115 </message>
8.116 + <message>
8.117 + <source>&Map</source>
8.118 + <translation type="unfinished"></translation>
8.119 + </message>
8.120 + <message>
8.121 + <source>&Actions</source>
8.122 + <translation type="unfinished"></translation>
8.123 + </message>
8.124 + <message>
8.125 + <source>Open all URLs in subtree</source>
8.126 + <translation type="unfinished"></translation>
8.127 + </message>
8.128 + <message>
8.129 + <source>Open xlinked map</source>
8.130 + <translation type="unfinished"></translation>
8.131 + </message>
8.132 + <message>
8.133 + <source>Open all vym links in subtree</source>
8.134 + <translation type="unfinished"></translation>
8.135 + </message>
8.136 + <message>
8.137 + <source>URLs and vymLinks</source>
8.138 + <translation type="unfinished"></translation>
8.139 + </message>
8.140 + <message>
8.141 + <source>Couldn't create temporary directory before load
8.142 +</source>
8.143 + <translation type="unfinished"></translation>
8.144 + </message>
8.145 + <message>
8.146 + <source>Couldn't create temporary directory before save
8.147 +</source>
8.148 + <translation type="unfinished"></translation>
8.149 + </message>
8.150 + <message>
8.151 + <source>Sorry, currently only Konqueror and Mozilla support tabbed browsing.</source>
8.152 + <translation type="unfinished"></translation>
8.153 + </message>
8.154 </context>
8.155 <context>
8.156 <name>MapEditor</name>
8.157 @@ -1592,7 +1671,7 @@
8.158 </message>
8.159 <message>
8.160 <source>vym - save image as</source>
8.161 - <translation>vym - salva immagine come</translation>
8.162 + <translation type="obsolete">vym - salva immagine come</translation>
8.163 </message>
8.164 <message>
8.165 <source>vym - Save image as </source>
8.166 @@ -1745,10 +1824,6 @@
8.167 <translation type="unfinished"></translation>
8.168 </message>
8.169 <message>
8.170 - <source>Save image as %1</source>
8.171 - <translation type="unfinished"></translation>
8.172 - </message>
8.173 - <message>
8.174 <source>The file %1 exists already.
8.175 Do you want to overwrite it?</source>
8.176 <translation type="unfinished"></translation>
8.177 @@ -1767,6 +1842,101 @@
8.178 </message>
8.179 <message>
8.180 <source>Warning</source>
8.181 + <translation type="obsolete">Attenzione</translation>
8.182 + </message>
8.183 + <message>
8.184 + <source>History for </source>
8.185 + <translation type="unfinished"></translation>
8.186 + </message>
8.187 + <message>
8.188 + <source>Save image</source>
8.189 + <translation type="unfinished">Salva immagine</translation>
8.190 + </message>
8.191 +</context>
8.192 +<context>
8.193 + <name>QObject</name>
8.194 + <message>
8.195 + <source>This is not an image.</source>
8.196 + <translation>Questa non è un immagine.</translation>
8.197 + </message>
8.198 + <message>
8.199 + <source>The file %1 exists already.
8.200 +Do you want to overwrite it?</source>
8.201 + <translation type="unfinished"></translation>
8.202 + </message>
8.203 + <message>
8.204 + <source>Overwrite</source>
8.205 + <translation type="unfinished">Sovvrascrivi</translation>
8.206 + </message>
8.207 + <message>
8.208 + <source>Cancel</source>
8.209 + <translation type="unfinished">Cancella</translation>
8.210 + </message>
8.211 + <message>
8.212 + <source>Critical Export Error</source>
8.213 + <translation type="unfinished">Errore critico nell'esportazione</translation>
8.214 + </message>
8.215 + <message>
8.216 + <source>Could not write %1</source>
8.217 + <translation type="unfinished"></translation>
8.218 + </message>
8.219 + <message>
8.220 + <source>Export failed.</source>
8.221 + <translation type="unfinished"></translation>
8.222 + </message>
8.223 + <message>
8.224 + <source>Check "%1" in
8.225 +%2</source>
8.226 + <translation type="unfinished"></translation>
8.227 + </message>
8.228 + <message>
8.229 + <source>Could not read %1</source>
8.230 + <translation type="unfinished"></translation>
8.231 + </message>
8.232 + <message>
8.233 + <source>Critical Error</source>
8.234 + <translation type="unfinished">Errore Critico</translation>
8.235 + </message>
8.236 + <message>
8.237 + <source>Couldn't start zip to compress data.</source>
8.238 + <translation type="unfinished">Non è possibile iniziare lo zip per la decompressione dei dati.</translation>
8.239 + </message>
8.240 + <message>
8.241 + <source>zip didn't exit normally</source>
8.242 + <translation type="unfinished">lo zip non è finito normalmente</translation>
8.243 + </message>
8.244 + <message>
8.245 + <source>Couldn't start unzip to decompress data.</source>
8.246 + <translation type="unfinished">Non è possibile iniziare l'unzip per la decompressione dei dati.</translation>
8.247 + </message>
8.248 + <message>
8.249 + <source>unzip didn't exit normally</source>
8.250 + <translation type="unfinished">unzip non è finito normalmente</translation>
8.251 + </message>
8.252 + <message>
8.253 + <source>Sorry, no preview for
8.254 +multiple selected files.</source>
8.255 + <translation type="unfinished"></translation>
8.256 + </message>
8.257 + <message>
8.258 + <source>Could not start %1</source>
8.259 + <translation type="unfinished"></translation>
8.260 + </message>
8.261 + <message>
8.262 + <source>%1 didn't exit normally</source>
8.263 + <translation type="unfinished"></translation>
8.264 + </message>
8.265 + <message>
8.266 + <source>Exporting the %1 bookmarks will overwrite
8.267 +your existing bookmarks file.</source>
8.268 + <translation type="unfinished"></translation>
8.269 + </message>
8.270 + <message>
8.271 + <source>Warning: Overwriting %1 bookmarks</source>
8.272 + <translation type="unfinished"></translation>
8.273 + </message>
8.274 + <message>
8.275 + <source>Warning</source>
8.276 <translation type="unfinished">Attenzione</translation>
8.277 </message>
8.278 <message>
8.279 @@ -1774,96 +1944,13 @@
8.280 to notifiy Browsers of changed bookmarks.</source>
8.281 <translation type="unfinished"></translation>
8.282 </message>
8.283 -</context>
8.284 -<context>
8.285 - <name>QObject</name>
8.286 - <message>
8.287 - <source>This is not an image.</source>
8.288 - <translation>Questa non è un immagine.</translation>
8.289 - </message>
8.290 - <message>
8.291 - <source>The file %1 exists already.
8.292 -Do you want to overwrite it?</source>
8.293 + <message>
8.294 + <source>Error</source>
8.295 <translation type="unfinished"></translation>
8.296 </message>
8.297 <message>
8.298 - <source>Overwrite</source>
8.299 - <translation type="unfinished">Sovvrascrivi</translation>
8.300 - </message>
8.301 - <message>
8.302 - <source>Cancel</source>
8.303 - <translation type="unfinished">Cancella</translation>
8.304 - </message>
8.305 - <message>
8.306 - <source>Critical Export Error</source>
8.307 - <translation type="unfinished">Errore critico nell'esportazione</translation>
8.308 - </message>
8.309 - <message>
8.310 - <source>Could not write %1</source>
8.311 - <translation type="unfinished"></translation>
8.312 - </message>
8.313 - <message>
8.314 - <source>Export failed.</source>
8.315 - <translation type="unfinished"></translation>
8.316 - </message>
8.317 - <message>
8.318 - <source>Check "%1" in
8.319 -%2</source>
8.320 - <translation type="unfinished"></translation>
8.321 - </message>
8.322 - <message>
8.323 - <source>Could not read %1</source>
8.324 - <translation type="unfinished"></translation>
8.325 - </message>
8.326 - <message>
8.327 - <source>Critical Error</source>
8.328 - <translation type="unfinished">Errore Critico</translation>
8.329 - </message>
8.330 - <message>
8.331 - <source>Couldn't start zip to compress data.</source>
8.332 - <translation type="unfinished">Non è possibile iniziare lo zip per la decompressione dei dati.</translation>
8.333 - </message>
8.334 - <message>
8.335 - <source>zip didn't exit normally</source>
8.336 - <translation type="unfinished">lo zip non è finito normalmente</translation>
8.337 - </message>
8.338 - <message>
8.339 - <source>Couldn't start unzip to decompress data.</source>
8.340 - <translation type="unfinished">Non è possibile iniziare l'unzip per la decompressione dei dati.</translation>
8.341 - </message>
8.342 - <message>
8.343 - <source>unzip didn't exit normally</source>
8.344 - <translation type="unfinished">unzip non è finito normalmente</translation>
8.345 - </message>
8.346 - <message>
8.347 - <source>Sorry, no preview for
8.348 -multiple selected files.</source>
8.349 - <translation type="unfinished"></translation>
8.350 - </message>
8.351 - <message>
8.352 - <source>Could not start %1</source>
8.353 - <translation type="unfinished"></translation>
8.354 - </message>
8.355 - <message>
8.356 - <source>%1 didn't exit normally</source>
8.357 - <translation type="unfinished"></translation>
8.358 - </message>
8.359 - <message>
8.360 - <source>Exporting the %1 bookmarks will overwrite
8.361 -your existing bookmarks file.</source>
8.362 - <translation type="unfinished"></translation>
8.363 - </message>
8.364 - <message>
8.365 - <source>Warning: Overwriting %1 bookmarks</source>
8.366 - <translation type="unfinished"></translation>
8.367 - </message>
8.368 - <message>
8.369 - <source>Warning</source>
8.370 - <translation type="unfinished">Attenzione</translation>
8.371 - </message>
8.372 - <message>
8.373 - <source>Couldn't find script %1
8.374 -to notifiy Browsers of changed bookmarks.</source>
8.375 + <source>Couldn't access temporary directory
8.376 +</source>
8.377 <translation type="unfinished"></translation>
8.378 </message>
8.379 </context>
8.380 @@ -1875,14 +1962,18 @@
8.381 </message>
8.382 <message>
8.383 <source>Close</source>
8.384 - <translation type="obsolete">Chiudi</translation>
8.385 + <translation type="unfinished">Chiudi</translation>
8.386 + </message>
8.387 + <message>
8.388 + <source>Dialog</source>
8.389 + <translation type="unfinished"></translation>
8.390 </message>
8.391 </context>
8.392 <context>
8.393 <name>TextEditor</name>
8.394 <message>
8.395 <source>&File</source>
8.396 - <translation>&File</translation>
8.397 + <translation type="obsolete">&File</translation>
8.398 </message>
8.399 <message>
8.400 <source>Import</source>
8.401 @@ -2117,10 +2208,6 @@
8.402 <translation type="unfinished"></translation>
8.403 </message>
8.404 <message>
8.405 - <source>File Actions</source>
8.406 - <translation type="unfinished"></translation>
8.407 - </message>
8.408 - <message>
8.409 <source>Edit Actions</source>
8.410 <translation type="unfinished"></translation>
8.411 </message>
8.412 @@ -2132,6 +2219,14 @@
8.413 <source>Print Document</source>
8.414 <translation type="unfinished"></translation>
8.415 </message>
8.416 + <message>
8.417 + <source>Note Actions</source>
8.418 + <translation type="unfinished"></translation>
8.419 + </message>
8.420 + <message>
8.421 + <source>&Note</source>
8.422 + <translation type="unfinished"></translation>
8.423 + </message>
8.424 </context>
8.425 <context>
8.426 <name>WarningDialog</name>
9.1 --- a/mapeditor.cpp Wed Sep 06 12:47:06 2006 +0000
9.2 +++ b/mapeditor.cpp Fri Sep 08 12:30:09 2006 +0000
9.3 @@ -209,7 +209,8 @@
9.4 fileName=tr("unnamed");
9.5 mapName="";
9.6
9.7 - undosTotal=settings.readNumEntry("/mapeditor/undoLevels",50);
9.8 + stepsTotal=settings.readNumEntry("/mapeditor/stepsTotal",5);
9.9 + undoSet.setEntry ("/history/stepsTotal",QString::number(stepsTotal));
9.10
9.11 // Initialize find routine
9.12 itFind=NULL;
9.13 @@ -232,6 +233,11 @@
9.14 updateViewCenter();
9.15
9.16 mapCenter->reposition(); // for positioning heading
9.17 +
9.18 + // Initialize history window;
9.19 + historyWindow.setME(this);
9.20 + historyWindow.setStepsTotal(stepsTotal);
9.21 + historyWindow.update (undoSet);
9.22 }
9.23
9.24 MapEditor::~MapEditor()
9.25 @@ -545,11 +551,12 @@
9.26 setChanged();
9.27
9.28 int undosAvail=undoSet.readNumEntry ("/history/undosAvail",0);
9.29 + int redosAvail=undoSet.readNumEntry ("/history/redosAvail",0);
9.30 int curStep=undoSet.readNumEntry ("/history/curStep",0);
9.31 // Find out current undo directory
9.32 - if (undosAvail<undosTotal) undosAvail++;
9.33 + if (undosAvail<stepsTotal) undosAvail++;
9.34 curStep++;
9.35 - if (curStep>undosTotal) curStep=1;
9.36 + if (curStep>stepsTotal) curStep=1;
9.37
9.38 QString backupXML;
9.39 QString bakMapDir=QDir::convertSeparators (QString(tmpMapDir+"/undo-%1").arg(curStep));
9.40 @@ -594,8 +601,9 @@
9.41 /* TODO remove after testing
9.42 */
9.43 //cout << " into="<< histPath.toStdString()<<endl;
9.44 - cout << " undosTotal="<<undosTotal<<
9.45 + cout << " stepsTotal="<<stepsTotal<<
9.46 ", undosAvail="<<undosAvail<<
9.47 + ", redosAvail="<<redosAvail<<
9.48 ", curStep="<<curStep<<endl;
9.49 cout << " ---------------------------"<<endl;
9.50 cout << " comment="<<comment.toStdString()<<endl;
9.51 @@ -1292,10 +1300,13 @@
9.52 int curStep=undoSet.readNumEntry (QString("/history/curStep"));
9.53 int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
9.54 int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
9.55 - if (redosAvail>0) redosAvail--;
9.56 - if (undosAvail<undosTotal) undosAvail++;
9.57 + // Can we undo at all?
9.58 + if (redosAvail<1) return;
9.59 + redosAvail--;
9.60 +
9.61 + if (undosAvail<stepsTotal) undosAvail++;
9.62 curStep++;
9.63 - if (curStep>undosTotal) curStep=1;
9.64 + if (curStep>stepsTotal) curStep=1;
9.65 QString undoCommand= undoSet.readEntry (QString("/history/step-%1/undoCommand").arg(curStep));
9.66 QString undoSelection=undoSet.readEntry (QString("/history/step-%1/undoSelection").arg(curStep));
9.67 QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
9.68 @@ -1335,6 +1346,7 @@
9.69 undoSet.setEntry ("/history/curStep",QString::number(curStep));
9.70 undoSet.writeSettings(histPath);
9.71
9.72 + historyWindow.update (undoSet);
9.73 updateActions();
9.74
9.75 /* TODO remove testing
9.76 @@ -1356,6 +1368,10 @@
9.77 int curStep=undoSet.readNumEntry (QString("/history/curStep"));
9.78 int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
9.79 int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
9.80 +
9.81 + // Can we undo at all?
9.82 + if (undosAvail<1) return;
9.83 +
9.84 QString undoCommand= undoSet.readEntry (QString("/history/step-%1/undoCommand").arg(curStep));
9.85 QString undoSelection=undoSet.readEntry (QString("/history/step-%1/undoSelection").arg(curStep));
9.86 QString redoCommand= undoSet.readEntry (QString("/history/step-%1/redoCommand").arg(curStep));
9.87 @@ -1387,7 +1403,7 @@
9.88
9.89 undosAvail--;
9.90 curStep--;
9.91 - if (curStep<1) curStep=undosTotal;
9.92 + if (curStep<1) curStep=stepsTotal;
9.93
9.94 redosAvail++;
9.95
9.96 @@ -1405,9 +1421,30 @@
9.97 undoSet.setEntry ("/history/curStep",QString::number(curStep));
9.98 undoSet.writeSettings(histPath);
9.99
9.100 + historyWindow.update (undoSet);
9.101 updateActions();
9.102 }
9.103
9.104 +void MapEditor::gotoStep (int i)
9.105 +{
9.106 + // Restore variables
9.107 + int undosAvail=undoSet.readNumEntry (QString("/history/undosAvail"));
9.108 +
9.109 + if (i<0) return;
9.110 +
9.111 + // Clicking above current steps let's us undo things
9.112 + if (i<undosAvail)
9.113 + {
9.114 + for (int j=0; j<undosAvail-i; j++) undo();
9.115 + return;
9.116 + }
9.117 + // Clicking below current steps let's us rendo things
9.118 + if (i>undosAvail)
9.119 + for (int j=undosAvail; j<i; j++) redo();
9.120 +
9.121 + // And ignore clicking the current row ;-)
9.122 +}
9.123 +
9.124 void MapEditor::undoXML(const QString &undoSel, const QString &bakMapPath)
9.125 {
9.126 QString bakMapDir=bakMapPath.left(bakMapPath.findRev("/"));
10.1 --- a/mapeditor.h Wed Sep 06 12:47:06 2006 +0000
10.2 +++ b/mapeditor.h Fri Sep 08 12:30:09 2006 +0000
10.3 @@ -91,6 +91,7 @@
10.4 void copy(); // copy branch to clipboard
10.5 void redo(); // redo last action
10.6 void undo(); // undo last action
10.7 + void gotoStep (int);// goto a step in history
10.8 private:
10.9 void undoXML(const QString &, const QString &);
10.10 void pasteNoSave(); // paste clipboard to branch
10.11 @@ -249,7 +250,7 @@
10.12 bool isInteractive; // non interactive don't need tmpdirs
10.13 QString tmpMapDir; // tmp directory with undo history
10.14 QString histPath; // Path to history file
10.15 - int undosTotal; // total number of undos
10.16 + int stepsTotal; // total number of steps (undos+redos)
10.17 SimpleSettings undoSet; // undo/redo commands
10.18 bool blockReposition; // block while load or undo
10.19 bool blockSaveState; // block while load or undo
10.20 @@ -262,9 +263,9 @@
10.21
10.22 void resizeEvent( QResizeEvent * );
10.23
10.24 - Q3UrlOperator *urlOperator;
10.25 - QDataStream *imageData;
10.26 - QBuffer *imageBuffer;
10.27 + Q3UrlOperator *urlOperator;
10.28 + QDataStream *imageData;
10.29 + QBuffer *imageBuffer;
10.30
10.31 HistoryWindow historyWindow;
10.32
11.1 --- a/tex/vym.changelog Wed Sep 06 12:47:06 2006 +0000
11.2 +++ b/tex/vym.changelog Fri Sep 08 12:30:09 2006 +0000
11.3 @@ -1,5 +1,5 @@
11.4 -------------------------------------------------------------------
11.5 -Wed Sep 6 14:43:09 CEST 2006 - uwedr
11.6 +Wed Sep 8 14:43:09 CEST 2006 - uwedr
11.7
11.8 - Version: 1.8.56
11.9 - Feature: New History window, started to port designer stuff to QT4
12.1 --- a/version.h Wed Sep 06 12:47:06 2006 +0000
12.2 +++ b/version.h Fri Sep 08 12:30:09 2006 +0000
12.3 @@ -3,6 +3,6 @@
12.4
12.5 #define __VYM "VYM"
12.6 #define __VYM_VERSION "1.8.55"
12.7 -#define __BUILD_DATE "September 5, 2006"
12.8 +#define __BUILD_DATE "September 8, 2006"
12.9
12.10 #endif