#
#
# delete "guitone/res/icons/tree.png"
#
# rename "guitone/res/forms/databaseview.ui"
#     to "guitone/res/forms/changeset_browser.ui"
#
# rename "guitone/src/view/dialogs/DatabaseView.cpp"
#     to "guitone/src/view/dialogs/ChangesetBrowser.cpp"
#
# rename "guitone/src/view/dialogs/DatabaseView.h"
#     to "guitone/src/view/dialogs/ChangesetBrowser.h"
#
# patch "guitone/guitone.pro"
#  from [acb9814e8205a3b5bf2e1d9b8ee7694ec98a3490]
#    to [57c91460e016113cf9058400882604d54b12b55d]
#
# patch "guitone/res/forms/changeset_browser.ui"
#  from [83cd8982e45cf1eb56391e1d23ca7ac00bf2d066]
#    to [d5f1b28fde966c80b53c941f8dfa7a217c8b34de]
#
# patch "guitone/res/guitone.qrc"
#  from [f01e16e0a00027eae53b6698fe99d88ba33ad19a]
#    to [d28131c5046097b49c02208d5aafaf3b2767f051]
#
# patch "guitone/res/i18n/guitone_de.ts"
#  from [b6e668d03e23fdad2531ecdffa41f8ed2c47cbe1]
#    to [a0de811e7e545ba0ef1c8f6259d38a7e0346dbb8]
#
# patch "guitone/src/view/MainWindow.cpp"
#  from [adeca012c74a861bfc6bd8f90154256712ca6b74]
#    to [68b6dbef3363ee014810bcfa236dc0c3a5830fbc]
#
# patch "guitone/src/view/dialogs/ChangesetBrowser.cpp"
#  from [13160196473d423ce4d93f67b43b6c2f21084b06]
#    to [57745f86da369bf7119c5fed6111a6a1feb9ef29]
#
# patch "guitone/src/view/dialogs/ChangesetBrowser.h"
#  from [2fe4b0ac68c5906fda0c4a69dbea8581b97cc0ce]
#    to [dd388119b2fdbccfc1bff51ff88ddbb44c1c1e12]
#
============================================================
--- guitone/guitone.pro	acb9814e8205a3b5bf2e1d9b8ee7694ec98a3490
+++ guitone/guitone.pro	57c91460e016113cf9058400882604d54b12b55d
@@ -29,7 +29,7 @@ HEADERS += src/view/MainWindow.h \
            src/view/dialogs/KeyManagement.h \
            src/view/dialogs/GenerateKeypair.h \
            src/view/dialogs/About.h \
-           src/view/dialogs/DatabaseView.h \
+           src/view/dialogs/ChangesetBrowser.h \
            src/view/dialogs/RevisionManifest.h \
            src/monotone/Monotone.h \
            src/monotone/MonotoneDelegate.h \
@@ -77,7 +77,7 @@ SOURCES += src/view/MainWindow.cpp \
            src/view/dialogs/KeyManagement.cpp \
            src/view/dialogs/GenerateKeypair.cpp \
            src/view/dialogs/About.cpp \
-           src/view/dialogs/DatabaseView.cpp \
+           src/view/dialogs/ChangesetBrowser.cpp \
            src/view/dialogs/RevisionManifest.cpp \
            src/monotone/Monotone.cpp \
            src/monotone/MonotoneDelegate.cpp \
@@ -120,7 +120,7 @@ FORMS   += res/forms/select_revision.ui
            res/forms/generate_keypair.ui \
            res/forms/about.ui \
            res/forms/main_window.ui \
-           res/forms/databaseview.ui \
+           res/forms/changeset_browser.ui \
            res/forms/manifest.ui
 UI_DIR   = tmp

============================================================
--- guitone/res/forms/databaseview.ui	83cd8982e45cf1eb56391e1d23ca7ac00bf2d066
+++ guitone/res/forms/changeset_browser.ui	d5f1b28fde966c80b53c941f8dfa7a217c8b34de
@@ -1,16 +1,16 @@
 <ui version="4.0" >
