#
#
# add_file "guitone/src/Guitone.cpp"
#  content [a48983b8fc37521f84ddf65367a198b9d516ede8]
#
# add_file "guitone/src/Guitone.h"
#  content [3d3bd25f8214e1781dbd3adbdaa23cee3ad10b4e]
#
# patch "guitone/guitone.pro"
#  from [9b20114423976ef087fecfb8d13866aff121a8f6]
#    to [73540fd82e20d285acdfbc3069b410942b96cf55]
#
# patch "guitone/res/forms/main_window.ui"
#  from [b611a237125bf81911e87b6863d35f9c9c6785f5]
#    to [34f23a7be62f106aa0ff21ed5cc936a6f0e62495]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [ba2bb18b98b4f3c34893be1658da9e1ae926b51b]
#    to [83840573c9977cf20324c545c022e06d18ee8d97]
#
# patch "guitone/src/main.cpp"
#  from [43f4662e814165beeb2efdf51d1cc61d29e2595c]
#    to [7d3deba4170d9e0d60b58b8abdd19c253a7eae0c]
#
# patch "guitone/src/model/Changeset.h"
#  from [74dcd9bfe67b89a639def7bea232b997ec810f30]
#    to [ae1c6b68c80772aa211cd4e62ac09424e25827d7]
#
# patch "guitone/src/model/GetBranchLog.h"
#  from [9246d87a81b2746aa9e5b8bc87a2f1b0e4037499]
#    to [1e715cc307663f44788299c62e564d7eb16a101d]
#
# patch "guitone/src/view/MainWindow.cpp"
#  from [59056dbbe09d50ff14081d1e7158cae80178da75]
#    to [aec19809367c4f89bb4dccf524f35dd8ed108c0f]
#
# patch "guitone/src/view/MainWindow.h"
#  from [bf1f12efde46c96a0194070d00a9677c8f29e0cd]
#    to [c56fc1fb9768759a01093105fa03415d98474522]
#
============================================================
--- guitone/src/Guitone.cpp	a48983b8fc37521f84ddf65367a198b9d516ede8
+++ guitone/src/Guitone.cpp	a48983b8fc37521f84ddf65367a198b9d516ede8
@@ -0,0 +1,267 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Thomas Keller                                   *
+ *   address@hidden                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "Guitone.h"
+#include "DebugLog.h"
+#include "MainWindow.h"
+#include "Monotone.h"
+#include "Preferences.h"
+#include "Settings.h"
+
+#include <QLocale>
+#include <QTranslator>
+#include <QMessageBox>
+#include <QTimer>
+#include <QMutexLocker>
+
+void guitoneMsgHandler(QtMsgType type, const char *msg)
+{
+    switch (type)
+    {
+        case QtDebugMsg:
+            DebugLog::debug(msg);
+            break;
+        case QtWarningMsg:
+            DebugLog::warn(msg);
+            break;
+        case QtCriticalMsg:
+            DebugLog::critical(msg);
+            break;
+        case QtFatalMsg:
+            DebugLog::fatal(msg);
+            abort();
+     }
+}
+
+Guitone::Guitone(int argc, char** argv) : QApplication(argc, argv)
+{
+    qInstallMsgHandler(guitoneMsgHandler);
+
+    setQuitOnLastWindowClosed(false);
+
+    gotError = false;
+
+    setOrganizationName("Thomas Keller");
+    setOrganizationDomain("thomaskeller.biz");
+    setApplicationName("guitone");
+
+    // try to find a suitable locale and setup translations
+    QString locale = QLocale::system().name();
+    QTranslator translator;
+
+	QString transFileName("guitone_" + locale);
+	if (translator.load(transFileName, ":/i18n"))
+    {
+        installTranslator(&translator);
+    }
+
+    Monotone * mtn = Monotone::singleton(this);
+
+    // catch critical errors from the Monotone class
+    connect(
+		mtn, SIGNAL(criticalError(const QString &)),
+        this, SLOT(criticalMtnError(const QString &))
+    );
+
+    // check the current monotone version and prompt the user
+    // to enter the correct path if there is a problem
+    if (!mtn->setMtnBinaryPath(Settings::getMtnBinaryPath()))
+    {
+        QMessageBox::critical(
+            NULL,
+            tr("Error"),
+            tr("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.")
+            .arg(Monotone::RequiredProgramVersion)
+            .arg(Monotone::RequiredInterfaceVersion),
+            QMessageBox::Ok, 0, 0
+        );
+
+        Preferences dialog(NULL);
+        if (dialog.exec() == QDialog::Rejected)
+        {
+            return;
+        }
+    }
+
+    MainWindow * mainWnd = addWindow();
+    mainWnd->loadRecent();
+    mainWnd->show();
+}
+
+Guitone::~Guitone() {}
+
+void Guitone::criticalMtnError(const QString & msg)
+{
+	if (gotError == false)
+	{
+		gotError = true;
+
+        // restore the normal cursor
+        restoreOverrideCursor();
+
+		QMessageBox::critical(NULL, tr("Critical Monotone Error"),
+							  msg, QMessageBox::Ok, 0, 0);
+
+        // TODO: we should disable all views now, or what?
+    }
+}
+
+void Guitone::loadWorkspace(const QString & path)
+{
+    MainWindow * wnd = addWindow();
+    if (!wnd->doLoadWorkspace(path))
+    {
+        removeWindow(wnd);
+        return;
+    }
+    wnd->show();
+}
+
+void Guitone::loadDatabase(const QString & path)
+{
+    MainWindow * wnd = addWindow();
+    if (!wnd->doLoadDatabase(path))
+    {
+        removeWindow(wnd);
+        return;
+    }
+    wnd->show();
+}
+
+void Guitone::windowClosed(MainWindow * wnd)
+{
+    removeWindow(wnd);
+    if (openWindows.size() == 0) quit();
+}
+
+MainWindow * Guitone::addWindow()
+{
+    QMutexLocker locker(&lock);
+
+    MainWindow * wnd = new MainWindow();
+
+    connect(
+        wnd, SIGNAL(quitApplication()),
+        this, SLOT(quit())
+    );
+
+    connect(
+        wnd, SIGNAL(loadWorkspace(const QString &)),
+        this, SLOT(loadWorkspace(const QString &))
+    );
+
+    connect(
+        wnd, SIGNAL(loadDatabase(const QString &)),
+        this, SLOT(loadDatabase(const QString &))
+    );
+
+    for (int i=0, j=openWindows.size(); i<j; i++)
+    {
+        MainWindow * other = openWindows.at(i);
+        connect(
+            wnd, SIGNAL(updatePreviousWorkspacesMenu()),
+            other, SLOT(doUpdatePreviousWorkspacesMenu())
+        );
+
+        connect(
+            wnd, SIGNAL(updatePreviousDatabasesMenu()),
+            other, SLOT(doUpdatePreviousDatabasesMenu())
+        );
+
+        connect(
+            other, SIGNAL(updatePreviousWorkspacesMenu()),
+            wnd, SLOT(doUpdatePreviousWorkspacesMenu())
+        );
+
+        connect(
+            other, SIGNAL(updatePreviousDatabasesMenu()),
+            wnd, SLOT(doUpdatePreviousDatabasesMenu())
+        );
+    }
+
+    openWindows.append(wnd);
+
+    return wnd;
+}
+
+void Guitone::removeWindow(MainWindow * wnd)
+{
+    QMutexLocker locker(&lock);
+
+    int i = openWindows.indexOf(wnd);
+    if (i == -1) return;
+    openWindows.removeAt(i);
+
+    disconnect(
+        wnd, SIGNAL(quitApplication()),
+        this, SLOT(quit())
+    );
+
+    disconnect(
+        wnd, SIGNAL(loadWorkspace(const QString &)),
+        this, SLOT(loadWorkspace(const QString &))
+    );
+
+    disconnect(
+        wnd, SIGNAL(loadDatabase(const QString &)),
+        this, SLOT(loadDatabase(const QString &))
+    );
+
+    for (int i=0, j=openWindows.size(); i<j; i++)
+    {
+        MainWindow * other = openWindows.at(i);
+        connect(
+            wnd, SIGNAL(updatePreviousWorkspacesMenu()),
+            other, SLOT(doUpdatePreviousWorkspacesMenu())
+        );
+
+        connect(
+            wnd, SIGNAL(updatePreviousDatabasesMenu()),
+            other, SLOT(doUpdatePreviousDatabasesMenu())
+        );
+
+        connect(
+            other, SIGNAL(updatePreviousWorkspacesMenu()),
+            wnd, SLOT(doUpdatePreviousWorkspacesMenu())
+        );
+
+        connect(
+            other, SIGNAL(updatePreviousDatabasesMenu()),
+            wnd, SLOT(doUpdatePreviousDatabasesMenu())
+        );
+    }
+
+    delete wnd;
+}
+
+void Guitone::quit()
+{
+    Settings::sync();
+
+    // close all open windows
+    for (int i=0, j=openWindows.size(); i<j; i++)
+    {
+        removeWindow(openWindows.at(i));
+    }
+}
+
============================================================
--- guitone/src/Guitone.h	3d3bd25f8214e1781dbd3adbdaa23cee3ad10b4e
+++ guitone/src/Guitone.h	3d3bd25f8214e1781dbd3adbdaa23cee3ad10b4e
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Thomas Keller                                   *
+ *   address@hidden                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef GUITONE_H
+#define GUITONE_H
+
+#include "MainWindow.h"
+
+#include <QApplication>
+#include <QList>
+#include <QMutex>
+
+class Guitone : public QApplication
+{
+	Q_OBJECT
+
+public:
+    Guitone(int, char**);
+	~Guitone();
+
+private slots:
+    void criticalMtnError(const QString &);
+    void loadWorkspace(const QString &);
+    void loadDatabase(const QString &);
+    void windowClosed(MainWindow *);
+    void quit();
+
+private:
+    MainWindow * addWindow();
+    void removeWindow(MainWindow *);
+
+	bool gotError;
+    QList<MainWindow *> openWindows;
+    QMutex lock;
+};
+
+#endif
+
============================================================
--- guitone/guitone.pro	9b20114423976ef087fecfb8d13866aff121a8f6
+++ guitone/guitone.pro	73540fd82e20d285acdfbc3069b410942b96cf55
@@ -57,7 +57,8 @@ HEADERS += src/view/MainWindow.h \
            src/util/Platform.h \
            src/util/TreeBuilder.h \
            src/util/DebugLog.h \
