From 8105a53194abe013f592503dcb00579149e05856 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 23 May 2012 11:50:13 +0200 Subject: [PATCH] removed eUBDockPaletteType_NAVIGATOR type because isn't a good type --- src/gui/UBDockPalette.cpp | 2 +- src/gui/UBDockPalette.h | 3 +-- src/gui/UBNavigatorPalette.cpp | 7 +------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 935f8549..70af85f9 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -533,7 +533,7 @@ bool UBDockPalette::switchMode(eUBDockPaletteWidgetMode mode) { bool hasVisibleElements = false; //-------------------------------// - // get full right palette widgets list, parse it, show all widgets for BOARD mode, and hide all other + // get full palette widgets list, parse it, show all widgets for BOARD mode, and hide all other for(int i = 0; i < mRegisteredWidgets.size(); i++) { UBDockPaletteWidget* pNextWidget = mRegisteredWidgets.at(i); diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index a513db75..9efeeec0 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -79,8 +79,7 @@ private: typedef enum { eUBDockPaletteType_LEFT, - eUBDockPaletteType_RIGHT, - eUBDockPaletteType_NAVIGATOR, + eUBDockPaletteType_RIGHT } eUBDockPaletteType; diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp index a389e3c3..4ffdb342 100644 --- a/src/gui/UBNavigatorPalette.cpp +++ b/src/gui/UBNavigatorPalette.cpp @@ -24,18 +24,13 @@ * @param name as the object name */ UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name): - UBDockPalette(eUBDockPaletteType_NAVIGATOR, parent, name) + UBDockPalette(eUBDockPaletteType_LEFT, parent, name) , mNavigator(NULL) , mLayout(NULL) , mHLayout(NULL) , mPageNbr(NULL) , mClock(NULL) { - setOrientation(eUBDockOrientation_Left); - setMaximumWidth(300); - resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); - mLastWidth = 300; - // Build the gui mLayout = new QVBoxLayout(this); mLayout->setContentsMargins(customMargin(), customMargin(), 2*border() + customMargin(), customMargin());