- <class>DatabaseView</class>
- <widget class="QDialog" name="DatabaseView" >
+ <class>ChangesetBrowser</class>
+ <widget class="QDialog" name="ChangesetBrowser" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
-    <height>549</height>
+    <width>703</width>
+    <height>483</height>
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Database</string>
+   <string>Changeset Browser</string>
   </property>
   <property name="windowIcon" >
    <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
@@ -23,111 +23,94 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QFrame" name="content" >
-     <property name="windowModality" >
-      <enum>Qt::NonModal</enum>
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+     <property name="spacing" >
+      <number>6</number>
      </property>
-     <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="Splitter" name="outerSplitter" >
+     <item>
+      <widget class="Splitter" name="outerSplitter" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <widget class="TreeView" name="branches" />
+       <widget class="Splitter" name="innerSplitter" >
         <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
-        <widget class="TreeView" name="branches" />
-        <widget class="Splitter" name="innerSplitter" >
+        <widget class="TreeView" name="changesets" />
+        <widget class="QTextBrowser" name="changesetView" />
+       </widget>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QPushButton" name="displayBranchesAsTree" >
+         <property name="text" >
+          <string>display branches as tree</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
          <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
-         <widget class="TreeView" name="changesets" />
-         <widget class="QTextBrowser" name="changesetView" />
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushAll" >
+         <property name="text" >
+          <string>all Changesets</string>
+         </property>
         </widget>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushMore" >
+         <property name="text" >
+          <string>50 More Changesets</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="closeButton" >
+         <property name="text" >
+          <string>close</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
    </item>
-   <item>
-    <widget class="QFrame" name="controls" >
-     <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QToolButton" name="toolTree" >
-        <property name="text" >
-         <string>...</string>
-        </property>
-        <property name="icon" >
-         <iconset resource="../guitone.qrc" >:/icons/tree.png</iconset>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushAll" >
-        <property name="text" >
-         <string>All Changesets</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushMore" >
-        <property name="text" >
-         <string>50 More Changesets</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushOk" >
-        <property name="text" >
-         <string>Done</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -147,18 +130,18 @@
  </resources>
  <connections>
   <connection>
-   <sender>pushOk</sender>
+   <sender>closeButton</sender>
    <signal>clicked()</signal>
-   <receiver>DatabaseView</receiver>
+   <receiver>ChangesetBrowser</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>630</x>
-     <y>539</y>
+     <x>656</x>
+     <y>619</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>319</x>
-     <y>274</y>
+     <x>359</x>
+     <y>323</y>
     </hint>
    </hints>
   </connection>
============================================================
--- guitone/res/guitone.qrc	f01e16e0a00027eae53b6698fe99d88ba33ad19a
+++ guitone/res/guitone.qrc	d28131c5046097b49c02208d5aafaf3b2767f051
@@ -1,9 +1,8 @@
 <RCC>
     <qresource prefix="/" >
         <file>guitone-logo.svg</file>
         <file>i18n/guitone_de.qm</file>
         <file>icons/guitone.png</file>
-        <file>icons/tree.png</file>
         <file>overlays/added.png</file>
         <file>overlays/added_missing.png</file>
         <file>overlays/cdup.png</file>
============================================================
--- guitone/res/i18n/guitone_de.ts	b6e668d03e23fdad2531ecdffa41f8ed2c47cbe1
+++ guitone/res/i18n/guitone_de.ts	a0de811e7e545ba0ef1c8f6259d38a7e0346dbb8
@@ -134,6 +134,39 @@
     </message>
 </context>
 <context>