-           src/util/StdioParser.h
+           src/util/StdioParser.h \
+           src/Guitone.h
 SOURCES += src/view/MainWindow.cpp \
            src/view/TreeView.cpp \
            src/view/Splitter.cpp \
@@ -104,6 +105,7 @@ SOURCES += src/view/MainWindow.cpp \
            src/util/TreeBuilder.cpp \
            src/util/DebugLog.cpp \
            src/util/StdioParser.cpp \
+           src/Guitone.cpp \
            src/main.cpp

 FORMS   += res/forms/switch_workspace.ui \
============================================================
--- guitone/res/forms/main_window.ui	b611a237125bf81911e87b6863d35f9c9c6785f5
+++ guitone/res/forms/main_window.ui	34f23a7be62f106aa0ff21ed5cc936a6f0e62495
@@ -128,32 +128,6 @@ You can switch back to the workspace mod
      <height>22</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
-     <string>File</string>
-    </property>
-    <widget class="QMenu" name="menuRecent_Databases" >
-     <property name="title" >
-      <string>Recent Databases</string>
-     </property>
-     <addaction name="actionNo_previous_databases_available" />
-    </widget>
-    <widget class="QMenu" name="menuRecent_Workspaces" >
-     <property name="title" >
-      <string>Recent Workspaces</string>
-     </property>
-     <addaction name="actionNo_recent_workspaces_found" />
-    </widget>
-    <addaction name="actionOpen_Workspace" />
-    <addaction name="menuRecent_Workspaces" />
-    <addaction name="separator" />
-    <addaction name="actionOpen_Database" />
-    <addaction name="menuRecent_Databases" />
-    <addaction name="separator" />
-    <addaction name="actionPreferences" />
-    <addaction name="separator" />
-    <addaction name="actionQuit" />
-   </widget>
    <widget class="QMenu" name="menuHelp" >
     <property name="title" >
      <string>Help</string>
@@ -200,6 +174,34 @@ You can switch back to the workspace mod
     <addaction name="actionExpand_tree" />
     <addaction name="menuShow" />
    </widget>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>File</string>
+    </property>
+    <widget class="QMenu" name="menuRecent_Databases" >
+     <property name="title" >
+      <string>Recent Databases</string>
+     </property>
+     <addaction name="actionNo_previous_databases_available" />
+    </widget>
+    <widget class="QMenu" name="menuRecent_Workspaces" >
+     <property name="title" >
+      <string>Recent Workspaces</string>
+     </property>
+     <addaction name="actionNo_recent_workspaces_found" />
+    </widget>
+    <addaction name="actionOpen_Workspace" />
+    <addaction name="menuRecent_Workspaces" />
+    <addaction name="separator" />
+    <addaction name="actionOpen_Database" />
+    <addaction name="menuRecent_Databases" />
+    <addaction name="separator" />
+    <addaction name="actionClose" />
+    <addaction name="separator" />
+    <addaction name="actionPreferences" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
    <addaction name="menuFile" />
    <addaction name="menuView" />
    <addaction name="menuWorkspace" />
@@ -244,6 +246,9 @@ You can switch back to the workspace mod
    <property name="shortcut" >
     <string>Ctrl+Q</string>
    </property>
+   <property name="shortcutContext" >
+    <enum>Qt::ApplicationShortcut</enum>
+   </property>
    <property name="menuRole" >
     <enum>QAction::QuitRole</enum>
    </property>
@@ -425,19 +430,27 @@ You can switch back to the workspace mod
     <string>Ctrl+B</string>
    </property>
   </action>
+  <action name="actionClose" >
+   <property name="text" >
+    <string>Close</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+W</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Splitter</class>
-   <extends>QSplitter</extends>
-   <header>../Splitter.h</header>
-  </customwidget>
-  <customwidget>
    <class>InventoryView</class>
    <extends>QTreeView</extends>
    <header>../InventoryView.h</header>
   </customwidget>
   <customwidget>
+   <class>Splitter</class>
+   <extends>QSplitter</extends>
+   <header>../Splitter.h</header>
+  </customwidget>
+  <customwidget>
    <class>AttributesView</class>
    <extends>QTreeView</extends>
    <header>../AttributesView.h</header>
@@ -448,7 +461,7 @@ You can switch back to the workspace mod
  </resources>
  <connections>
   <connection>
-   <sender>actionQuit</sender>
+   <sender>actionClose</sender>
    <signal>triggered()</signal>
    <receiver>MainWindow</receiver>
    <slot>close()</slot>
============================================================
--- guitone/res/i18n/guitone_de.ts	ba2bb18b98b4f3c34893be1658da9e1ae926b51b
+++ guitone/res/i18n/guitone_de.ts	83840573c9977cf20324c545c022e06d18ee8d97
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
 <context>
+    <name>@default</name>
+    <message>
+        <location filename="../../src/Guitone.cpp" line="123"/>
+        <source>Critical Monotone Error</source>
+        <translation type="obsolete">Kritischer monotone-Fehler</translation>
+    </message>
+</context>
+<context>
     <name>About</name>
     <message>
         <location filename="../../src/view/dialogs/About.cpp" line="32"/>
