#
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [e2d0e1ece65602423d9df61828e8d0911b4579b3]
#    to [ece9c70819331cfccb4a350976db0d43cc1ae673]
#
# patch "guitone/src/view/MainWindow.cpp"
#  from [7c815e194238287d2253ae81d76627724e6fa733]
#    to [7a525ef5febb4f91fb562afefdc576a805bbc3e7]
#
# patch "guitone/src/view/dialogs/About.cpp"
#  from [de1a4055e5fe78f6a43c1f4672174a852811354f]
#    to [a4c3715c5b16b73a41f8d4b251e351efa83f7e5e]
#
# patch "guitone/src/view/dialogs/About.h"
#  from [1641fea6f1dd00635f0a6a4d3174e6b42da76dda]
#    to [c07a76d51189ad026cf5336fbfe91d223b21156d]
#
# patch "guitone/src/view/dialogs/Dialog.cpp"
#  from [aeb857f5148de1e893ce7f6cfcb49f5375d8f45f]
#    to [dafd6a6a4cde4a53164b001665d0bf1fe3b6c007]
#
# patch "guitone/src/view/dialogs/Dialog.h"
#  from [cb53b8604ec8c5b2268354d6c00fef8fafd830c8]
#    to [39a78dfcb52548eac3012ef78dab3de7cec9c3a3]
#
# patch "guitone/src/view/dialogs/Preferences.cpp"
#  from [aee8e3701cad4b88fcc8f8d32f0fe836d7083b00]
#    to [8b5eb4b83c884cace024a98bd403bb665d2a30d9]
#
============================================================
--- guitone/res/i18n/guitone_de.ts	e2d0e1ece65602423d9df61828e8d0911b4579b3
+++ guitone/res/i18n/guitone_de.ts	ece9c70819331cfccb4a350976db0d43cc1ae673
@@ -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="30"/>
+        <location filename="../../src/view/dialogs/About.cpp" line="35"/>
         <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="44"/>
+        <location filename="../../src/view/dialogs/About.cpp" line="49"/>
         <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>
@@ -597,7 +597,7 @@
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="411"/>
+        <location filename="../../src/view/MainWindow.cpp" line="412"/>
         <source>No previous workspaces available.</source>
         <translation>Keine vorherigen Arbeitsbereiche verfügbar.</translation>
     </message>
@@ -622,7 +622,7 @@
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="341"/>
+        <location filename="../../src/view/MainWindow.cpp" line="342"/>
         <source>Hide ignored files</source>
         <translation>Ignorierte Dateien verstecken</translation>
     </message>
@@ -722,7 +722,7 @@
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="377"/>
+        <location filename="../../src/view/MainWindow.cpp" line="378"/>
         <source>Expand tree</source>
         <translation>Baum aufklappen</translation>
     </message>
@@ -772,67 +772,67 @@
         <translation>guitone - ein Frontend für monotone</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="74"/>
+        <location filename="../../src/view/MainWindow.cpp" line="75"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="190"/>
+        <location filename="../../src/view/MainWindow.cpp" line="191"/>
         <source>Critical Monotone Error</source>
         <translation>Kritischer monotone-Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="199"/>
+        <location filename="../../src/view/MainWindow.cpp" line="200"/>
         <source>Select your workspace...</source>
         <translation>Wählen Sie Ihren Arbeitsbereich aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="274"/>
+        <location filename="../../src/view/MainWindow.cpp" line="275"/>
         <source>Loading aborted</source>
         <translation>Laden abgebrochen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="218"/>
+        <location filename="../../src/view/MainWindow.cpp" line="219"/>
         <source>Invalid workspace</source>
         <translation>Ungültiger Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="219"/>
+        <location filename="../../src/view/MainWindow.cpp" line="220"/>
         <source>The chosen directory is no monotone workspace!</source>
         <translation>Das gewählte Verzeichnis ist kein monotone-Arbeitsverzeichnis!</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="232"/>
+        <location filename="../../src/view/MainWindow.cpp" line="233"/>
         <source>Unable to execute command</source>
         <translation>Konnte Kommando nicht ausführen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="233"/>
