# # # rename "guitone/res/forms/switch_workspace.ui" # to "guitone/res/forms/select_revision.ui" # # rename "guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp" # to "guitone/src/view/dialogs/SelectRevision.cpp" # # rename "guitone/src/view/dialogs/SwitchWorkspaceRevision.h" # to "guitone/src/view/dialogs/SelectRevision.h" # # patch "TODO" # from [11a427fbd431342557bdd7da9c7521ffed806840] # to [e00048ef5842a19b7d22a328df0616147b2fe2be] # # patch "guitone/guitone.pro" # from [9b20114423976ef087fecfb8d13866aff121a8f6] # to [9ebc42d07689cc1a688bb1b3b59fa027eb719c9f] # # patch "guitone/res/forms/select_revision.ui" # from [25519f7cd2c2dc10c6da8c687ffe18cf46cf8102] # to [c1cecd2c790c38b27a87df2bea6e99ca65579c49] # # patch "guitone/res/i18n/guitone_de.ts" # from [ba2bb18b98b4f3c34893be1658da9e1ae926b51b] # to [00cb2cd302c93dde99a83d32f438f0bee8270349] # # patch "guitone/src/view/MainWindow.cpp" # from [59056dbbe09d50ff14081d1e7158cae80178da75] # to [53885e5bcb6e34f8f84e133ebbb776be81b5ac06] # # patch "guitone/src/view/dialogs/SelectRevision.cpp" # from [4577dc3fa56e55ccfe2cbcfe3e31a413f9148f80] # to [cbbddc03998b43c5b38913183e74cbfd94f48128] # # patch "guitone/src/view/dialogs/SelectRevision.h" # from [563297ef26ccbcbcfbb94e0d60d30a2ff3ddd272] # to [b2bd738e08ba2e3899fa2d3d83c7f3505d452241] # ============================================================ --- TODO 11a427fbd431342557bdd7da9c7521ffed806840 +++ TODO e00048ef5842a19b7d22a328df0616147b2fe2be @@ -1,6 +1,5 @@ Current TODO, for "long-term" stuff see Current TODO, for "long-term" stuff see IDEAS: -* rename SwitchWorkspaceRevision to SelectRevision * create two new dialogs CheckoutRevision and UpdateWorkspaceRevision which make use of SelectRevision * implement single and multiple file saving for the RevisionManifest dialog ============================================================ --- guitone/guitone.pro 9b20114423976ef087fecfb8d13866aff121a8f6 +++ guitone/guitone.pro 9ebc42d07689cc1a688bb1b3b59fa027eb719c9f @@ -20,7 +20,7 @@ HEADERS += src/view/MainWindow.h \ src/view/DiffView.h \ src/view/DiffStatusView.h \ src/view/dialogs/Dialog.h \ - src/view/dialogs/SwitchWorkspaceRevision.h \ + src/view/dialogs/SelectRevision.h \ src/view/dialogs/Preferences.h \ src/view/dialogs/FileDiff.h \ src/view/dialogs/RevisionDiff.h \ @@ -66,7 +66,7 @@ SOURCES += src/view/MainWindow.cpp \ src/view/DiffView.cpp \ src/view/DiffStatusView.cpp \ src/view/dialogs/Dialog.cpp \ - src/view/dialogs/SwitchWorkspaceRevision.cpp \ + src/view/dialogs/SelectRevision.cpp \ src/view/dialogs/Preferences.cpp \ src/view/dialogs/FileDiff.cpp \ src/view/dialogs/RevisionDiff.cpp \ @@ -106,7 +106,7 @@ SOURCES += src/view/MainWindow.cpp \ src/util/StdioParser.cpp \ src/main.cpp -FORMS += res/forms/switch_workspace.ui \ +FORMS += res/forms/select_revision.ui \ res/forms/preferences.ui \ res/forms/file_diff.ui \ res/forms/revision_diff.ui \ ============================================================ --- guitone/res/forms/switch_workspace.ui 25519f7cd2c2dc10c6da8c687ffe18cf46cf8102 +++ guitone/res/forms/select_revision.ui c1cecd2c790c38b27a87df2bea6e99ca65579c49 @@ -1,16 +1,16 @@ - SwitchWorkspaceRevision - + SelectRevision + 0 0 - 532 + 558 364 - Switch Workspace Revision + Select Revision :/icons/guitone.png @@ -203,15 +203,15 @@ + TreeView + QTreeView +
TreeView.h
+
+ Splitter QSplitter
Splitter.h
- - TreeView - QTreeView -
TreeView.h
-
selectorBox @@ -227,7 +227,7 @@ okButton clicked() - SwitchWorkspaceRevision + SelectRevision accept() @@ -243,7 +243,7 @@ cancelButton clicked() - SwitchWorkspaceRevision + SelectRevision reject() ============================================================ --- guitone/res/i18n/guitone_de.ts ba2bb18b98b4f3c34893be1658da9e1ae926b51b +++ guitone/res/i18n/guitone_de.ts 00cb2cd302c93dde99a83d32f438f0bee8270349 @@ -31,7 +31,7 @@ Revision ID - Revisions-ID + Revisions-ID @@ -138,43 +138,43 @@ Revision ID - Revisions-ID + Revisions-ID Date - Datum + Datum Author - Autor + Autor Changelog - + Änderungsliste ContentDiff - + %1 (binary) %1 (binär) - + %1 (%2 hunks) %1 (%2 Bereiche) - + Line Zeile - + File/Content Datei/Inhalt @@ -187,11 +187,6 @@ Datenbank - - Update All Branches - Alle Zweige aktualisieren - - All Changesets Alle Änderungen @@ -969,17 +964,6 @@ Sie können zum Arbeitsbereich-Modus jed Monotone - - The monotone process exited unexpectedly (process error %1). Please reconfigure the path to the monotone binary in the Preferences dialog or check if the version of the database you try to load matches the monotone version you are using. - -monotone returned: -%2 - Der monotone-Prozess wurde unerwartet beendet (Prozess-Fehler %1). Bitte konfigurieren Sie den Pfad zur ausführbaren Datei von monotone im Einstellungsdialog neu oder überprüfen Sie, ob die Version der Datenbank, die Sie versucht haben zu laden, mit der Version von monotone übereinstimmt, die Sie benutzen. - -monotone gab zurück: -%2 - - The monotone process exited unexpectedly (return code %1). Please reconfigure the path to the monotone binary in the Preferences dialog or check if the version of the database you try to load matches the monotone version you are using. @@ -1169,11 +1153,6 @@ monotone gab zurück: Information - - You can't open directories which are not checked out. - Sie können keine Verzeichnisse öffnen, die nicht ausgecheckt wurden. - - Open file Datei öffnen @@ -1198,129 +1177,114 @@ monotone gab zurück: - SwitchWorkspaceRevision + SelectRevision - - Switch Workspace Revision - Arbeitsbereich auf andere Revision aktualisieren + + Select Revision + Revision auswählen - + + contains + beinhaltet + + + Find Finden - + + Select as first revision + Als erste Revision auswählen + + + + Select as second revision + Als zweite Revision auswählen + + + + Show differences + Änderungen anzeigen + + + OK OK - + Cancel Abbrechen - + + Revision + Revision + + + Branch Zweig - + Tag Marke - + Author Autor - + Date Datum - + Custom Selbstdefiniert - - contains - beinhaltet - - - - Revision - Revision - - - - Invalid selection - Ungültige Auswahl - - - - The given selection could not be processed: %1 - Die eingegebene Auswahl kann nicht ausgeführt werden: %1 - - - + Combined Kombiniert - + Unable to execute command Konnte Kommando nicht ausführen - + Unable to execute '%1' - maybe another command is still running? Konnte '%1' nicht ausführen - eventuell läuft noch ein anderes Kommando? - - Select first revision - Erste Revision auswählen + + Invalid selection + Ungültige Auswahl - - Select second revision - Zweite Revision auswählen + + The given selection could not be processed: %1 + Die eingegebene Auswahl kann nicht ausgeführt werden: %1 - - Show differences - Änderungen anzeigen - - - + First: %1... Erste: %1... - + Second: %1... Zweite: %1... - - Select as first revision - Als erste Revision auswählen - - - - Select as second revision - Als zweite Revision auswählen - - - - Open manifest - Dateien - - - + View files in this revision Zeige Dateien dieser Revision ============================================================ --- guitone/src/view/MainWindow.cpp 59056dbbe09d50ff14081d1e7158cae80178da75 +++ guitone/src/view/MainWindow.cpp 53885e5bcb6e34f8f84e133ebbb776be81b5ac06 @@ -27,7 +27,7 @@ #include "Splitter.h" #include "InventoryView.h" #include "AttributesView.h" -#include "SwitchWorkspaceRevision.h" +#include "SelectRevision.h" #include "Preferences.h" #include "KeyManagement.h" #include "About.h" @@ -457,7 +457,7 @@ void MainWindow::on_actionSwitch_revisio // TODO: connect Inventory with the accept() signal here somehow // before this works, we obviously need a separate update command // wrapper which signals us that we can re-read the inventory... - SwitchWorkspaceRevision dialog(this); + SelectRevision dialog(this); dialog.execDocumentModal(); } ============================================================ --- guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp 4577dc3fa56e55ccfe2cbcfe3e31a413f9148f80 +++ guitone/src/view/dialogs/SelectRevision.cpp cbbddc03998b43c5b38913183e74cbfd94f48128 @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "SwitchWorkspaceRevision.h" +#include "SelectRevision.h" #include "Settings.h" #include "RevisionDiff.h" #include "RevisionManifest.h" @@ -26,7 +26,7 @@ #include #include -SwitchWorkspaceRevision::SwitchWorkspaceRevision(QWidget* parent) +SelectRevision::SelectRevision(QWidget* parent) : Dialog(parent) { setupUi(this); @@ -135,7 +135,7 @@ SwitchWorkspaceRevision::SwitchWorkspace okButton->setEnabled(false); } -SwitchWorkspaceRevision::~SwitchWorkspaceRevision() +SelectRevision::~SelectRevision() { delete selectorModel; delete sortModel; @@ -145,7 +145,7 @@ SwitchWorkspaceRevision::~SwitchWorkspac delete keysModel; } -void SwitchWorkspaceRevision::triggerRevisionSearch() +void SelectRevision::triggerRevisionSearch() { selectFirst->setEnabled(false); selectSecond->setEnabled(false); @@ -196,7 +196,7 @@ void SwitchWorkspaceRevision::triggerRev certsModel->clearData(); } -void SwitchWorkspaceRevision::handleInvalidSelection(QString error) +void SelectRevision::handleInvalidSelection(QString error) { QMessageBox::warning( this, @@ -206,7 +206,7 @@ void SwitchWorkspaceRevision::handleInva ); } -void SwitchWorkspaceRevision::enableDisableOkButton(const QModelIndex & index) +void SelectRevision::enableDisableOkButton(const QModelIndex & index) { if (!index.isValid()) { @@ -224,7 +224,7 @@ void SwitchWorkspaceRevision::enableDisa okButton->setEnabled(true); } -void SwitchWorkspaceRevision::setCompleter(int index) +void SelectRevision::setCompleter(int index) { QString selector = selectorBox->itemData(index).toString(); @@ -302,15 +302,8 @@ void SwitchWorkspaceRevision::setComplet selectorValue->setCompleter(selectorCompleter); } -void SwitchWorkspaceRevision::accept() +void SelectRevision::setFirstRevision() { - // TODO: send out a signal to let the main view update the inventory - qDebug("No functionality yet, sorry"); - done(0); -} - -void SwitchWorkspaceRevision::setFirstRevision() -{ Q_ASSERT(currentRevision.size() > 0); if (currentRevision == secondRevision) return; firstRevision = currentRevision; @@ -318,7 +311,7 @@ void SwitchWorkspaceRevision::setFirstRe selectFirst->setText(tr("First: %1...").arg(firstRevision.left(12))); } -void SwitchWorkspaceRevision::setSecondRevision() +void SelectRevision::setSecondRevision() { Q_ASSERT(currentRevision.size() > 0); if (currentRevision == firstRevision) return; @@ -327,7 +320,7 @@ void SwitchWorkspaceRevision::setSecondR selectSecond->setText(tr("Second: %1...").arg(secondRevision.left(12))); } -void SwitchWorkspaceRevision::enableDiffButtons(const QModelIndex & index) +void SelectRevision::enableDiffButtons(const QModelIndex & index) { if (!index.isValid()) return; currentRevision = index.data().toString(); @@ -335,7 +328,7 @@ void SwitchWorkspaceRevision::enableDiff selectSecond->setEnabled(true); } -void SwitchWorkspaceRevision::showDiffDialog() +void SelectRevision::showDiffDialog() { Q_ASSERT(firstRevision.size() > 0 && secondRevision.size() > 0); @@ -344,7 +337,7 @@ void SwitchWorkspaceRevision::showDiffDi dlg.exec(); } -void SwitchWorkspaceRevision::readCerts(const QModelIndex & index) +void SelectRevision::readCerts(const QModelIndex & index) { if (!index.isValid()) return; @@ -352,23 +345,23 @@ void SwitchWorkspaceRevision::readCerts( if (!certsModel->readCerts(rev)) { - qCritical("SwitchWorkspaceRevision::readCerts: couldn't read certs for %s", qPrintable(rev)); + qCritical("SelectRevision::readCerts: couldn't read certs for %s", qPrintable(rev)); } } -void SwitchWorkspaceRevision::openManifestDialog(const QString & rev) +void SelectRevision::openManifestDialog(const QString & rev) { RevisionManifest dlg(this, rev); dlg.exec(); } -void SwitchWorkspaceRevision::revListDoubleClicked(const QModelIndex & index) +void SelectRevision::revListDoubleClicked(const QModelIndex & index) { if (!index.isValid()) return; openManifestDialog(index.data().toString()); } -void SwitchWorkspaceRevision::contextMenuRequested(const QModelIndexList & indexList, const QPoint & pos) +void SelectRevision::contextMenuRequested(const QModelIndexList & indexList, const QPoint & pos) { if (indexList.size() == 0) return; QString rev(indexList.at(0).data().toString()); ============================================================ --- guitone/src/view/dialogs/SwitchWorkspaceRevision.h 563297ef26ccbcbcfbb94e0d60d30a2ff3ddd272 +++ guitone/src/view/dialogs/SelectRevision.h b2bd738e08ba2e3899fa2d3d83c7f3505d452241 @@ -18,11 +18,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef SWITCH_WORKSPACE_REVISION_H -#define SWITCH_WORKSPACE_REVISION_H +#ifndef SELECT_REVISION_H +#define SELECT_REVISION_H #include "Dialog.h" -#include "ui_switch_workspace.h" +#include "ui_select_revision.h" #include "Select.h" #include "Toposort.h" #include "Certs.h" @@ -32,13 +32,14 @@ #include -class SwitchWorkspaceRevision : public Dialog, private Ui::SwitchWorkspaceRevision +class SelectRevision : public Dialog, private Ui::SelectRevision { Q_OBJECT public: - SwitchWorkspaceRevision(QWidget *); - ~SwitchWorkspaceRevision(); + SelectRevision(QWidget *); + ~SelectRevision(); + inline QString getSelectedRevision() const { return currentRevision; } private: void openManifestDialog(const QString &); @@ -60,7 +61,6 @@ private slots: void handleInvalidSelection(QString); void enableDisableOkButton(const QModelIndex &); void setCompleter(int); - void accept(); void setFirstRevision(); void setSecondRevision(); void enableDiffButtons(const QModelIndex &);