@@ -159,22 +167,22 @@
 <context>
     <name>ContentDiff</name>
     <message>
-        <location filename="../../src/model/ContentDiff.cpp" line="109"/>
+        <location filename="../../src/model/ContentDiff.cpp" line="111"/>
         <source>%1 (binary)</source>
         <translation>%1 (binär)</translation>
     </message>
     <message>
-        <location filename="../../src/model/ContentDiff.cpp" line="114"/>
+        <location filename="../../src/model/ContentDiff.cpp" line="116"/>
         <source>%1 (%2 hunks)</source>
         <translation>%1 (%2 Bereiche)</translation>
     </message>
     <message>
-        <location filename="../../src/model/ContentDiff.cpp" line="229"/>
+        <location filename="../../src/model/ContentDiff.cpp" line="231"/>
         <source>Line</source>
         <translation>Zeile</translation>
     </message>
     <message>
-        <location filename="../../src/model/ContentDiff.cpp" line="230"/>
+        <location filename="../../src/model/ContentDiff.cpp" line="232"/>
         <source>File/Content</source>
         <translation>Datei/Inhalt</translation>
     </message>
@@ -324,6 +332,24 @@
     </message>
 </context>
 <context>
+    <name>Guitone</name>
+    <message>
+        <location filename="../../src/Guitone.cpp" line="89"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location filename="../../src/Guitone.cpp" line="94"/>
+        <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 type="unfinished">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/Guitone.cpp" line="122"/>
+        <source>Critical Monotone Error</source>
+        <translation type="unfinished">Kritischer monotone-Fehler</translation>
+    </message>
+</context>
+<context>
     <name>InventoryItem</name>
     <message>
         <location filename="../../src/model/InventoryItem.cpp" line="176"/>
@@ -593,207 +619,207 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../forms/main_window.ui" line="179"/>
+        <location filename="../forms/main_window.ui" line="153"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="159"/>
+        <location filename="../forms/main_window.ui" line="133"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="173"/>
+        <location filename="../forms/main_window.ui" line="147"/>
         <source>Workspace</source>
         <translation>Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="133"/>
+        <location filename="../forms/main_window.ui" line="179"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="143"/>
+        <location filename="../forms/main_window.ui" line="189"/>
         <source>Recent Workspaces</source>
         <translation>Vorherige Arbeitsbereiche</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="212"/>
+        <location filename="../forms/main_window.ui" line="214"/>
         <source>Open Workspace</source>
         <translation>Arbeitsbereich öffnen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="215"/>
+        <location filename="../forms/main_window.ui" line="217"/>
         <source>Ctrl+O</source>
         <translation>Strg+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="412"/>
+        <location filename="../../src/view/MainWindow.cpp" line="353"/>
         <source>No previous workspaces available.</source>
         <translation>Keine vorherigen Arbeitsbereiche verfügbar.</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="231"/>
+        <location filename="../forms/main_window.ui" line="233"/>
         <source>Preferences....</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="234"/>
+        <location filename="../forms/main_window.ui" line="236"/>
         <source>Ctrl+P</source>
         <translation>Strg+P</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="242"/>
+        <location filename="../forms/main_window.ui" line="244"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="245"/>
+        <location filename="../forms/main_window.ui" line="247"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="342"/>
+        <location filename="../../src/view/MainWindow.cpp" line="283"/>
         <source>Hide ignored files</source>
         <translation>Ignorierte Dateien verstecken</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="256"/>
+        <location filename="../forms/main_window.ui" line="261"/>
         <source>Ctrl+H</source>
         <translation>Strg+H</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="267"/>
+        <location filename="../forms/main_window.ui" line="272"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="270"/>
+        <location filename="../forms/main_window.ui" line="275"/>
         <source>A</source>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="278"/>
+        <location filename="../forms/main_window.ui" line="283"/>
         <source>All changed files</source>
         <translation>Alle geänderten Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="281"/>
+        <location filename="../forms/main_window.ui" line="286"/>
         <source>C</source>
         <translation>G</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="289"/>
+        <location filename="../forms/main_window.ui" line="294"/>
         <source>Patched files</source>
         <translation>Inhaltlich geänderte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="292"/>
+        <location filename="../forms/main_window.ui" line="297"/>
         <source>P</source>
         <translation>P</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="300"/>
+        <location filename="../forms/main_window.ui" line="305"/>
         <source>Added files</source>
         <translation>Hinzugefügte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="303"/>
+        <location filename="../forms/main_window.ui" line="308"/>
         <source>N</source>
         <translation>H</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="311"/>
+        <location filename="../forms/main_window.ui" line="316"/>
         <source>Removed files</source>
         <translation>Entfernte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="314"/>
+        <location filename="../forms/main_window.ui" line="319"/>
         <source>D</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="322"/>
+        <location filename="../forms/main_window.ui" line="327"/>
         <source>Renamed files</source>
         <translation>Umbenannte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="325"/>
+        <location filename="../forms/main_window.ui" line="330"/>
         <source>R</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="333"/>
