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. 924
      src/gui/UBDockPalette.cpp
  4. 10
      src/gui/UBLeftPalette.cpp
  5. 2
      src/gui/UBNavigatorPalette.cpp
  6. 13
      src/gui/UBRightPalette.cpp

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

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

File diff suppressed because it is too large Load Diff

@ -29,7 +29,10 @@ UBLeftPalette::UBLeftPalette(QWidget *parent, const char *name):
mLastWidth = UBSettings::settings()->leftLibPaletteWidth->get().toInt();
mCollapseWidth = 150;
resize(mLastWidth, parentWidget()->height());
if(UBSettings::settings()->leftLibPaletteIsCollapsed->get().toBool())
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height());
}
/**
@ -54,6 +57,9 @@ void UBLeftPalette::updateMaxWidth()
*/
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);
}

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

@ -27,11 +27,13 @@ UBRightPalette::UBRightPalette(QWidget *parent, const char *name):
{
setObjectName(name);
setOrientation(eUBDockOrientation_Right);
mLastWidth = UBSettings::settings()->rightLibPaletteWidth->get().toInt();
mCollapseWidth = 150;
resize(mLastWidth, parentWidget()->height());
mLastWidth = UBSettings::settings()->rightLibPaletteWidth->get().toInt();
if(UBSettings::settings()->rightLibPaletteIsCollapsed->get().toBool())
resize(0,parentWidget()->height());
else
resize(mLastWidth, parentWidget()->height());
}
/**
@ -59,8 +61,11 @@ void UBRightPalette::mouseMoveEvent(QMouseEvent *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);
UBSettings::settings()->rightLibPaletteWidth->set(width());
emit resized();
}

Loading…
Cancel
Save