diff options
author | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:33 -0400 |
---|---|---|
committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-10-21 22:48:33 -0400 |
commit | 4885bfcef4d89cf0cb391e00af617b9fd19c9cbb (patch) | |
tree | e8ba8579bd76a1b277231202ca6579eb19c1ab4b /src/frontend/displaywindow/cbookreadwindow.cpp | |
parent | 294b5ec5834affa57641475946b8d2aeca53c577 (diff) |
Imported Upstream version 2.5
Diffstat (limited to 'src/frontend/displaywindow/cbookreadwindow.cpp')
-rw-r--r-- | src/frontend/displaywindow/cbookreadwindow.cpp | 11 |
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(); |