+        <location filename="../forms/main_window.ui" line="338"/>
         <source>Missing files</source>
         <translation>Fehlende Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="336"/>
+        <location filename="../forms/main_window.ui" line="341"/>
         <source>M</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="344"/>
+        <location filename="../forms/main_window.ui" line="349"/>
         <source>Unknown files</source>
         <translation>Unbekannte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="347"/>
+        <location filename="../forms/main_window.ui" line="352"/>
         <source>U</source>
         <translation>K</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="395"/>
+        <location filename="../forms/main_window.ui" line="400"/>
         <source>Ignored files</source>
         <translation>Ignorierte Dateien</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="398"/>
+        <location filename="../forms/main_window.ui" line="403"/>
         <source>I</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="378"/>
+        <location filename="../../src/view/MainWindow.cpp" line="319"/>
         <source>Expand tree</source>
         <translation>Baum aufklappen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="355"/>
+        <location filename="../forms/main_window.ui" line="360"/>
         <source>Ctrl+T</source>
         <translation>Strg+T</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="360"/>
+        <location filename="../forms/main_window.ui" line="365"/>
         <source>Switch revision</source>
         <translation>Revision wechseln</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="363"/>
+        <location filename="../forms/main_window.ui" line="368"/>
         <source>Ctrl+R</source>
         <translation>Strg+R</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="368"/>
+        <location filename="../forms/main_window.ui" line="373"/>
         <source>Key management</source>
         <translation>Schlüsselverwaltung</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="371"/>
+        <location filename="../forms/main_window.ui" line="376"/>
         <source>Ctrl+K</source>
         <translation>Strg+K</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="376"/>
+        <location filename="../forms/main_window.ui" line="381"/>
         <source>About Qt</source>
         <translation>Über Qt</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="384"/>
+        <location filename="../forms/main_window.ui" line="389"/>
         <source>About guitone</source>
         <translation>Über guitone</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="183"/>
+        <location filename="../forms/main_window.ui" line="157"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
@@ -805,120 +831,120 @@
     <message>
         <location filename="../../src/view/MainWindow.cpp" line="75"/>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="obsolete">Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="191"/>
+        <location filename="../../src/view/MainWindow.cpp" line="158"/>
         <source>Critical Monotone Error</source>
-        <translation>Kritischer monotone-Fehler</translation>
+        <translation type="obsolete">Kritischer monotone-Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="200"/>
+        <location filename="../../src/view/MainWindow.cpp" line="147"/>
         <source>Select your workspace...</source>
         <translation>Wählen Sie Ihren Arbeitsbereich aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="275"/>
+        <location filename="../../src/view/MainWindow.cpp" line="209"/>
         <source>Loading aborted</source>
         <translation>Laden abgebrochen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="219"/>
+        <location filename="../../src/view/MainWindow.cpp" line="166"/>
         <source>Invalid workspace</source>
         <translation>Ungültiger Arbeitsbereich</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="220"/>
+        <location filename="../../src/view/MainWindow.cpp" line="167"/>
         <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="233"/>
         <source>Unable to execute command</source>
-        <translation>Konnte Kommando nicht ausführen</translation>
+        <translation type="obsolete">Konnte Kommando nicht ausführen</translation>
     </message>
     <message>
         <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>
+        <translation type="obsolete">Konnte &apos;%1&apos; nicht ausführen - eventuell läuft noch ein anderes Kommando?</translation>
     </message>
     <message>
         <location filename="../../src/view/MainWindow.cpp" line="247"/>
         <source>Loading workspace...</source>
-        <translation>Lade Arbeitsbereich...</translation>
+        <translation type="obsolete">Lade Arbeitsbereich...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="343"/>
+        <location filename="../../src/view/MainWindow.cpp" line="284"/>
         <source>Show ignored files</source>
         <translation>Zeige ignorierte Dateien</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="379"/>
+        <location filename="../../src/view/MainWindow.cpp" line="320"/>
         <source>Collapse tree</source>
         <translation>Baum zuklappen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="447"/>
+        <location filename="../../src/view/MainWindow.cpp" line="388"/>
         <source>&amp;%1 %2</source>
         <translation>&amp;%1 %2</translation>
     </message>
     <message>
         <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>
+        <translation type="obsolete">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="../forms/main_window.ui" line="137"/>
+        <location filename="../forms/main_window.ui" line="183"/>
         <source>Recent Databases</source>
         <translation>Vorherige Datenbanken</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="403"/>
+        <location filename="../forms/main_window.ui" line="408"/>
         <source>Open Database</source>
         <translation>Datenbank öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="438"/>
+        <location filename="../../src/view/MainWindow.cpp" line="379"/>
         <source>No previous databases available.</source>
         <translation>Keine vorherigen geöffneten Datenbanken verfügbar.</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="166"/>
+        <location filename="../forms/main_window.ui" line="140"/>
         <source>Database</source>
         <translation>Datenbank</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="406"/>
+        <location filename="../forms/main_window.ui" line="411"/>
         <source>Ctrl+Shift+O</source>
         <translation>Strg+Shift+O</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="329"/>
+        <location filename="../../src/view/MainWindow.cpp" line="270"/>
         <source>Loaded database: %1</source>
         <translation>Geladene Datenbank: %1</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="268"/>
+        <location filename="../../src/view/MainWindow.cpp" line="202"/>
         <source>Select your database...</source>
         <translation>Wählen Sie eine Datenbank aus...</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="271"/>
+        <location filename="../../src/view/MainWindow.cpp" line="205"/>
         <source>monotone Databases (*.mtn *.db)</source>
         <translation>monotone-Datenbanken (*.mtn *.db)</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="329"/>
+        <location filename="../../src/view/MainWindow.cpp" line="270"/>
         <source>No database loaded</source>
         <translation>Keine Datenbank geladen</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="425"/>
+        <location filename="../forms/main_window.ui" line="430"/>
         <source>Ctrl+B</source>
         <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../forms/main_window.ui" line="422"/>
+        <location filename="../forms/main_window.ui" line="427"/>
         <source>Changeset browser</source>
         <translation>Änderungen-Browser</translation>
     </message>
@@ -929,6 +955,16 @@ Sie können zum Arbeitsbereich-Modus jed
         <translation>guitone befindet sich im Datenbank-Modus. Das bedeutet, dass nur Teile der Funktionalität verfügbar sind.
 Sie können zum Arbeitsbereich-Modus jederzeit zurückkehren, indem Sie einen Arbeitsbereich laden.</translation>
     </message>
+    <message>
+        <location filename="../forms/main_window.ui" line="435"/>
+        <source>Close</source>
+        <translation type="unfinished">Schließen</translation>
+    </message>
+    <message>
+        <location filename="../forms/main_window.ui" line="438"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Manifest</name>
@@ -1095,22 +1131,22 @@ monotone gab zurück:
 <context>
     <name>QShortcut</name>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="54"/>
+        <location filename="../../src/view/MainWindow.cpp" line="50"/>
         <source>Ctrl</source>
         <translation>Strg</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="56"/>
+        <location filename="../../src/view/MainWindow.cpp" line="52"/>
         <source>Shift</source>
         <translation>Umschalt</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="55"/>
+        <location filename="../../src/view/MainWindow.cpp" line="51"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../../src/view/MainWindow.cpp" line="57"/>
+        <location filename="../../src/view/MainWindow.cpp" line="53"/>
         <source>Meta</source>
         <translation>Meta</translation>
     </message>
============================================================
--- guitone/src/main.cpp	43f4662e814165beeb2efdf51d1cc61d29e2595c
+++ guitone/src/main.cpp	7d3deba4170d9e0d60b58b8abdd19c253a7eae0c
@@ -18,63 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/

-#include "MainWindow.h"
-#include "DebugLog.h"
+#include "Guitone.h"

-#include <QApplication>
-#include <QLocale>
-#include <QTranslator>
-
-void guitoneMsgHandler(QtMsgType type, const char *msg)
-{
-    switch (type)
-    {
-        case QtDebugMsg:
-            DebugLog::debug(msg);
-            break;
-        case QtWarningMsg:
-            DebugLog::warn(msg);
-            break;
-        case QtCriticalMsg:
-            DebugLog::critical(msg);
-            break;
-        case QtFatalMsg:
-            DebugLog::fatal(msg);
-            abort();
-     }
-}
-
 int main(int argc, char** argv)
 {
-    qInstallMsgHandler(guitoneMsgHandler);
-    QApplication app(argc,argv);
-
-    QCoreApplication::setOrganizationName("Thomas Keller");
-    QCoreApplication::setOrganizationDomain("thomaskeller.biz");
-    QCoreApplication::setApplicationName("guitone");
-
-    // try to find a suitable locale and setup translations
-    QString locale = QLocale::system().name();
-    QTranslator translator;
-
-	QString transFileName("guitone_" + locale);
-	if (translator.load(transFileName, ":/i18n"))
-    {
-        app.installTranslator(&translator);
-    }
-
-    // create and show the main window
-    MainWindow *mainWnd = new MainWindow();
-
-    // try initialize the main window
-    if (!mainWnd->init())
-    {
-        return 1;
-    }
-
-    mainWnd->show();
-
-    app.connect(&app, SIGNAL(lastWindowClosed()), mainWnd, SLOT(quit()));
+    Guitone app(argc,argv);
     return app.exec();
 }

============================================================
--- guitone/src/model/Changeset.h	74dcd9bfe67b89a639def7bea232b997ec810f30
+++ guitone/src/model/Changeset.h	ae1c6b68c80772aa211cd4e62ac09424e25827d7
============================================================
--- guitone/src/model/GetBranchLog.h	9246d87a81b2746aa9e5b8bc87a2f1b0e4037499
+++ guitone/src/model/GetBranchLog.h	1e715cc307663f44788299c62e564d7eb16a101d
============================================================
--- guitone/src/view/MainWindow.cpp	59056dbbe09d50ff14081d1e7158cae80178da75
+++ guitone/src/view/MainWindow.cpp	aec19809367c4f89bb4dccf524f35dd8ed108c0f
@@ -43,13 +43,9 @@ MainWindow::MainWindow()
 MainWindow::MainWindow()
     : QMainWindow()
 {
-    gotError = false;
     mode = None;
     setAttribute(Qt::WA_MacMetalStyle);
-}

