# # # delete "guitone/src/model/Graph.cpp" # # delete "guitone/src/model/Graph.h" # # delete "guitone/src/view/dialogs/AncestryGraph.cpp" # # delete "guitone/src/view/dialogs/AncestryGraph.h" # # delete "libs/libs.pro" # # delete "libs/qanava" # # delete "libs/qanava/build" # # delete "libs/qanava/build/build.pro" # # delete "libs/qanava/build/pro" # # delete "libs/qanava/build/pro/can" # # delete "libs/qanava/build/pro/can/can.pro" # # delete "libs/qanava/build/pro/can/can.vcproj" # # delete "libs/qanava/build/pro/la" # # delete "libs/qanava/build/pro/la/la.pro" # # delete "libs/qanava/build/pro/la/la.vcproj" # # delete "libs/qanava/build/pro/pro.pro" # # delete "libs/qanava/build/pro/ui" # # delete "libs/qanava/build/pro/ui/ui.pro" # # delete "libs/qanava/build/pro/ui/ui.vcproj" # # delete "libs/qanava/build/pro/utl" # # delete "libs/qanava/build/pro/utl/utl.pro" # # delete "libs/qanava/build/pro/utl/utl.vcproj" # # delete "libs/qanava/build/vc71" # # delete "libs/qanava/build/vc71/qanava.sln" # # delete "libs/qanava/licence.txt" # # delete "libs/qanava/qanava.pro" # # delete "libs/qanava/readme.txt" # # delete "libs/qanava/src" # # delete "libs/qanava/src/can" # # delete "libs/qanava/src/can/canController.cpp" # # delete "libs/qanava/src/can/canController.h" # # delete "libs/qanava/src/can/canGraphItemModel.cpp" # # delete "libs/qanava/src/can/canGraphItemModel.h" # # delete "libs/qanava/src/can/canGraphItemView.cpp" # # delete "libs/qanava/src/can/canGraphItemView.h" # # delete "libs/qanava/src/can/canGraphicsView.cpp" # # delete "libs/qanava/src/can/canGraphicsView.h" # # delete "libs/qanava/src/can/canGrid.cpp" # # delete "libs/qanava/src/can/canGrid.h" # # delete "libs/qanava/src/can/canItemGeom.cpp" # # delete "libs/qanava/src/can/canItemGeom.h" # # delete "libs/qanava/src/can/canProgressQt.cpp" # # delete "libs/qanava/src/can/canProgressQt.h" # # delete "libs/qanava/src/can/canStyle.cpp" # # delete "libs/qanava/src/can/canStyle.h" # # delete "libs/qanava/src/la" # # delete "libs/qanava/src/la/laEdge.cpp" # # delete "libs/qanava/src/la/laEdge.h" # # delete "libs/qanava/src/la/laGraph.cpp" # # delete "libs/qanava/src/la/laGraph.h" # # delete "libs/qanava/src/la/laGrid.cpp" # # delete "libs/qanava/src/la/laGrid.h" # # delete "libs/qanava/src/la/laLayout.cpp" # # delete "libs/qanava/src/la/laLayout.h" # # delete "libs/qanava/src/la/laNode.cpp" # # delete "libs/qanava/src/la/laNode.h" # # delete "libs/qanava/src/la/laRepository.cpp" # # delete "libs/qanava/src/la/laRepository.h" # # delete "libs/qanava/src/la/laTimeTree.cpp" # # delete "libs/qanava/src/la/laTimeTree.h" # # delete "libs/qanava/src/la/laVectorf.h" # # delete "libs/qanava/src/ui" # # delete "libs/qanava/src/ui/uiItemListView.ui" # # delete "libs/qanava/src/ui/uiNodesItemModel.cpp" # # delete "libs/qanava/src/ui/uiNodesItemModel.h" # # delete "libs/qanava/src/ui/uiStyleModel.cpp" # # delete "libs/qanava/src/ui/uiStyleModel.h" # # delete "libs/qanava/src/ui/uiStyleView.cpp" # # delete "libs/qanava/src/ui/uiStyleView.h" # # delete "libs/qanava/src/ui/uiStyleView.ui" # # delete "libs/qanava/src/ui/uiUtil.h" # # delete "libs/qanava/src/utl" # # delete "libs/qanava/src/utl/utlConfig.h" # # delete "libs/qanava/src/utl/utlManager.h" # # delete "libs/qanava/src/utl/utlManager.hpp" # # delete "libs/qanava/src/utl/utlProgress.cpp" # # delete "libs/qanava/src/utl/utlProgress.h" # # patch "README" # from [bf3172aa635779af620b46a6d95d33386180eb1a] # to [9e7748d3ca87ccc2509556679ce3a5bbf6960135] # # patch "guitone/guitone.pro" # from [dfe02e6f1114d8de5b82ffa4bb285480489b58bb] # to [edb62cd4932c324f7d8ef40f2b0b5994445f9de3] # # patch "guitone/res/i18n/guitone_de.ts" # from [b96ca29c6cba9ee4a78828a6837ca9cdbaa689cb] # to [55eefea003aaddaa4112851013e192ce99cedffa] # # patch "guitone/src/view/Guitone.cpp" # from [15873fc046d0e70543ec703dd1c9aa550f6987e8] # to [249b362fbd16f6a55c17569022e6def215087046] # # patch "guitone/src/view/Guitone.h" # from [a28e5f21d6ff248580e4978f2ad8f73129382820] # to [a992df3eacff5be575b93557047ca236adc2a51a] # # patch "guitone.pro" # from [d87016abc13868f69c1676daa21669d0547d1901] # to [fa381aa2095c52bb3876fb5ffff635ce8c30ab32] # ============================================================ --- README bf3172aa635779af620b46a6d95d33386180eb1a +++ README 9e7748d3ca87ccc2509556679ce3a5bbf6960135 @@ -52,12 +52,6 @@ After that get the sources of guitone, unpack them into some directory and run qmake in it. Then start your favourite make tool and you're done. -3rd Party Libraries -=================== - -This software uses Qanava (http://www.libqanava.org) which is -(c) by Benoit Autheman and released under LGPL. - Authors ======= ============================================================ --- guitone/guitone.pro dfe02e6f1114d8de5b82ffa4bb285480489b58bb +++ guitone/guitone.pro edb62cd4932c324f7d8ef40f2b0b5994445f9de3 @@ -14,7 +14,6 @@ HEADERS += src/view/Guitone.h \ src/view/DiffStatusView.h \ src/view/dialogs/SwitchWorkspaceRevision.h \ src/view/dialogs/Preferences.h \ - src/view/dialogs/AncestryGraph.h \ src/view/dialogs/FileDiff.h \ src/view/dialogs/RevisionDiff.h \ src/view/dialogs/KeyManagement.h \ @@ -28,7 +27,6 @@ HEADERS += src/view/Guitone.h \ src/model/Attributes.h \ src/model/Select.h \ src/model/Certs.h \ - src/model/Graph.h \ src/model/ContentDiff.h \ src/model/GetFile.h \ src/model/GetFileProxyModel.h \ @@ -50,7 +48,6 @@ SOURCES += src/view/Guitone.cpp \ src/view/DiffStatusView.cpp \ src/view/dialogs/SwitchWorkspaceRevision.cpp \ src/view/dialogs/Preferences.cpp \ - src/view/dialogs/AncestryGraph.cpp \ src/view/dialogs/FileDiff.cpp \ src/view/dialogs/RevisionDiff.cpp \ src/view/dialogs/KeyManagement.cpp \ @@ -64,7 +61,6 @@ SOURCES += src/view/Guitone.cpp \ src/model/Attributes.cpp \ src/model/Select.cpp \ src/model/Certs.cpp \ - src/model/Graph.cpp \ src/model/ContentDiff.cpp \ src/model/GetFile.cpp \ src/model/GetFileProxyModel.cpp \ @@ -123,23 +119,3 @@ macx { QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk } -# -# libqanava configuration -# - -# use the bundled libqanava by defauult -MYQANAVADIR=$$(QANAVADIR) -isEmpty(MYQANAVADIR) { - MYQANAVADIR="../libs/qanava" -} -macx | unix { - LIBS = -L$${MYQANAVADIR}/build \ - -lqanava_la -lqanava_can -lqanava_ui -lqanava_utl - DEFINES += QANAVA_LINUX -} -win32:LIBS = $${MYQANAVADIR}/build/qanava_la.lib \ - $${MYQANAVADIR}/build/qanava_can.lib \ - $${MYQANAVADIR}/build/qanava_ui.lib \ - $${MYQANAVADIR}/build/qanava_utl.lib -INCLUDEPATH += $${MYQANAVADIR}/src -QT += xml ============================================================ --- guitone/res/i18n/guitone_de.ts b96ca29c6cba9ee4a78828a6837ca9cdbaa689cb +++ guitone/res/i18n/guitone_de.ts 55eefea003aaddaa4112851013e192ce99cedffa @@ -139,6 +139,29 @@ + ContentDiff + + + %1 (binary) + %1 (binär) + + + + %1 (%2 hunks) + %1 (%2 Bereiche) + + + + Line + Zeile + + + + File/Content + Datei/Inhalt + + + FileDiffDialog @@ -292,17 +315,17 @@ Bereit - + Select your workspace... Wählen Sie Ihren Arbeitsbereich aus... - + Loading aborted Laden abgebrochen - + Invalid workspace Ungültiger Arbeitsbereich @@ -322,7 +345,7 @@ Das Inventar konnte nicht gelesen werden. Vielleicht läuft noch ein anderer Prozess? - + Loading workspace... Lade Arbeitsbereich... @@ -339,7 +362,7 @@ STRG+Q - + The chosen directory is no monotone workspace! Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis! @@ -349,7 +372,7 @@ &Importiere Arbeitsbereich - + Critical Monotone Error Kritischer monotone-Fehler @@ -385,12 +408,12 @@ Arbeitsbereich &öffnen - + &%1 %2 &%1 %2 - + No previous workspaces available. Keine vorherigen Arbeitsbereiche verfügbar. @@ -415,7 +438,7 @@ &Schlüsselverwaltung - + About &Qt Über &Qt @@ -445,12 +468,12 @@ &Schlüsselverwaltung - + 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? @@ -470,7 +493,7 @@ Der Pfad zur ausführbaren Datei von monotone ist entweder ungültig oder zeigt auf eine ältere Version von monotone. Guitone benötigt monotone Version %1 oder ein monotone mit einer Interface-Version %2 oder neuer. - + Hide &ignored files &Ignorierte Dateien verstecken @@ -480,7 +503,7 @@ Zeige nur &geänderte Dateien - + Show &ignored files &Ignorierte Dateien anzeigen @@ -540,12 +563,12 @@ I&gnorierte Dateien - + E&xpand tree Baum &aufklappen - + Co&llapse tree Baum zuk&lappen @@ -634,120 +657,130 @@ InventoryView - + &Add &Hinzufügen - + Add to workspace Zum Arbeitsbereich hinzufügen - + &Remove En&tfernen - + Remove from workspace Vom Arbeitsbereich entfernen - + &Commit &Einpflegen - + Commit Einpflegen - + I&gnore Datei &ignorieren - + Ignore file Datei ignorieren - + &Unignore Datei nicht ign&orieren - + Unignore file Datei nicht mehr ignorieren - + R&evert &Zurücksetzen - + Revert uncommitted changes Nicht eingepflegte Änderungen verwerfen - + Rena&me Um&benennen - + Rename file Datei umbenennen - + D&iff U&nterschiede anzeigen - + Diff against base revision Unterschiede im Vergleich zur Basisrevision anzeigen - + &Go into &Wechseln zu - + Go into the directory Wechsle in das Verzeichnis - + &Open &Öffnen - + Open in default program In Standardprogramm öffnen - + Error Fehler - + The file you're trying to open does not exist. Die Datei, die Sie versucht haben zu öffnen, existiert nicht. - + Unable to open files on your platform - please contact the author about this problem. Kann keine Dateien auf Ihrer Plattform öffnen - bitte kontaktieren Sie den Autor über dieses Problem. + + + D&iff all + Alle U&nterschiede anzeigen + + + + Show all differences + Zeigt Unterschiede in allen Dateien + KeyManagement @@ -1038,6 +1071,32 @@ korrekt installiert? + RevisionDiff + + + base revision + Basis-Revision + + + + workspace revision + Arbeitsbereich-Revision + + + + RevisionDiffDialog + + + Differences in %1 between %2 and %3 + Unterschiede in %1 zwischen %2 und %3 + + + + Close + Schließen + + + SandboxItem ============================================================ --- guitone/src/view/Guitone.cpp 15873fc046d0e70543ec703dd1c9aa550f6987e8 +++ guitone/src/view/Guitone.cpp 249b362fbd16f6a55c17569022e6def215087046 @@ -29,7 +29,6 @@ #include "../view/AttributesView.h" #include "../view/dialogs/SwitchWorkspaceRevision.h" #include "../view/dialogs/Preferences.h" -#include "../view/dialogs/AncestryGraph.h" #include "../view/dialogs/KeyManagement.h" #include "../view/dialogs/About.h" #include "../util/Settings.h" @@ -194,19 +193,7 @@ void Guitone::buildMenu() Qt::CTRL + Qt::Key_R ); - menu = menuBar()->addMenu(tr("&Database")); - /** - * Disabled until libqanava fixes some of their major problems - * menu->addAction( - tr("&Show ancestry graph"), - this, - SLOT(openAncestryGraphDialog()), - Qt::CTRL + Qt::Key_A - ); - **/ - - menu->addAction( tr("&Key Management"), this, SLOT(openKeyManagementDialog()), @@ -458,12 +445,6 @@ void Guitone::openPreferencesDialog() dialog.exec(); } -void Guitone::openAncestryGraphDialog() -{ - AncestryGraph dialog(this); - dialog.exec(); -} - void Guitone::openKeyManagementDialog() { KeyManagement dialog(this); ============================================================ --- guitone/src/view/Guitone.h a28e5f21d6ff248580e4978f2ad8f73129382820 +++ guitone/src/view/Guitone.h a992df3eacff5be575b93557047ca236adc2a51a @@ -45,22 +45,21 @@ private slots: void chooseWorkspace(); void openRecentWorkspace(); void criticalMtnError(const QString &); - void showHideIgnoredFiles(); + void showHideIgnoredFiles(); void setViewOption(QAction *); void expandCollapseTree(); void openSwitchWorkspaceRevisionDialog(); void openPreferencesDialog(); - void openAncestryGraphDialog(); - void openKeyManagementDialog(); + void openKeyManagementDialog(); void aboutGuitone(); private: void buildMenu(); void buildModelView(); void buildConnections(); - void closeEvent(QCloseEvent *); - void loadWorkspace(QString); - void updatePreviousWorkspacesMenu(); + void closeEvent(QCloseEvent *); + void loadWorkspace(QString); + void updatePreviousWorkspacesMenu(); QMenu *menu; QMenu *wsSubMenu; @@ -69,13 +68,13 @@ private: QAction *actExpandCollapseTree; Inventory *invModel; Attributes *attrModel; - InventoryProxyModel *proxyModelFolderTree; - InventoryProxyModel *proxyModelFileList; + InventoryProxyModel *proxyModelFolderTree; + InventoryProxyModel *proxyModelFileList; InventoryView *treeView; InventoryView *listView; AttributesView *attrView; - bool gotError; + bool gotError; }; ============================================================ --- guitone.pro d87016abc13868f69c1676daa21669d0547d1901 +++ guitone.pro fa381aa2095c52bb3876fb5ffff635ce8c30ab32 @@ -1,4 +1,3 @@ TEMPLATE = subdirs TEMPLATE = subdirs -SUBDIRS = libs \ - guitone +SUBDIRS = guitone