+    <name>ChangesetBrowser</name>
+    <message>
+        <location filename="../forms/changeset_browser.ui" line="13"/>
+        <source>Changeset Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="90"/>
+        <source>display branches as tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../forms/changeset_browser.ui" line="79"/>
+        <source>all Changesets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../forms/changeset_browser.ui" line="86"/>
+        <source>50 More Changesets</source>
+        <translation type="unfinished">50 weitere Änderungen</translation>
+    </message>
+    <message>
+        <location filename="../forms/changeset_browser.ui" line="106"/>
+        <source>close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/view/dialogs/ChangesetBrowser.cpp" line="91"/>
+        <source>display branches flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ChangesetModel</name>
     <message>
         <location filename="../../src/model/ChangesetModel.cpp" line="180"/>
@@ -322,27 +355,27 @@
     <message>
         <location filename="../forms/databaseview.ui" line="13"/>
         <source>Database</source>
-        <translation>Datenbank</translation>
+        <translation type="obsolete">Datenbank</translation>
     </message>
     <message>
         <location filename="../forms/databaseview.ui" line="110"/>
         <source>All Changesets</source>
-        <translation>Alle Änderungen</translation>
+        <translation type="obsolete">Alle Änderungen</translation>
     </message>
     <message>
         <location filename="../forms/databaseview.ui" line="117"/>
         <source>50 More Changesets</source>
-        <translation>50 weitere Änderungen</translation>
+        <translation type="obsolete">50 weitere Änderungen</translation>
     </message>
     <message>
         <location filename="../forms/databaseview.ui" line="124"/>
         <source>Done</source>
-        <translation>Beenden</translation>
+        <translation type="obsolete">Beenden</translation>
     </message>
     <message>
         <location filename="../forms/databaseview.ui" line="87"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
 </context>
 <context>
============================================================
--- guitone/src/view/MainWindow.cpp	adeca012c74a861bfc6bd8f90154256712ca6b74
+++ guitone/src/view/MainWindow.cpp	68b6dbef3363ee014810bcfa236dc0c3a5830fbc
@@ -33,7 +33,7 @@
 #include "KeyManagement.h"
 #include "About.h"
 #include "Settings.h"
-#include "DatabaseView.h"
+#include "ChangesetBrowser.h"

 #include <QMessageBox>
 #include <QStatusBar>
@@ -482,7 +482,7 @@ void MainWindow:: on_actionChangeset_bro

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

============================================================
--- guitone/src/view/dialogs/DatabaseView.cpp	13160196473d423ce4d93f67b43b6c2f21084b06
+++ guitone/src/view/dialogs/ChangesetBrowser.cpp	57745f86da369bf7119c5fed6111a6a1feb9ef29
@@ -19,10 +19,10 @@
  ***************************************************************************/


-#include "DatabaseView.h"
+#include "ChangesetBrowser.h"
 #include "Settings.h"