-bool MainWindow::init()
-{
     // ensure that the shortcut keys are properly recognized by linguist
     QShortcut::tr("Ctrl");
     QShortcut::tr("Alt");
@@ -57,37 +53,6 @@ bool MainWindow::init()
     QShortcut::tr("Meta");

     setupUi(this);
-
-    Monotone * mtn = Monotone::singleton(this);
-
-    // catch critical errors from the Monotone class
-    connect(
-		mtn, SIGNAL(criticalError(const QString &)),
-        this, SLOT(criticalMtnError(const QString &))
-    );
-
-    // check the current monotone version and prompt the user
-    // to enter the correct path if there is a problem
-    if (!mtn->setMtnBinaryPath(Settings::getMtnBinaryPath()))
-    {
-        QMessageBox::critical(
-            this,
-            tr("Error"),
-            tr("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.")
-            .arg(Monotone::RequiredProgramVersion)
-            .arg(Monotone::RequiredInterfaceVersion),
-            QMessageBox::Ok, 0, 0
-        );
-
-        Preferences dialog(this);
-        if (dialog.exec() == QDialog::Rejected)
-        {
-            return false;
-        }
-    }

     // create the main models
     invModel = new Inventory(this);
@@ -126,7 +91,12 @@ bool MainWindow::init()
         treeView, SLOT(changeDirectory(const QModelIndex &))
     );

-
+    // rename the appQuit signal
+    connect(
+        actionQuit, SIGNAL(triggered()),
+        this, SIGNAL(quitApplication())
+    );
+
     // load recent workspace and database lists
 	updatePreviousWorkspacesMenu();
     updatePreviousDatabasesMenu();
@@ -149,52 +119,29 @@ bool MainWindow::init()
     listSplitter->init();
 	
     restoreGeometry(Settings::getWindowGeometry("MainWindow"));
-
-    //
-	// try to load the most recent workspace or database, if there are any
-    // if everything fails, load nothing and hide the appropriate menus
-    //
+}
+
+MainWindow::~MainWindow() {}
+
+// try to load the most recent workspace or database, if there are any
+// if everything fails, load nothing and hide the appropriate menus
+void MainWindow::loadRecent()
+{
     QStringList workspaces = Settings::getItemList("RecentWorkspaceList");
-    bool something_loaded = workspaces.size() > 0 && loadWorkspace(workspaces[0]);
+    bool something_loaded = workspaces.size() > 0 && doLoadWorkspace(workspaces[0]);

     if (!something_loaded)
     {
         QStringList databases = Settings::getItemList("RecentDatabaseList");
-        something_loaded = databases.size() > 0 && loadDatabase(databases[0]);
+        something_loaded = databases.size() > 0 && doLoadDatabase(databases[0]);
     }

     if (!something_loaded)
     {
         switchMode(None);
     }
-
-    return true;
 }

-MainWindow::~MainWindow() {}
-
-void MainWindow::quit()
-{
-	delete this;
-	Settings::sync();
-}
-
-void MainWindow::criticalMtnError(const QString & msg)
-{
-	if (gotError == false)
-	{
-		gotError = true;
-
-        // restore the normal cursor
-        qApp->restoreOverrideCursor();
-
-		QMessageBox::critical(NULL, tr("Critical Monotone Error"),
-							  msg, QMessageBox::Ok, 0, 0);
-
-        switchMode(None);
-    }
-}
-
 void MainWindow::on_actionOpen_Workspace_triggered()
 {
 	QString fn = QFileDialog::getExistingDirectory(this, tr("Select your workspace..."));
@@ -205,60 +152,47 @@ void MainWindow::on_actionOpen_Workspace
         return;
     }

-	loadWorkspace(fn);	
+	emit loadWorkspace(fn);	
 }

-bool MainWindow::loadWorkspace(QString fn)
+bool MainWindow::doLoadWorkspace(QString fn)
 {
 	Monotone * mtn = Monotone::singleton();

     if (!mtn->loadWorkspace(fn))
     {
-        QMessageBox::information(
+        QMessageBox::critical(
             this,
             tr("Invalid workspace"),
             tr("The chosen directory is no monotone workspace!"),
             QMessageBox::Ok
         );
+
         // remove the workspace if it was recorded as recent workspace
         Settings::removeItemFromList("RecentWorkspaceList", fn);
-        updatePreviousWorkspacesMenu();
+
+        emit updatePreviousWorkspacesMenu();
+
         return false;
     }

-    if (!invModel->readInventory())
-    {
-        QMessageBox::information(
-            this,
-            tr("Unable to execute command"),
-            tr("Unable to execute '%1' - maybe another command is still running?").arg("inventory"),
-            QMessageBox::Ok
-        );
-        return false;
-    }
-
     switchMode(Workspace);

 	// add the workspace to the recent workspace list
     // FIXME: the amount of recent workspaces should be made configurable
 	Settings::addItemToList("RecentWorkspaceList", mtn->getNormalizedWorkspacePath(), 5);
-	updatePreviousWorkspacesMenu();
 	
-    statusBar()->showMessage(tr("Loading workspace..."), 2000 );
+    emit updatePreviousWorkspacesMenu();
+	
     return true;
 }

-void MainWindow::resizeEvent(QResizeEvent * event)
-{
-	if (windowState() == Qt::WindowNoState)
-		curSize = size();
-    event->accept();
-}
-
 void MainWindow::closeEvent(QCloseEvent *event)
 {
+    // the last closed window sets the geometry for the next one which is opened
     Settings::setWindowGeometry(saveGeometry(), "MainWindow");
     event->accept();
+    emit windowClosed(this);
 }

 void MainWindow::on_actionOpen_Database_triggered()
@@ -276,24 +210,31 @@ void MainWindow::on_actionOpen_Database_
         return;
     }

