Commit abeb43fd authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[CHANGE #358] eliminated last occurences of the acronym DSB

parent 9109cd1a
...@@ -111,26 +111,26 @@ void WMainWindow::setupGUI() ...@@ -111,26 +111,26 @@ void WMainWindow::setupGUI()
// show up in the tool bar from the beginning. And ... it doesn't hurt. // show up in the tool bar from the beginning. And ... it doesn't hurt.
m_controlPanel->selectUpperMostEntry(); m_controlPanel->selectUpperMostEntry();
// set the size of the dsb according to config file // set the size of the control panel according to config file
int dsbWidth = 250; int controlPanelWidth = 250;
if( WPreferences::getPreference( "qt4gui.dsbWidth", &dsbWidth ) ) if( WPreferences::getPreference( "qt4gui.dsbWidth", &controlPanelWidth ) )
{ {
m_controlPanel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) ); m_controlPanel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
m_controlPanel->setMinimumWidth( dsbWidth ); m_controlPanel->setMinimumWidth( controlPanelWidth );
} }
// hide the DSB by default? // hide the control panel by default?
bool dsbInvisibleByDefault = false; bool controlPanelInvisibleByDefault = false;
if( WPreferences::getPreference( "qt4gui.dsbInvisibleByDefault", &dsbInvisibleByDefault ) ) if( WPreferences::getPreference( "qt4gui.dsbInvisibleByDefault", &controlPanelInvisibleByDefault ) )
{ {
m_controlPanel->setVisible( !dsbInvisibleByDefault ); m_controlPanel->setVisible( !controlPanelInvisibleByDefault );
} }
// undock the DSB by default? // undock the control panel by default?
bool dsbFloatingByDefault = false; bool controlPanelFloatingByDefault = false;
if( WPreferences::getPreference( "qt4gui.dsbFloatingByDefault", &dsbFloatingByDefault ) ) if( WPreferences::getPreference( "qt4gui.dsbFloatingByDefault", &controlPanelFloatingByDefault ) )
{ {
m_controlPanel->setFloating( dsbFloatingByDefault ); m_controlPanel->setFloating( controlPanelFloatingByDefault );
} }
// NOTE: Please be aware that not every menu needs a shortcut key. If you add a shortcut, you should use one of the // NOTE: Please be aware that not every menu needs a shortcut key. If you add a shortcut, you should use one of the
...@@ -165,13 +165,13 @@ void WMainWindow::setupGUI() ...@@ -165,13 +165,13 @@ void WMainWindow::setupGUI()
// directly -> set shortcuts, and some further properties using QAction's interface // directly -> set shortcuts, and some further properties using QAction's interface
QMenu* viewMenu = m_menuBar->addMenu( "View" ); QMenu* viewMenu = m_menuBar->addMenu( "View" );
QAction* dsbTrigger = m_controlPanel->toggleViewAction(); QAction* controlPanelTrigger = m_controlPanel->toggleViewAction();
QList< QKeySequence > dsbShortcut; QList< QKeySequence > controlPanelShortcut;
dsbShortcut.append( QKeySequence( Qt::Key_F9 ) ); controlPanelShortcut.append( QKeySequence( Qt::Key_F9 ) );
dsbTrigger->setShortcuts( dsbShortcut ); controlPanelTrigger->setShortcuts( controlPanelShortcut );
viewMenu->addAction( dsbTrigger ); viewMenu->addAction( controlPanelTrigger );
viewMenu->addSeparator(); viewMenu->addSeparator();
this->addAction( dsbTrigger ); // this enables the action even if the menu bar is invisible this->addAction( controlPanelTrigger ); // this enables the action even if the menu bar is invisible
// NOTE: the shortcuts for these view presets should be chosen carefully. Most keysequences have another meaning in the most applications // NOTE: the shortcuts for these view presets should be chosen carefully. Most keysequences have another meaning in the most applications
// so the user may get confused. It is also not a good idea to take letters as they might be used by OpenSceneGraph widget ( like "S" for // so the user may get confused. It is also not a good idea to take letters as they might be used by OpenSceneGraph widget ( like "S" for
...@@ -303,7 +303,7 @@ void WMainWindow::setupPermanentToolBar() ...@@ -303,7 +303,7 @@ void WMainWindow::setupPermanentToolBar()
m_permanentToolBar->addWidget( roiButton ); m_permanentToolBar->addWidget( roiButton );
m_permanentToolBar->addSeparator(); m_permanentToolBar->addSeparator();
if( getToolbarPos() == InDSB ) if( getToolbarPos() == InControlPanel )
{ {
m_controlPanel->addToolbar( m_permanentToolBar ); m_controlPanel->addToolbar( m_permanentToolBar );
//m_controlPanel->setTitleBarWidget( m_permanentToolBar ); //m_controlPanel->setTitleBarWidget( m_permanentToolBar );
...@@ -522,7 +522,7 @@ Qt::ToolBarArea WMainWindow::toQtToolBarArea( ToolBarPosition pos ) ...@@ -522,7 +522,7 @@ Qt::ToolBarArea WMainWindow::toQtToolBarArea( ToolBarPosition pos )
case Right: case Right:
return Qt::RightToolBarArea; return Qt::RightToolBarArea;
break; break;
case InDSB: case InControlPanel:
return Qt::RightToolBarArea; return Qt::RightToolBarArea;
default: default:
return Qt::NoToolBarArea; return Qt::NoToolBarArea;
......
...@@ -129,7 +129,7 @@ public: ...@@ -129,7 +129,7 @@ public:
Left, Left,
Right, Right,
Hide, Hide,
InDSB InControlPanel
} }
ToolBarPosition; ToolBarPosition;
...@@ -148,7 +148,7 @@ public: ...@@ -148,7 +148,7 @@ public:
static ToolBarPosition getCompatiblesToolbarPos(); static ToolBarPosition getCompatiblesToolbarPos();
/** /**
* Converts the specified position to the appropriate qt toolbar area constant. Unknown positions (InDSB, Hide) are converted to * Converts the specified position to the appropriate qt toolbar area constant. Unknown positions (InControlPanel, Hide) are converted to
* Qt::NoToolBarArea. * Qt::NoToolBarArea.
* *
* \param pos the position to convert. * \param pos the position to convert.
......
...@@ -280,9 +280,9 @@ void WQtConfigWidget::registerComponents() ...@@ -280,9 +280,9 @@ void WQtConfigWidget::registerComponents()
ctbpos->setMax( 5 ); ctbpos->setMax( 5 );
m_defaultProperties->addProperty( "qt4gui.hideMenuBar", "Hide the menu bar.", false, m_propCondition ); m_defaultProperties->addProperty( "qt4gui.hideMenuBar", "Hide the menu bar.", false, m_propCondition );
WPropInt dsbWidth = m_defaultProperties->addProperty( "qt4gui.dsbWidth", "The width of the control panel.", 250, m_propCondition ); WPropInt controlPanelWidth = m_defaultProperties->addProperty( "qt4gui.dsbWidth", "The width of the control panel.", 250, m_propCondition );
dsbWidth->setMin( 0 ); controlPanelWidth->setMin( 0 );
dsbWidth->setMax( 1000 ); controlPanelWidth->setMax( 1000 );
m_defaultProperties->addProperty( "qt4gui.dsbInvisibleByDefault", "Hide the control panel on startup?", false, m_propCondition ); m_defaultProperties->addProperty( "qt4gui.dsbInvisibleByDefault", "Hide the control panel on startup?", false, m_propCondition );
m_defaultProperties->addProperty( "qt4gui.dsbFloatingByDefault", "Undock the control panel on startup?", false, m_propCondition ); m_defaultProperties->addProperty( "qt4gui.dsbFloatingByDefault", "Undock the control panel on startup?", false, m_propCondition );
......
...@@ -156,7 +156,7 @@ public: ...@@ -156,7 +156,7 @@ public:
QAction* toggleViewAction() const; QAction* toggleViewAction() const;
/** /**
* Add the specified toolbar to the top of the dsb. * Add the specified toolbar to the top of the control panel.
* *
* \param tb the toolbar to add * \param tb the toolbar to add
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment