#
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [ece9c70819331cfccb4a350976db0d43cc1ae673]
#    to [13a0676a5378cee93965cd794cae3b8bd1a896db]
#
# patch "guitone/src/view/MainWindow.cpp"
#  from [7a525ef5febb4f91fb562afefdc576a805bbc3e7]
#    to [59056dbbe09d50ff14081d1e7158cae80178da75]
#
# patch "guitone/src/view/dialogs/About.cpp"
#  from [2af16dc781bf4722529b705c46063263cfabb08f]
#    to [e879667edfb7c92c92ed11e36ee1506aa6dea660]
#
# patch "guitone/src/view/dialogs/DatabaseView.cpp"
#  from [06c1298cbbdf800222e15ffa236507f26c3d48f9]
#    to [873ba8e628b0918c0d96c61bd920b64f1587d000]
#
# patch "guitone/src/view/dialogs/KeyManagement.cpp"
#  from [891f5c01e99f0438287e418c826c204c748953c4]
#    to [a57f544194f11df59d66b4dd2447c24ff899ae9d]
#
# patch "guitone/src/view/dialogs/Preferences.cpp"
#  from [90a2e26819212133a092fd13d08674cf9e5865c6]
#    to [aee8e3701cad4b88fcc8f8d32f0fe836d7083b00]
#
# patch "guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp"
#  from [127bd106bdfb66f43381f824a2a831a8eb97a4d0]
#    to [4577dc3fa56e55ccfe2cbcfe3e31a413f9148f80]
#
============================================================
--- guitone/res/i18n/guitone_de.ts	ece9c70819331cfccb4a350976db0d43cc1ae673
+++ guitone/res/i18n/guitone_de.ts	13a0676a5378cee93965cd794cae3b8bd1a896db
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
 <context>
     <name>About</name>
     <message>
-        <location filename="../../src/view/dialogs/About.cpp" line="35"/>
+        <location filename="../../src/view/dialogs/About.cpp" line="32"/>
         <source>&lt;small&gt;Version %1.%2&lt;/small&gt;</source>
         <translation>&lt;small&gt;Version %1.%2&lt;/small&gt;</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/About.cpp" line="49"/>
+        <location filename="../../src/view/dialogs/About.cpp" line="46"/>
         <source>&lt;br/&gt;&lt;br/&gt;Authors: &lt;a href=&quot;mailto:address@hidden&quot;&gt;Thomas Keller&lt;/a&gt;, &lt;a href=&quot;mailto:address@hidden&quot;&gt;Ingo Maindorfer&lt;/a&gt; and &lt;a href=&quot;mailto:address@hidden&quot;&gt;Jean-Louis Fuchs&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;This program is free software; you can redistribute it and/or modify&lt;br/&gt;it under the terms of the GNU General Public License as published by&lt;br/&gt;the Free Software Foundation; either version 2 of the License, or&lt;br/&gt;(at your option) any later version.&lt;br/&gt;&lt;br/&gt;Bugs? Suggestions? Help? &lt;a href=&quot;http://guitone.thomaskeller.biz&quot;&gt;guitone Homepage&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Many thanks go to the friendly guys at &lt;a href=&quot;irc://irc.freenode.net/qt&quot;&gt;#qt&lt;/a&gt; for their helpful&lt;br/&gt;comments during endless coding sessions - you guys rock!</source>
         <translation>&lt;br/&gt;&lt;br/&gt;Autoren: &lt;a href=&quot;mailto:address@hidden&quot;&gt;Thomas Keller&lt;/a&gt;, &lt;a href=&quot;mailto:address@hidden&quot;&gt;Ingo Maindorfer&lt;/a&gt; und &lt;a href=&quot;mailto:address@hidden&quot;&gt;Jean-Louis Fuchs&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Dieses Programm ist freie Software. Sie können es unter den&lt;br/&gt;Bedingungen der GNU General Public License, wie von der&lt;br/&gt;Free Software Foundation veröffentlicht, weitergeben und/oder&lt;br/&gt;modifizieren, entweder gemäß Version 2 der Lizenz oder &lt;br/&gt;(nach Ihrer Option) jeder späteren Version.&lt;br/&gt;&lt;br/&gt;Fehler? Vorschläge? Hilfe? &lt;a href=&quot;http://guitone.thomaskeller.biz&quot;&gt;guitone Webseite&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Vielen Dank an die freundlichen Seelen auf &lt;a href=&quot;irc://irc.freenode.net/qt&quot;&gt;#qt&lt;/a&gt; für die Hilfe während der&lt;br/&gt;unendlich langen Programmierstunden - Ihr Jungs s
