1 files changed, 6 insertions, 5 deletions
diff --git a/src/frontend/displaywindow/cbookreadwindow.cpp b/src/frontend/displaywindow/cbookreadwindow.cpp
index d852eb3..062d42d 100644
--- a/src/frontend/displaywindow/cbookreadwindow.cpp
+++ b/src/frontend/displaywindow/cbookreadwindow.cpp
@@ -18,8 +18,8 @@
 #include "frontend/display/cdisplay.h"
 #include "frontend/displaywindow/bttoolbarpopupaction.h"
 #include "frontend/displaywindow/btactioncollection.h"
-#include "frontend/displaywindow/cmodulechooserbar.h"
-#include "frontend/displaywindow/cbuttons.h"
+#include "frontend/displaywindow/btmodulechooserbar.h"
+#include "frontend/displaywindow/btdisplaysettingsbutton.h"
 #include "frontend/keychooser/cbooktreechooser.h"
 #include "frontend/profile/cprofilewindow.h"
 #include "util/cresmgr.h"
@@ -103,14 +103,15 @@ void CBookReadWindow::initView() {
 
     setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
 
-    setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );
-    moduleChooserBar()->setButtonLimit(1);
+    setModuleChooserBar( new BtModuleChooserBar(getModuleList(), modules().first()->type(), this) );
     addToolBar(moduleChooserBar());
 
     setButtonsToolBar( new QToolBar(this) );
     buttonsToolBar()->setAllowedAreas(Qt::TopToolBarArea);
     buttonsToolBar()->setFloatable(false);
-    setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) );
+
+    setDisplaySettingsButton(new BtDisplaySettingsButton(buttonsToolBar()));
+
     addToolBar(buttonsToolBar());
     m_treeChooser->hide();