-DatabaseView::DatabaseView(QWidget *parent) : Dialog(parent)
+ChangesetBrowser::ChangesetBrowser(QWidget *parent) : Dialog(parent)
 {
 	setupUi(this);
     Dialog::init();
@@ -35,64 +35,92 @@ DatabaseView::DatabaseView(QWidget *pare
 	innerSplitter->init();
 	outerSplitter->init();

-	tree = Settings::getBool("DatabaseViewTree", false);
-
+	tree = Settings::getBool("ChangesetBrowserTree", false);
+    displayBranchesAsTree->setText(
+        !tree ? tr("display branches as tree") : tr("display branches flat")
+    );
+	
+    branchModel = 0;
+
 	initTreeWidget();

-	connect(branches, SIGNAL(clicked(QModelIndex)),
-         this, SLOT(branchesClicked(QModelIndex)));
-	connect(toolTree, SIGNAL(clicked()),
-         this, SLOT(toggleTree()));
+	connect(
+        branches, SIGNAL(clicked(QModelIndex)),
+        this, SLOT(branchesClicked(QModelIndex))
+    );
+	
+    connect(
+        displayBranchesAsTree, SIGNAL(clicked()),
+        this, SLOT(toggleTree())
+    );

 	changesetModel = new ChangesetModel(this);
 	changesets->setModel(changesetModel);
 	changesets->setRootIsDecorated(false);

-	connect(pushAll, SIGNAL(clicked()),
-         this, SLOT(receiveAll()));
-	connect(pushMore, SIGNAL(clicked()),
-         this, SLOT(receiveMore()));
+	connect(
+        pushAll, SIGNAL(clicked()),
+        this, SLOT(receiveAll())
+    );
+	
+    connect(
+        pushMore, SIGNAL(clicked()),
+        this, SLOT(receiveMore())
+    );
 }
-void DatabaseView::receiveAll()
+void ChangesetBrowser::receiveAll()
 {
 	changesetModel->receiveRevisions(true);
 }

-void DatabaseView::receiveMore()
+void ChangesetBrowser::receiveMore()
 {
 	changesetModel->receiveRevisions(false);
 }

-DatabaseView::~DatabaseView()
+ChangesetBrowser::~ChangesetBrowser()
 {
-	Settings::setBool("DatabaseViewTree", tree);
+	Settings::setBool("ChangesetBrowserTree", tree);
 }

-void DatabaseView::toggleTree()
+void ChangesetBrowser::toggleTree()
 {
 	tree = !tree;
+    displayBranchesAsTree->setText(
+        !tree ? tr("display branches as tree") : tr("display branches flat")
+    );
 	initTreeWidget();
 }

-void DatabaseView::branchesClicked(QModelIndex idx)
+void ChangesetBrowser::branchesClicked(QModelIndex idx)
 {
 	QString branch = branchModel->data(idx, Qt::ToolTipRole).toString();
 	changesetModel->setBranch(branch);
 }

-void DatabaseView::initTreeWidget()
+void ChangesetBrowser::initTreeWidget()
 {
+    if (branchModel)
+    {
+        disconnect(
+            branchModel, SIGNAL(branchesRead(void)),
+            this, SLOT(branchesRead(void))
+        );
+        delete branchModel;
+    }
+
 	branchModel = new Branches(this, tree);
 	branchModel->readBranches();
 	branches->setRootIsDecorated(false);
 	branches->setModel(branchModel);

-	connect(branchModel, SIGNAL(branchesRead(void)),
-		this, SLOT(branchesRead(void)));
-
+	connect(
+        branchModel, SIGNAL(branchesRead(void)),
+		this, SLOT(branchesRead(void))
+    );
 }

-void DatabaseView::branchesRead()
+void ChangesetBrowser::branchesRead()
 {
 	branches->setExpanded(branchModel->index(0, 0, QModelIndex()), true);
 }
============================================================
--- guitone/src/view/dialogs/DatabaseView.h	2fe4b0ac68c5906fda0c4a69dbea8581b97cc0ce
+++ guitone/src/view/dialogs/ChangesetBrowser.h	dd388119b2fdbccfc1bff51ff88ddbb44c1c1e12
@@ -18,26 +18,22 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/

-#ifndef DATABASEVIEW_H
-#define DATABASEVIEW_H
+#ifndef CHANGESET_BROWSER_H
+#define CHANGESET_BROWSER_H

-#include "ui_databaseview.h"
+#include "ui_changeset_browser.h"
 #include "Monotone.h"
 #include "Branches.h"
 #include "Dialog.h"
 #include "ChangesetModel.h"

-#include <QtGui>
-
-class DatabaseView : public Dialog, private Ui::DatabaseView
+class ChangesetBrowser : public Dialog, private Ui::ChangesetBrowser
 {
 	Q_OBJECT

 public:
-	Branches *branchModel;
-	ChangesetModel *changesetModel;
-	DatabaseView(QWidget *parent = 0);
-	~DatabaseView();
+	ChangesetBrowser(QWidget *);
+	~ChangesetBrowser();

 private slots:
 	void branchesClicked(QModelIndex idx);
@@ -47,8 +43,12 @@ private:
 	void receiveMore();

 private:
-	bool tree;
-	void initTreeWidget();
+    void initTreeWidget();
+
+    bool tree;
+	Branches * branchModel;
+	ChangesetModel * changesetModel;
 };

+#endif
+
-#endif //DATABASEVIEW_H