#
#
# patch "guitone/res/forms/main_window.ui"
# from [afaa9b341aa26361f28b3c8d857fa07473987959]
# to [b611a237125bf81911e87b6863d35f9c9c6785f5]
#
# patch "guitone/res/forms/manifest.ui"
# from [d645dc2d7505601fda16753cc6414600b74db603]
# to [b0411bd9c26399c10dd09a486cc6403b80af3f7c]
#
# patch "guitone/res/i18n/guitone_de.ts"
# from [64fec5387de467d2a14bcb25ce60076264750b0e]
# to [9a5a21b85a73b535ea7c9501604104629f3067a0]
#
# patch "guitone/src/model/MonotoneDelegate.cpp"
# from [a199c4fbcb62aba28a5ce3f8dac52923337a9781]
# to [4ebb6a0e87914d4dbe4b3e68be5b206661c08e49]
#
# patch "guitone/src/monotone/Monotone.cpp"
# from [882785c94f5ead9cd672391f7c7b62f0455efa0f]
# to [45f7336112cf9644ec1ca94cd067c37e08ec3ac7]
#
# patch "guitone/src/monotone/Monotone.h"
# from [86adeb6b5c05935100b714ef9659d1e4fa27f4b9]
# to [acbb4071e26433ba787703de88d9a8b67425eaa5]
#
# patch "guitone/src/view/InventoryView.cpp"
# from [c563cc7b4a82cc584eaff1f205ffccd568500fb5]
# to [2fef05e0c9c4939fc5ea8a83a0b1c4a646afece5]
#
# patch "guitone/src/view/dialogs/RevisionManifest.cpp"
# from [124c563333148bd821655d05486a6eaa23e813b5]
# to [e35d765f7bc50c3dbd3497a9b87c2d73e53be2cd]
#
============================================================
--- guitone/res/forms/main_window.ui afaa9b341aa26361f28b3c8d857fa07473987959
+++ guitone/res/forms/main_window.ui b611a237125bf81911e87b6863d35f9c9c6785f5
@@ -45,12 +45,20 @@
Qt::Horizontal
-
+
+
+ QAbstractItemView::ExtendedSelection
+
+
Qt::Vertical
-
+
+
+ QAbstractItemView::ExtendedSelection
+
+
@@ -117,7 +125,7 @@ You can switch back to the workspace mod
0
0
926
- 24
+ 22
+ Splitter
+ QSplitter
+
+
+
InventoryView
QTreeView
- Splitter
- QSplitter
-
-
-
AttributesView
QTreeView
============================================================
--- guitone/res/forms/manifest.ui d645dc2d7505601fda16753cc6414600b74db603
+++ guitone/res/forms/manifest.ui b0411bd9c26399c10dd09a486cc6403b80af3f7c
@@ -33,7 +33,7 @@
-
- QAbstractItemView::MultiSelection
+ QAbstractItemView::ExtendedSelection
============================================================
--- guitone/res/i18n/guitone_de.ts 64fec5387de467d2a14bcb25ce60076264750b0e
+++ guitone/res/i18n/guitone_de.ts 9a5a21b85a73b535ea7c9501604104629f3067a0
@@ -562,37 +562,37 @@
MainWindow
-
+
View
Ansicht
-
+
Help
Hilfe
-
+
Workspace
Arbeitsbereich
-
+
File
Datei
-
+
Recent Workspaces
Vorherige Arbeitsbereiche
-
+
Open Workspace
Arbeitsbereich öffnen
-
+
Ctrl+O
Strg+O
@@ -602,22 +602,22 @@
Keine vorherigen Arbeitsbereiche verfügbar.
-
+
Preferences....
Einstellungen...
-
+
Ctrl+P
Strg+P
-
+
Quit
Beenden
-
+
Ctrl+Q
Strg+Q
@@ -627,97 +627,97 @@
Ignorierte Dateien verstecken
-
+
Ctrl+H
Strg+H
-
+
All files
Alle Dateien
-
+
A
A
-
+
All changed files
Alle geänderten Dateien
-
+
C
G
-
+
Patched files
Inhaltlich geänderte Dateien
-
+
P
P
-
+
Added files
Hinzugefügte Dateien
-
+
N
H
-
+
Removed files
Entfernte Dateien
-
+
D
E
-
+
Renamed files
Umbenannte Dateien
-
+
R
U
-
+
Missing files
Fehlende Dateien
-
+
M
F
-
+
Unknown files
Unbekannte Dateien
-
+
U
K
-
+
Ignored files
Ignorierte Dateien
-
+
I
I
@@ -727,42 +727,42 @@
Baum aufklappen
-
+
Ctrl+T
Strg+T
-
+
Switch revision
Revision wechseln
-
+
Ctrl+R
Strg+R
-
+
Key management
Schlüsselverwaltung
-
+
Ctrl+K
Strg+K
-
+
About Qt
Ãber Qt
-
+
About guitone
Ãber guitone
-
+
Show
Zeige
@@ -837,12 +837,12 @@
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.
-
+
Recent Databases
Vorherige Datenbanken
-
+
Open Database
Datenbank öffnen
@@ -852,12 +852,12 @@
Keine vorherigen geöffneten Datenbanken verfügbar.
-
+
Database
Datenbank
-
+
Ctrl+Shift+O
Strg+Shift+O
@@ -882,17 +882,17 @@
Keine Datenbank geladen
-
+
Ctrl+B
Strg+B
-
+
Changeset browser
Ãnderungen-Browser
-
+
guitone is in database mode. This means that only parts of the functionality are available.
You can switch back to the workspace mode at any time by loading a workspace.
guitone befindet sich im Datenbank-Modus. Das bedeutet, dass nur Teile der Funktionalität verfügbar sind.
@@ -949,7 +949,7 @@ 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.
monotone returned:
@@ -1118,22 +1118,22 @@ monotone gab zurück:
RevisionManifest
-
+
Error
Fehler
-
+
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.
-
+
Please close this message to remove the temporary file.
Bitte schliessen Sie diesen Dialog, um die temporäre Datei zu entfernen.
-
+
Information
Information
============================================================
--- guitone/src/model/MonotoneDelegate.cpp a199c4fbcb62aba28a5ce3f8dac52923337a9781
+++ guitone/src/model/MonotoneDelegate.cpp 4ebb6a0e87914d4dbe4b3e68be5b206661c08e49
@@ -54,7 +54,7 @@ void MonotoneDelegate::commandFinished()
Monotone * mtn = Monotone::singleton();
// check if this is the command which is interesting for us
- if (mtn->isCommandFinished(commandNumber)) return;
+ if (!mtn->isCommandFinished(commandNumber)) return;
disconnect(
mtn, SIGNAL(commandFinished()),
============================================================
--- guitone/src/monotone/Monotone.cpp 882785c94f5ead9cd672391f7c7b62f0455efa0f
+++ guitone/src/monotone/Monotone.cpp 45f7336112cf9644ec1ca94cd067c37e08ec3ac7
@@ -85,7 +85,6 @@
#include
#include
#include
-#include
#include
Monotone* Monotone::instance = 0;
@@ -351,7 +350,7 @@ bool Monotone::executeCommand(const QStr
}
commandNumber = writeStdin(command, options);
- SignalWaiter waiter(this, SIGNAL(commandFinished(int, int)));
+ SignalWaiter waiter(this, SIGNAL(commandFinished()));
do
{
@@ -490,9 +489,7 @@ QByteArray Monotone::getRawData(int comm
QByteArray Monotone::getRawData(int commandNumber)
{
- QMutex lock;
QMutexLocker locker(&lock);
- lock.lock();
if (!output.contains(commandNumber))
{
@@ -512,6 +509,8 @@ int Monotone::getReturnCode(int commandN
int Monotone::getReturnCode(int commandNumber)
{
+ QMutexLocker locker(&lock);
+
if (!completedCommands.contains(commandNumber))
{
qWarning("Monotone::getReturnCode: no return code for %d", commandNumber);
============================================================
--- guitone/src/monotone/Monotone.h 86adeb6b5c05935100b714ef9659d1e4fa27f4b9
+++ guitone/src/monotone/Monotone.h acbb4071e26433ba787703de88d9a8b67425eaa5
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
class Monotone : public QObject
{
@@ -79,6 +80,7 @@ class Monotone : public QObject
QString workDir;
QString databaseFile;
QString mtnBinaryPath;
+ QMutex lock;
private slots:
void readAndParseStdout();
============================================================
--- guitone/src/view/InventoryView.cpp c563cc7b4a82cc584eaff1f205ffccd568500fb5
+++ guitone/src/view/InventoryView.cpp 2fef05e0c9c4939fc5ea8a83a0b1c4a646afece5
@@ -317,7 +317,7 @@ void InventoryView::changeDirectory(cons
// select the item
selectionModel()->setCurrentIndex(
proxyFolderIndex,
- QItemSelectionModel::ClearAndSelect
+ QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows
);
}
============================================================
--- guitone/src/view/dialogs/RevisionManifest.cpp 124c563333148bd821655d05486a6eaa23e813b5
+++ guitone/src/view/dialogs/RevisionManifest.cpp e35d765f7bc50c3dbd3497a9b87c2d73e53be2cd
@@ -106,7 +106,6 @@ void RevisionManifest::openFile(const QM
Monotone * mtn = Monotone::singleton();
int commandNumber;
- int returnCode;
QStringList cmd;
cmd << "get_file" << entry->hash;