-    loadDatabase(fn);
+    emit loadDatabase(fn);
 }

-bool MainWindow::loadDatabase(QString fn)
+bool MainWindow::doLoadDatabase(QString fn)
 {
     Monotone * mtn = Monotone::singleton();
+    // FIXME: currently a database is always loaded, but not checked
+    // so this condition can actually never be false
     if (!mtn->loadDatabase(fn))
     {
         qDebug("Could not load database.");
         // remove the workspace if it was recorded as recent workspace
         Settings::removeItemFromList("RecentDatabaseList", fn);
+
+        emit updatePreviousDatabasesMenu();
+
         return false;
     }

     switchMode(Database);

     Settings::addItemToList("RecentDatabaseList", fn, 5);
-	updatePreviousDatabasesMenu();
+	
+    emit updatePreviousDatabasesMenu();
+
     return true;
 }

@@ -386,7 +327,7 @@ void MainWindow::openRecentWorkspace()
     QAction *action = qobject_cast<QAction *>(sender());
     if (action)
     {
-    	loadWorkspace(action->data().toString());
+    	emit loadWorkspace(action->data().toString());
     }
 }

@@ -396,11 +337,11 @@ void MainWindow::openRecentDatabase()
     QAction *action = qobject_cast<QAction *>(sender());
     if (action)
     {
-    	loadDatabase(action->data().toString());
+    	emit loadDatabase(action->data().toString());
     }
 }

-void MainWindow::updatePreviousWorkspacesMenu()
+void MainWindow::doUpdatePreviousWorkspacesMenu()
 {
 	// clear previous actions
 	menuRecent_Workspaces->clear();	
@@ -426,7 +367,7 @@ void MainWindow::updatePreviousWorkspace
     }
 }

-void MainWindow::updatePreviousDatabasesMenu()
+void MainWindow::doUpdatePreviousDatabasesMenu()
 {
 	// clear previous actions
 	menuRecent_Databases->clear();	
@@ -461,12 +402,6 @@ void MainWindow::on_actionSwitch_revisio
     dialog.execDocumentModal();
 }

-void MainWindow::on_actionPreferences_triggered()
-{
-    Preferences dialog(this);
-    dialog.exec();
-}
-
 void MainWindow::on_actionKey_management_triggered()
 {
     KeyManagement dialog(this);
@@ -479,6 +414,14 @@ void MainWindow:: on_actionChangeset_bro
     dialog.execDocumentModal();
 }

+// FIXME: the next two handlers should probably ensure that the according dialog
+// is only opened once per application
+void MainWindow::on_actionPreferences_triggered()
+{
+    Preferences dialog(this);
+    dialog.exec();
+}
+
 void MainWindow::on_actionAbout_guitone_triggered()
 {
     About dialog(this);
============================================================
--- guitone/src/view/MainWindow.h	bf1f12efde46c96a0194070d00a9677c8f29e0cd
+++ guitone/src/view/MainWindow.h	c56fc1fb9768759a01093105fa03415d98474522
@@ -39,12 +39,25 @@ public:
     enum Mode { Database, Workspace, None };
     MainWindow();
     ~MainWindow();
-    bool init();
+    void loadRecent();
     void switchMode(Mode);

+    bool doLoadWorkspace(QString);
+    bool doLoadDatabase(QString);
+
+public slots:
+	void doUpdatePreviousWorkspacesMenu();
+    void doUpdatePreviousDatabasesMenu();
+	
 signals:
     void modeChanged(Mode);
-
+    void windowClosed(MainWindow *);
+    void quitApplication();
+    void updatePreviousWorkspacesMenu();
+    void updatePreviousDatabasesMenu();
+	void loadDatabase(const QString &);
+	void loadWorkspace(const QString &);
+	
 private slots:
     void on_actionOpen_Workspace_triggered();
     void on_actionOpen_Database_triggered();
@@ -60,25 +73,15 @@ private slots:

     void openRecentWorkspace();
     void openRecentDatabase();
-    void criticalMtnError(const QString &);
-	void quit();
-
+
 private:
     void closeEvent(QCloseEvent *);
-	void resizeEvent(QResizeEvent * event);
-    bool loadWorkspace(QString);
-    bool loadDatabase(QString);
-    void updatePreviousWorkspacesMenu();
-    void updatePreviousDatabasesMenu();
 	
     Inventory *invModel;
     Attributes *attrModel;
     InventoryProxyModel *proxyModelFolderTree;
     InventoryProxyModel *proxyModelFileList;
-	
-	Mode mode;
-	QSize curSize;
-	bool gotError;
+    Mode mode;
 };