Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

preferencesAboutTextFull
Anatoly Mihalchenko 13 years ago
commit d822dc73e7
  1. 2
      src/core/UBSettings.cpp
  2. 2
      src/core/UBSettings.h
  3. 60
      src/gui/UBDockPalette.cpp
  4. 8
      src/gui/UBLeftPalette.cpp
  5. 2
      src/gui/UBNavigatorPalette.cpp
  6. 11
      src/gui/UBRightPalette.cpp

@ -206,7 +206,9 @@ void UBSettings::init()
appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false); appToolBarOrientationVertical = new UBSetting(this, "App", "ToolBarOrientationVertical", false);
navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 270); navigPaletteWidth = new UBSetting(this, "Board", "NavigPaletteWidth", 270);
rightLibPaletteWidth = new UBSetting(this, "Board", "RightLibPaletteWidth", 270); rightLibPaletteWidth = new UBSetting(this, "Board", "RightLibPaletteWidth", 270);
rightLibPaletteIsCollapsed = new UBSetting(this,"Board", "RightLibPaletteIsCollapsed",false);
leftLibPaletteWidth = new UBSetting(this, "Board", "LeftLibPaletteWidth",270); leftLibPaletteWidth = new UBSetting(this, "Board", "LeftLibPaletteWidth",270);
leftLibPaletteIsCollapsed = new UBSetting(this,"Board","LeftLibPaletteIsCollapsed",false);
appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false); appIsInSoftwareUpdateProcess = new UBSetting(this, "App", "IsInSoftwareUpdateProcess", false);
appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", ""); appLastSessionDocumentUUID = new UBSetting(this, "App", "LastSessionDocumentUUID", "");

@ -316,7 +316,9 @@ class UBSettings : public QObject
UBSetting* navigPaletteWidth; UBSetting* navigPaletteWidth;
UBSetting* rightLibPaletteWidth; UBSetting* rightLibPaletteWidth;
UBSetting* rightLibPaletteIsCollapsed;
UBSetting* leftLibPaletteWidth; UBSetting* leftLibPaletteWidth;
UBSetting* leftLibPaletteIsCollapsed;
UBSetting* communityUser; UBSetting* communityUser;
UBSetting* communityPsw; UBSetting* communityPsw;

