Remeber size of tool Seam allowance dialog between sessions. ref #683.
--HG-- branch : develop
This commit is contained in:
parent
156f259468
commit
fb64c8d2e8
|
@ -70,6 +70,7 @@ const QString settingGeneralGeometry = QStringLiteral("geometry");
|
||||||
const QString settingGeneralWindowState = QStringLiteral("windowState");
|
const QString settingGeneralWindowState = QStringLiteral("windowState");
|
||||||
const QString settingGeneralToolbarsState = QStringLiteral("toolbarsState");
|
const QString settingGeneralToolbarsState = QStringLiteral("toolbarsState");
|
||||||
const QString settingPreferenceDialogSize = QStringLiteral("preferenceDialogSize");
|
const QString settingPreferenceDialogSize = QStringLiteral("preferenceDialogSize");
|
||||||
|
const QString settingToolSeamAllowanceDialogSize = QStringLiteral("toolSeamAllowanceDialogSize");
|
||||||
const QString settingLatestSkippedVersion = QStringLiteral("lastestSkippedVersion");
|
const QString settingLatestSkippedVersion = QStringLiteral("lastestSkippedVersion");
|
||||||
const QString settingDateOfLastRemind = QStringLiteral("dateOfLastRemind");
|
const QString settingDateOfLastRemind = QStringLiteral("dateOfLastRemind");
|
||||||
const QString settingUserDefinedMaterials = QStringLiteral("configuration/userDefinedMaterials");
|
const QString settingUserDefinedMaterials = QStringLiteral("configuration/userDefinedMaterials");
|
||||||
|
@ -544,6 +545,18 @@ void VCommonSettings::SetPreferenceDialogSize(const QSize& sz)
|
||||||
setValue(settingPreferenceDialogSize, sz);
|
setValue(settingPreferenceDialogSize, sz);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
QSize VCommonSettings::GetToolSeamAllowanceDialogSize() const
|
||||||
|
{
|
||||||
|
return value(settingToolSeamAllowanceDialogSize, QSize(0, 0)).toSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void VCommonSettings::SetToolSeamAllowanceDialogSize(const QSize &sz)
|
||||||
|
{
|
||||||
|
setValue(settingToolSeamAllowanceDialogSize, sz);
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
int VCommonSettings::GetLatestSkippedVersion() const
|
int VCommonSettings::GetLatestSkippedVersion() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -120,6 +120,9 @@ public:
|
||||||
QSize GetPreferenceDialogSize() const;
|
QSize GetPreferenceDialogSize() const;
|
||||||
void SetPreferenceDialogSize(const QSize& sz);
|
void SetPreferenceDialogSize(const QSize& sz);
|
||||||
|
|
||||||
|
QSize GetToolSeamAllowanceDialogSize() const;
|
||||||
|
void SetToolSeamAllowanceDialogSize(const QSize& sz);
|
||||||
|
|
||||||
int GetLatestSkippedVersion() const;
|
int GetLatestSkippedVersion() const;
|
||||||
void SetLatestSkippedVersion(int value);
|
void SetLatestSkippedVersion(int value);
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,7 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, const quint32 &
|
||||||
m_tabPins(new QWidget),
|
m_tabPins(new QWidget),
|
||||||
m_tabPassmarks(new QWidget),
|
m_tabPassmarks(new QWidget),
|
||||||
m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
|
m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
|
||||||
|
m_isInitialized(false),
|
||||||
applyAllowed(false),// By default disabled
|
applyAllowed(false),// By default disabled
|
||||||
flagGPin(true),
|
flagGPin(true),
|
||||||
flagDPin(true),
|
flagDPin(true),
|
||||||
|
@ -425,8 +426,38 @@ void DialogSeamAllowance::closeEvent(QCloseEvent *event)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogSeamAllowance::showEvent(QShowEvent *event)
|
void DialogSeamAllowance::showEvent(QShowEvent *event)
|
||||||
{
|
{
|
||||||
// Skip DialotTool implementation. For this tool don't need disable resizing because it uses a scroll area.
|
|
||||||
QDialog::showEvent( event );
|
QDialog::showEvent( event );
|
||||||
|
if ( event->spontaneous() )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_isInitialized)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// do your init stuff here
|
||||||
|
|
||||||
|
const QSize sz = qApp->Settings()->GetToolSeamAllowanceDialogSize();
|
||||||
|
if (not sz.isEmpty())
|
||||||
|
{
|
||||||
|
resize(sz);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_isInitialized = true;//first show windows are held
|
||||||
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void DialogSeamAllowance::resizeEvent(QResizeEvent *event)
|
||||||
|
{
|
||||||
|
Q_UNUSED(event)
|
||||||
|
// remember the size for the next time this dialog is opened, but only
|
||||||
|
// if widget was already initialized, which rules out the resize at
|
||||||
|
// dialog creating, which would
|
||||||
|
if (m_isInitialized)
|
||||||
|
{
|
||||||
|
qApp->Settings()->SetToolSeamAllowanceDialogSize(size());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -73,6 +73,7 @@ protected:
|
||||||
virtual void CheckState() Q_DECL_FINAL;
|
virtual void CheckState() Q_DECL_FINAL;
|
||||||
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
|
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
|
||||||
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
|
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
|
||||||
|
virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
void UpdateList();
|
void UpdateList();
|
||||||
|
@ -173,6 +174,7 @@ private:
|
||||||
|
|
||||||
FancyTabBar* m_ftb;
|
FancyTabBar* m_ftb;
|
||||||
|
|
||||||
|
bool m_isInitialized;
|
||||||
bool applyAllowed;
|
bool applyAllowed;
|
||||||
bool flagGPin;
|
bool flagGPin;
|
||||||
bool flagDPin;
|
bool flagDPin;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user