diff -r 36eb4b8f409e -r 1ad892c1a709 mainwindow.cpp
--- a/mainwindow.cpp	Thu Feb 25 11:03:52 2010 +0000
+++ b/mainwindow.cpp	Tue Mar 02 13:59:19 2010 +0000
@@ -11,6 +11,7 @@
 #include "exportoofiledialog.h"
 #include "exports.h"
 #include "file.h"
+#include "findresultwidget.h"
 #include "flagrow.h"
 #include "historywindow.h"
 #include "imports.h"
@@ -126,6 +127,14 @@
 	browserPID=new qint64;
 	*browserPID=0;
 
+	// Dock widgets //FIXME-2 testing...
+
+	FindResultWidget *findResultWidget=new FindResultWidget;
+	QDockWidget *dw= new QDockWidget ("Dock Widget",this);
+	dw->setWidget (findResultWidget);
+	dw->hide();
+	addDockWidget (Qt::RightDockWidgetArea,dw);
+
 	// Satellite windows //////////////////////////////////////////
 	// history window
 	historyWindow=new HistoryWindow();
@@ -1073,7 +1082,7 @@
 
 	a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color &branch","Edit menu" ), this);
 	a->setStatusTip ( tr( "Color branch" ) );
-	a->setShortcut (Qt::CTRL + Qt::Key_B);
+	a->setShortcut (Qt::CTRL + Qt::Key_B + Qt::SHIFT);
 	connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
 	a->setEnabled (false);
 	a->addTo( tb );
@@ -1083,7 +1092,7 @@
 
 	a= new QAction(QPixmap(iconPath+"formatcolorsubtree.png"), tr( "Color sub&tree","Edit menu" ), this);
 	a->setStatusTip ( tr( "Color Subtree" ));
-	//FIXME-2 switch back to that a->setShortcut (Qt::CTRL + Qt::Key_T);	// Color subtree
+	a->setShortcut (Qt::CTRL + Qt::Key_B);	// Color subtree
 	connect( a, SIGNAL( triggered() ), this, SLOT( formatColorSubtree() ) );
 	a->setEnabled (false);
 	formatMenu->addAction (a);