eid Spitze!</translation>
     </message>
@@ -496,27 +496,27 @@
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="43"/>
+        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="46"/>
         <source>Unable to execute command</source>
         <translation>Konnte Kommando nicht ausführen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="58"/>
+        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="61"/>
         <source>Copy key name to clipboard</source>
         <translation>Kopiere Schlüsselnamen in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="62"/>
+        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="65"/>
         <source>Copy public key hash to clipboard</source>
         <translation>Kopiere öffentliche Prüfsumme in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="66"/>
+        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="69"/>
         <source>Copy public key data to clipboard</source>
         <translation>Kopiere öffentliche Schlüsseldaten in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="44"/>
+        <location filename="../../src/view/dialogs/KeyManagement.cpp" line="47"/>
         <source>Unable to execute &apos;%1&apos; - maybe another command is still running?</source>
         <translation>Konnte &apos;%1&apos; nicht ausführen - eventuell läuft noch ein anderes Kommando?</translation>
     </message>
@@ -963,52 +963,52 @@ monotone gab zurück:
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="75"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="72"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="92"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="89"/>
         <source>Notice</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="95"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="92"/>
         <source>You need to reload your current workspace or restart guitone to use the new monotone binary.</source>
         <translation>Sie müssen Ihren derzeitigen Arbeitsbereich neu laden oder guitone neu starten, um die neuen Einstellungen zu verwenden.</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="114"/>
         <source>Choose the monotone executable</source>
         <translation>Wählen Sie die ausführbare Datei von monotone</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="120"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
         <source>Binaries (mtn mtn.exe)</source>
         <translation>Ausführbare Dateien (mtn mtn.exe)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="80"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="77"/>
         <source>The path to the monotone binary is either invalid or points to an older version of monotone. Guitone requires monotone version %1 or a monotone with interface version %2 or later.</source>
         <translation>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.</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="44"/>
         <source>Low (fatal errors)</source>
         <translation>Niedrig (fatale Fehler)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="48"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="45"/>
         <source>Medium (critical errors)</source>
         <translation>Mittel (kritische Fehler)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="49"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="46"/>
         <source>High (warnings)</source>
         <translation>Hoch (Warnungen)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="50"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
         <source>All (debug messages)</source>
         <translation>Alle (Debug-Meldungen)</translation>
     </message>
@@ -1189,27 +1189,27 @@ monotone gab zurück:
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="38"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="42"/>
         <source>Branch</source>
         <translation>Zweig</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="39"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="43"/>
         <source>Tag</source>
         <translation>Marke</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="40"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="44"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="41"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="45"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="42"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="46"/>
         <source>Custom</source>
         <translation>Selbstdefiniert</translation>
     </message>
@@ -1219,32 +1219,32 @@ monotone gab zurück:
         <translation>beinhaltet</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="37"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="41"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="199"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="203"/>
         <source>Invalid selection</source>
         <translation>Ungültige Auswahl</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="200"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="204"/>
         <source>The given selection could not be processed: %1</source>
         <translation>Die eingegebene Auswahl kann nicht ausgeführt werden: %1</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="43"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="47"/>
         <source>Combined</source>
         <translation>Kombiniert</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="184"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="188"/>
         <source>Unable to execute command</source>
         <translation>Konnte Kommando nicht ausführen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="185"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="189"/>
         <source>Unable to execute &apos;%1&apos; - maybe another command is still running?</source>
         <translation>Konnte &apos;%1&apos; nicht ausführen - eventuell läuft noch ein anderes Kommando?</translation>
     </message>
@@ -1264,22 +1264,22 @@ monotone gab zurück:
         <translation>Änderungen anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="314"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="318"/>
         <source>First: %1...</source>
         <translation>Erste: %1...</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="323"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="327"/>
         <source>Second: %1...</source>
         <translation>Zweite: %1...</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="378"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="382"/>
         <source>Select as first revision</source>
         <translation>Als erste Revision auswählen</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="379"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="383"/>
         <source>Select as second revision</source>
         <translation>Als zweite Revision auswählen</translation>
     </message>
@@ -1289,7 +1289,7 @@ monotone gab zurück:
         <translation type="obsolete">Dateien </translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="376"/>
+        <location filename="../../src/view/dialogs/SwitchWorkspaceRevision.cpp" line="380"/>
         <source>View files in this revision</source>
         <translation>Zeige Dateien dieser Revision</translation>
     </message>