@ -29,20 +29,20 @@
* \brief The constructor * \brief The constructor
*/ */
UBDockPalette::UBDockPalette(eUBDockPaletteType paletteType, QWidget *parent, const char *name) UBDockPalette::UBDockPalette(eUBDockPaletteType paletteType, QWidget *parent, const char *name)
:QWidget(parent, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint) :QWidget(parent, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
, mOrientation(eUBDockOrientation_Left) , mOrientation(eUBDockOrientation_Left)
, mPreferredWidth(100) , mPreferredWidth(100)
, mPreferredHeight(100) , mPreferredHeight(100)
, mCanResize(false) , mCanResize(false)
, mResized(false) , mResized(false)
, mCollapseWidth(150) , mCollapseWidth(150)
, mLastWidth(-1) , mLastWidth(-1)
, mHTab(0) , mHTab(0)
, mpStackWidget(NULL) , mpStackWidget(NULL)
, mpLayout(NULL) , mpLayout(NULL)
, mCurrentTab(0) , mCurrentTab(0)
, mPaletteType(paletteType) , mPaletteType(paletteType)
, mTabPalette(new UBTabDockPalette(this, parent)) , mTabPalette(new UBTabDockPalette(this, parent))
{ {
setObjectName(name); setObjectName(name);
@ -302,12 +302,6 @@ void UBDockPalette::showTabWidget(int tabIndex)
mpStackWidget->setCurrentIndex(tabIndex); mpStackWidget->setCurrentIndex(tabIndex);
mCurrentTab = tabIndex; mCurrentTab = tabIndex;
// Expand it if collapsed
if(mLastWidth != -1)
{
toggleCollapseExpand();
}
// Update the current tab index // Update the current tab index
if(NULL != (dynamic_cast<UBDockPaletteWidget*>(mpStackWidget->widget(tabIndex)))){ if(NULL != (dynamic_cast<UBDockPaletteWidget*>(mpStackWidget->widget(tabIndex)))){
mCrntTabWidget = dynamic_cast<UBDockPaletteWidget*>(mpStackWidget->widget(tabIndex))->name(); mCrntTabWidget = dynamic_cast<UBDockPaletteWidget*>(mpStackWidget->widget(tabIndex))->name();
@ -320,17 +314,11 @@ void UBDockPalette::showTabWidget(int tabIndex)
*/ */
void UBDockPalette::toggleCollapseExpand() void UBDockPalette::toggleCollapseExpand()
{ {
if(mLastWidth == -1) if(width() < mCollapseWidth)
{ resize(mLastWidth,height());
// The palette must be collapsed else{
mLastWidth = width(); mLastWidth = width();
resize(0, height()); resize(0,height());
}
else
{
// The palette will be expanded
resize(mLastWidth, height());
mLastWidth = -1;
} }
} }
@ -498,7 +486,7 @@ void UBDockPalette::moveTabs()
} else { } else {
mHTab = height() - border() - mTabWidgets.size() * TABSIZE - (mTabWidgets.size() - 1) * tabSpacing(); mHTab = height() - border() - mTabWidgets.size() * TABSIZE - (mTabWidgets.size() - 1) * tabSpacing();
} }
// } // }
QPoint origin(width(), mHTab + mTabPalette->mVerticalOffset); QPoint origin(width(), mHTab + mTabPalette->mVerticalOffset);
@ -575,9 +563,9 @@ bool UBDockPalette::switchMode(eUBDockPaletteWidgetMode mode)
UBTabDockPalette::UBTabDockPalette(UBDockPalette *dockPalette, QWidget *parent) : UBTabDockPalette::UBTabDockPalette(UBDockPalette *dockPalette, QWidget *parent) :
QWidget(parent) QWidget(parent)
, dock(dockPalette) , dock(dockPalette)
, mVerticalOffset(0) , mVerticalOffset(0)
, mFlotable(false) , mFlotable(false)
{ {
int numTabs = dock->mTabWidgets.size(); int numTabs = dock->mTabWidgets.size();
resize(2 * dock->border(), (numTabs * TABSIZE) + qMax(numTabs - 1, 0) * dock->tabSpacing()); resize(2 * dock->border(), (numTabs * TABSIZE) + qMax(numTabs - 1, 0) * dock->tabSpacing());
@ -703,7 +691,7 @@ void UBTabDockPalette::mouseMoveEvent(QMouseEvent *event)
p.setX(p.x() + dock->width()); p.setX(p.x() + dock->width());
if(p.x() < dock->collapseWidth() && p.x() >= dock->minimumWidth()) { if(p.x() < dock->collapseWidth() && p.x() >= dock->minimumWidth()) {
dock->resize(0, dock->height()); dock->resize(0, dock->height());
dock->mLastWidth = dock->collapseWidth() + 1; //dock->mLastWidth = dock->collapseWidth() + 1;
dock->mResized = true; dock->mResized = true;
} else if (p.x() <= dock->maximumWidth() && p.x() >= dock->minimumWidth()) { } else if (p.x() <= dock->maximumWidth() && p.x() >= dock->minimumWidth()) {
dock->resize(p.x(), dock->height()); dock->resize(p.x(), dock->height());
@ -715,7 +703,7 @@ void UBTabDockPalette::mouseMoveEvent(QMouseEvent *event)
p.setX(p.x() - 2 * dock->border()); p.setX(p.x() - 2 * dock->border());
if((dock->x() + p.x() > dock->parentWidget()->width() - dock->collapseWidth()) && (dock->x() + p.x() < dock->parentWidget()->width())) { if((dock->x() + p.x() > dock->parentWidget()->width() - dock->collapseWidth()) && (dock->x() + p.x() < dock->parentWidget()->width())) {
dock->resize(0, dock->height()); dock->resize(0, dock->height());
dock->mLastWidth = dock->collapseWidth() + 1; //dock->mLastWidth = dock->collapseWidth() + 1;
dock->mResized = true; dock->mResized = true;
} else if((dock->x() + p.x() >= dock->parentWidget()->width() - dock->maximumWidth()) && (dock->x() + p.x() <= dock->parentWidget()->width() - dock->minimumWidth())) { } else if((dock->x() + p.x() >= dock->parentWidget()->width() - dock->maximumWidth()) && (dock->x() + p.x() <= dock->parentWidget()->width() - dock->minimumWidth())) {
dock->resize(dock->parentWidget()->width() - (dock->x() + p.x()), dock->height()); dock->resize(dock->parentWidget()->width() - (dock->x() + p.x()), dock->height());

@ -29,6 +29,9 @@ UBLeftPalette::UBLeftPalette(QWidget *parent, const char *name):
mLastWidth = UBSettings::settings()->leftLibPaletteWidth->get().toInt(); mLastWidth = UBSettings::settings()->leftLibPaletteWidth->get().toInt();
mCollapseWidth = 150; mCollapseWidth = 150;
if(UBSettings::settings()->leftLibPaletteIsCollapsed->get().toBool())
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height()); resize(mLastWidth, parentWidget()->height());
} }
@ -54,6 +57,9 @@ void UBLeftPalette::updateMaxWidth()
*/ */
void UBLeftPalette::resizeEvent(QResizeEvent *event) void UBLeftPalette::resizeEvent(QResizeEvent *event)
{ {
UBSettings::settings()->leftLibPaletteWidth->set(width()); int newWidth = width();
if(newWidth > mCollapseWidth)
UBSettings::settings()->leftLibPaletteWidth->set(newWidth);
UBSettings::settings()->leftLibPaletteIsCollapsed->set(newWidth == 0);
UBDockPalette::resizeEvent(event); UBDockPalette::resizeEvent(event);
} }

@ -33,8 +33,6 @@ UBNavigatorPalette::UBNavigatorPalette(QWidget *parent, const char *name):
{ {
setOrientation(eUBDockOrientation_Left); setOrientation(eUBDockOrientation_Left);
setMaximumWidth(300); setMaximumWidth(300);
//mCollapsedIcon = QPixmap(":images/pages_open.png");
//mIcon = QPixmap(":images/pages_close.png");
resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height()); resize(UBSettings::settings()->navigPaletteWidth->get().toInt(), height());
mLastWidth = 300; mLastWidth = 300;

@ -27,10 +27,12 @@ UBRightPalette::UBRightPalette(QWidget *parent, const char *name):
{ {
setObjectName(name); setObjectName(name);
setOrientation(eUBDockOrientation_Right); setOrientation(eUBDockOrientation_Right);
mLastWidth = UBSettings::settings()->rightLibPaletteWidth->get().toInt();
mCollapseWidth = 150; mCollapseWidth = 150;
mLastWidth = UBSettings::settings()->rightLibPaletteWidth->get().toInt();
if(UBSettings::settings()->rightLibPaletteIsCollapsed->get().toBool())
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height()); resize(mLastWidth, parentWidget()->height());
} }
@ -59,8 +61,11 @@ void UBRightPalette::mouseMoveEvent(QMouseEvent *event)
*/ */
void UBRightPalette::resizeEvent(QResizeEvent *event) void UBRightPalette::resizeEvent(QResizeEvent *event)
{ {
int newWidth = width();
if(newWidth > mCollapseWidth)
UBSettings::settings()->rightLibPaletteWidth->set(newWidth);
UBSettings::settings()->rightLibPaletteIsCollapsed->set(newWidth == 0);
UBDockPalette::resizeEvent(event); UBDockPalette::resizeEvent(event);
UBSettings::settings()->rightLibPaletteWidth->set(width());
emit resized(); emit resized();
} }

Loading…
Cancel
Save