+        <location filename="../../src/view/MainWindow.cpp" line="234"/>
         <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>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="246"/>
+        <location filename="../../src/view/MainWindow.cpp" line="247"/>
         <source>Loading workspace...</source>
         <translation>Lade Arbeitsbereich...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="342"/>
+        <location filename="../../src/view/MainWindow.cpp" line="343"/>
         <source>Show ignored files</source>
         <translation>Zeige ignorierte Dateien</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="378"/>
+        <location filename="../../src/view/MainWindow.cpp" line="379"/>
         <source>Collapse tree</source>
         <translation>Baum zuklappen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="446"/>
+        <location filename="../../src/view/MainWindow.cpp" line="447"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="79"/>
+        <location filename="../../src/view/MainWindow.cpp" line="80"/>
         <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>
@@ -847,7 +847,7 @@
         <translation>Datenbank öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="437"/>
+        <location filename="../../src/view/MainWindow.cpp" line="438"/>
         <source>No previous databases available.</source>
         <translation>Keine vorherigen geöffneten Datenbanken verfügbar.</translation>
     </message>
@@ -862,22 +862,22 @@
         <translation>Strg+Shift+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="328"/>
+        <location filename="../../src/view/MainWindow.cpp" line="329"/>
         <source>Loaded database: %1</source>
         <translation>Geladene Datenbank: %1</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="267"/>
+        <location filename="../../src/view/MainWindow.cpp" line="268"/>
         <source>Select your database...</source>
         <translation>Wählen Sie eine Datenbank aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="270"/>
+        <location filename="../../src/view/MainWindow.cpp" line="271"/>
         <source>monotone Databases (*.mtn *.db)</source>
         <translation>monotone-Datenbanken (*.mtn *.db)</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="328"/>
+        <location filename="../../src/view/MainWindow.cpp" line="329"/>
         <source>No database loaded</source>
         <translation>Keine Datenbank geladen</translation>
     </message>
@@ -963,52 +963,52 @@ monotone gab zurück:
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="72"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="75"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="89"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="92"/>
         <source>Notice</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="92"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="95"/>
         <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="114"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="117"/>
         <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="117"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="120"/>
         <source>Binaries (mtn mtn.exe)</source>
         <translation>Ausführbare Dateien (mtn mtn.exe)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="77"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="80"/>
         <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="44"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
         <source>Low (fatal errors)</source>
         <translation>Niedrig (fatale Fehler)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="45"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="48"/>
         <source>Medium (critical errors)</source>
         <translation>Mittel (kritische Fehler)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="46"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="49"/>
         <source>High (warnings)</source>
         <translation>Hoch (Warnungen)</translation>
     </message>
     <message>
-        <location filename="../../src/view/dialogs/Preferences.cpp" line="47"/>
+        <location filename="../../src/view/dialogs/Preferences.cpp" line="50"/>
         <source>All (debug messages)</source>
         <translation>Alle (Debug-Meldungen)</translation>
     </message>
@@ -1064,22 +1064,22 @@ monotone gab zurück:
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="53"/>
+        <location filename="../../src/view/MainWindow.cpp" line="54"/>
         <source>Ctrl</source>
         <translation>Strg</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="55"/>
+        <location filename="../../src/view/MainWindow.cpp" line="56"/>
         <source>Shift</source>
         <translation>Umschalt</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="54"/>
+        <location filename="../../src/view/MainWindow.cpp" line="55"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="56"/>
+        <location filename="../../src/view/MainWindow.cpp" line="57"/>
         <source>Meta</source>
         <translation>Meta</translation>
     </message>
============================================================
--- guitone/src/view/MainWindow.cpp	7c815e194238287d2253ae81d76627724e6fa733
+++ guitone/src/view/MainWindow.cpp	7a525ef5febb4f91fb562afefdc576a805bbc3e7
@@ -45,6 +45,7 @@ MainWindow::MainWindow()
 {
     gotError = false;
     mode = None;
+    setAttribute(Qt::WA_MacMetalStyle);
 }

 bool MainWindow::init()
