1 files changed, 12 insertions, 10 deletions
diff --git a/src/frontend/displaywindow/clexiconreadwindow.cpp b/src/frontend/displaywindow/clexiconreadwindow.cpp
index 2a5fb40..894c787 100644
--- a/src/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/src/frontend/displaywindow/clexiconreadwindow.cpp
@@ -25,8 +25,9 @@
 #include "frontend/display/creaddisplay.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/displaywindow/bttoolbarpopupaction.h"
-#include "frontend/displaywindow/cbuttons.h"
-#include "frontend/displaywindow/cmodulechooserbar.h"
+#include "frontend/displaywindow/btdisplaysettingsbutton.h"
+#include "frontend/displaywindow/bttextwindowheader.h"
+#include "frontend/displaywindow/btmodulechooserbar.h"
 #include "frontend/keychooser/bthistory.h"
 #include "frontend/keychooser/ckeychooser.h"
 #include "util/directory.h"
@@ -183,18 +184,18 @@ void CLexiconReadWindow::initView() {
     qDebug() << "CLexiconReadWindow::initView";
     setDisplayWidget( CDisplay::createReadInstance(this) );
     setMainToolBar( new QToolBar(this) );
-    mainToolBar()->setAllowedAreas(Qt::TopToolBarArea);
-    mainToolBar()->setFloatable(false);
     addToolBar(mainToolBar());
     setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
     mainToolBar()->addWidget(keyChooser());
-    setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );
-    moduleChooserBar()->adjustSize();
+    setModuleChooserBar( new BtModuleChooserBar(getModuleList(), modules().first()->type(), this) );
     addToolBar(moduleChooserBar());
     setButtonsToolBar( new QToolBar(this) );
-    buttonsToolBar()->setAllowedAreas(Qt::TopToolBarArea);
-    buttonsToolBar()->setFloatable(false);
     addToolBar(buttonsToolBar());
+    addToolBarBreak();
+    setHeaderBar(new QToolBar(this));
+    addToolBar(headerBar());
+    BtTextWindowHeader* h = new BtTextWindowHeader(this,  modules().first()->type(), getModuleList());
+    headerBar()->addWidget(h);
     setWindowIcon(util::tool::getIconForModule(modules().first()));
     setCentralWidget( displayWidget()->view() );
 }
@@ -212,7 +213,8 @@ void CLexiconReadWindow::initToolbars() {
     if (action) {
         buttonsToolBar()->addAction(action);
     }
-    setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) );
+
+    setDisplaySettingsButton(new BtDisplaySettingsButton(buttonsToolBar()));
 
     /// \todo find the right place for the button
     buttonsToolBar()->addWidget(displaySettingsButton());
@@ -310,7 +312,7 @@ void CLexiconReadWindow::saveRawHTML() {
             qDebug() << "could not open file";
             return;
         }
-        QString source = disp->text();
+        QString source = disp->getCurrentSource();
         file.write(source.toUtf8());
         //qDebug() << "wrote" << bytes << "bytes";
         file.close();