============================================================
--- guitone/src/view/MainWindow.cpp	7a525ef5febb4f91fb562afefdc576a805bbc3e7
+++ guitone/src/view/MainWindow.cpp	59056dbbe09d50ff14081d1e7158cae80178da75
@@ -458,31 +458,31 @@ void MainWindow::on_actionSwitch_revisio
     // before this works,  we obviously need a separate update command
     // wrapper which signals us that we can re-read the inventory...
     SwitchWorkspaceRevision dialog(this);
-    dialog.exec();
+    dialog.execDocumentModal();
 }

 void MainWindow::on_actionPreferences_triggered()
 {
     Preferences dialog(this);
-    dialog.execDocumentModal();
+    dialog.exec();
 }

 void MainWindow::on_actionKey_management_triggered()
 {
     KeyManagement dialog(this);
-    dialog.exec();
+    dialog.execDocumentModal();
 }

 void MainWindow:: on_actionChangeset_browser_triggered()
 {
     DatabaseView dialog(this);
-    dialog.exec();
+    dialog.execDocumentModal();
 }

 void MainWindow::on_actionAbout_guitone_triggered()
 {
     About dialog(this);
-    dialog.execDocumentModal();
+    dialog.exec();
 }

 void MainWindow::on_actionAbout_Qt_triggered()
============================================================
--- guitone/src/view/dialogs/About.cpp	2af16dc781bf4722529b705c46063263cfabb08f
+++ guitone/src/view/dialogs/About.cpp	e879667edfb7c92c92ed11e36ee1506aa6dea660
@@ -28,9 +28,6 @@ About::About(QWidget* parent) : Dialog(p
     setupUi(this);
     Dialog::init();

-    // OSX sheet-alike dialog
-    setWindowFlags(Qt::Sheet);
-
     aboutText->setText(
         tr("<small>Version %1.%2</small>").arg(VersionMajor).arg(VersionMinor) +
         tr("<br/><br/>Authors: "
============================================================
--- guitone/src/view/dialogs/DatabaseView.cpp	06c1298cbbdf800222e15ffa236507f26c3d48f9
+++ guitone/src/view/dialogs/DatabaseView.cpp	873ba8e628b0918c0d96c61bd920b64f1587d000
@@ -27,6 +27,9 @@ DatabaseView::DatabaseView(QWidget *pare
 	setupUi(this);
     Dialog::init();

+    // OSX sheet-alike dialog
+    setWindowFlags(Qt::Sheet);
+
 	this->setWindowFlags(this->windowFlags() | Qt::WindowMaximizeButtonHint);
 	this->setWindowFlags(this->windowFlags() | Qt::WindowMinimizeButtonHint);
 	innerSplitter->init();
============================================================
--- guitone/src/view/dialogs/KeyManagement.cpp	891f5c01e99f0438287e418c826c204c748953c4
+++ guitone/src/view/dialogs/KeyManagement.cpp	a57f544194f11df59d66b4dd2447c24ff899ae9d
@@ -32,7 +32,10 @@ KeyManagement::KeyManagement(QWidget* pa
 {
     setupUi(this);
 	Dialog::init();
-
+
+    // OSX sheet-alike dialog
+    setWindowFlags(Qt::Sheet);
+
     model = new Keys(this);
     keyList->setModel(model);

============================================================
--- guitone/src/view/dialogs/Preferences.cpp	90a2e26819212133a092fd13d08674cf9e5865c6
+++ guitone/src/view/dialogs/Preferences.cpp	aee8e3701cad4b88fcc8f8d32f0fe836d7083b00
@@ -32,9 +32,6 @@ Preferences::Preferences(QWidget* parent
     setupUi(this);
     Dialog::init();

-    // OSX sheet-alike dialog
-    setWindowFlags(Qt::Sheet);
-
     mtnExecutablePath->setText(Settings::getMtnBinaryPath());

     enableConsoleLog->setCheckState(DebugLog::getConsoleLogEnabled() ?
============================================================
--- guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp	127bd106bdfb66f43381f824a2a831a8eb97a4d0
+++ guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp	4577dc3fa56e55ccfe2cbcfe3e31a413f9148f80
@@ -31,6 +31,10 @@ SwitchWorkspaceRevision::SwitchWorkspace
 {
     setupUi(this);
     Dialog::init();
+
+    // OSX sheet-alike dialog
+    setWindowFlags(Qt::Sheet);
+
     splitter->init();

     // add some items to the selector box