1.1 --- a/mainwindow.cpp Thu Feb 25 11:03:52 2010 +0000
1.2 +++ b/mainwindow.cpp Sat Mar 06 20:05:02 2010 +0000
1.3 @@ -11,6 +11,7 @@
1.4 #include "exportoofiledialog.h"
1.5 #include "exports.h"
1.6 #include "file.h"
1.7 +#include "findresultwidget.h"
1.8 #include "flagrow.h"
1.9 #include "historywindow.h"
1.10 #include "imports.h"
1.11 @@ -126,6 +127,14 @@
1.12 browserPID=new qint64;
1.13 *browserPID=0;
1.14
1.15 + // Dock widgets //FIXME-2 testing...
1.16 +
1.17 + FindResultWidget *findResultWidget=new FindResultWidget;
1.18 + QDockWidget *dw= new QDockWidget ("Dock Widget",this);
1.19 + dw->setWidget (findResultWidget);
1.20 + dw->hide();
1.21 + addDockWidget (Qt::RightDockWidgetArea,dw);
1.22 +
1.23 // Satellite windows //////////////////////////////////////////
1.24 // history window
1.25 historyWindow=new HistoryWindow();
1.26 @@ -1073,7 +1082,7 @@
1.27
1.28 a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color &branch","Edit menu" ), this);
1.29 a->setStatusTip ( tr( "Color branch" ) );
1.30 - a->setShortcut (Qt::CTRL + Qt::Key_B);
1.31 + a->setShortcut (Qt::CTRL + Qt::Key_B + Qt::SHIFT);
1.32 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
1.33 a->setEnabled (false);
1.34 a->addTo( tb );
1.35 @@ -1083,7 +1092,7 @@
1.36
1.37 a= new QAction(QPixmap(iconPath+"formatcolorsubtree.png"), tr( "Color sub&tree","Edit menu" ), this);
1.38 a->setStatusTip ( tr( "Color Subtree" ));
1.39 - //FIXME-2 switch back to that a->setShortcut (Qt::CTRL + Qt::Key_T); // Color subtree
1.40 + a->setShortcut (Qt::CTRL + Qt::Key_B); // Color subtree
1.41 connect( a, SIGNAL( triggered() ), this, SLOT( formatColorSubtree() ) );
1.42 a->setEnabled (false);
1.43 formatMenu->addAction (a);