@@ -463,7 +464,7 @@ void MainWindow::on_actionPreferences_tr
 void MainWindow::on_actionPreferences_triggered()
 {
     Preferences dialog(this);
-    dialog.exec();
+    dialog.execDocumentModal();
 }

 void MainWindow::on_actionKey_management_triggered()
@@ -481,7 +482,7 @@ void MainWindow::on_actionAbout_guitone_
 void MainWindow::on_actionAbout_guitone_triggered()
 {
     About dialog(this);
-    dialog.exec();
+    dialog.execDocumentModal();
 }

 void MainWindow::on_actionAbout_Qt_triggered()
============================================================
--- guitone/src/view/dialogs/About.cpp	de1a4055e5fe78f6a43c1f4672174a852811354f
+++ guitone/src/view/dialogs/About.cpp	a4c3715c5b16b73a41f8d4b251e351efa83f7e5e
@@ -23,9 +23,14 @@ const int About::VersionMinor = 5;
 const int About::VersionMajor = 0;
 const int About::VersionMinor = 5;

-About::About(QWidget* parent) : QDialog(parent)
+About::About(QWidget* parent) : Dialog(parent)
 {
     setupUi(this);
+    Dialog::init();
+
+    // OSX sheet-alike dialog
+    setWindowFlags(windowFlags() |  Qt::Sheet);
+
     aboutText->setText(
         tr("<small>Version %1.%2</small>").arg(VersionMajor).arg(VersionMinor) +
         tr("<br/><br/>Authors: "
============================================================
--- guitone/src/view/dialogs/About.h	1641fea6f1dd00635f0a6a4d3174e6b42da76dda
+++ guitone/src/view/dialogs/About.h	c07a76d51189ad026cf5336fbfe91d223b21156d
@@ -22,8 +22,9 @@
 #define ABOUT_H

 #include "ui_about.h"
+#include "Dialog.h"

-class About : public QDialog, private Ui::AboutDialog
+class About : public Dialog, private Ui::AboutDialog
 {
 	Q_OBJECT

============================================================
--- guitone/src/view/dialogs/Dialog.cpp	aeb857f5148de1e893ce7f6cfcb49f5375d8f45f
+++ guitone/src/view/dialogs/Dialog.cpp	dafd6a6a4cde4a53164b001665d0bf1fe3b6c007
@@ -20,13 +20,18 @@

 #include "Dialog.h"
 #include "Settings.h"
+#include "SignalWaiter.h"

-Dialog::Dialog(QWidget* parent) : QDialog(parent) {}
+Dialog::Dialog(QWidget* parent) : QDialog(parent)
+{
+    setAttribute(Qt::WA_MacMetalStyle);
+}

 Dialog::Dialog(QWidget* parent, QString objName)
 : QDialog(parent)
 {
 	setObjectName(objName);
+    setAttribute(Qt::WA_MacMetalStyle);
 }

 Dialog::~Dialog()
@@ -49,4 +54,17 @@ void Dialog::saveState(void)
     Settings::setWindowGeometry(saveGeometry(), objectName());
 }

+// On OSX this will allow the dialog to be display document modal,
+// i.e. as a sheet coming out of the parent window. On other platforms
+// this just emulates the behaviour of exec() by blocking until the
+// finished() signal has been called
+// For more info about document modal dialogs on OSX, go here:
+// http://doc.trolltech.com/qq/qq18-macfeatures.html
+int Dialog::execDocumentModal()
+{
+    show();
+    SignalWaiter waiter(this, SIGNAL(finished(int)));
+    waiter.wait();
+    return result();
+}

============================================================
--- guitone/src/view/dialogs/Dialog.h	cb53b8604ec8c5b2268354d6c00fef8fafd830c8
+++ guitone/src/view/dialogs/Dialog.h	39a78dfcb52548eac3012ef78dab3de7cec9c3a3
@@ -32,6 +32,7 @@ public:
 	Dialog(QWidget*, QString);
 	~Dialog();
     void init();
+    int execDocumentModal();

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

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

     enableConsoleLog->setCheckState(DebugLog::getConsoleLogEnabled() ?