From 98b232930fdfe991b4be461d1569b5f38c94f4cf Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Thu, 9 Jun 2016 13:16:04 +0200 Subject: [PATCH 1/9] Fixed issue #479. Improve feature: The Preferences dialog box should be expandable. --HG-- branch : feature --- src/app/valentina/dialogs/configdialog.cpp | 36 +++++++++++++++++++--- src/app/valentina/dialogs/configdialog.h | 8 +++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/app/valentina/dialogs/configdialog.cpp b/src/app/valentina/dialogs/configdialog.cpp index bc88e25d0..8d41f0a59 100644 --- a/src/app/valentina/dialogs/configdialog.cpp +++ b/src/app/valentina/dialogs/configdialog.cpp @@ -87,14 +87,20 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(horizontalLayout); - mainLayout->addStretch(1); - mainLayout->addSpacing(12); + //mainLayout->addStretch(1); + //mainLayout->addSpacing(12); mainLayout->addLayout(buttonsLayout); + mainLayout->setStretch(0, 1); setLayout(mainLayout); setWindowTitle(tr("Config Dialog")); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); + + if (s_iLastWidth > 0 && s_iLastHeight > 0) + { + resize(s_iLastWidth, s_iLastHeight); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -145,12 +151,29 @@ void ConfigDialog::showEvent(QShowEvent *event) } // do your init stuff here - setMaximumSize(size()); - setMinimumSize(size()); + //setMaximumSize(size()); + if (s_iMinWidth > 0 && s_iMinHeight > 0) + { + setMinimumSize(s_iMinWidth, s_iMinHeight); + } + else + { + setMinimumSize(size()); + s_iMinWidth = width(); + s_iMinHeight = height(); + } isInitialized = true;//first show windows are held } +//--------------------------------------------------------------------------------------------------------------------- +void ConfigDialog::resizeEvent(QResizeEvent *) +{ + // remember the size for the next time this dialog is opened + s_iLastWidth = width(); + s_iLastHeight = height(); +} + //--------------------------------------------------------------------------------------------------------------------- void ConfigDialog::createIcons() { @@ -217,3 +240,8 @@ void ConfigDialog::RetranslateUi() contentsWidget->item(3)->setText(tr("Paths")); } +//--------------------------------------------------------------------------------------------------------------------- +int ConfigDialog::s_iLastWidth = 0; +int ConfigDialog::s_iLastHeight = 0; +int ConfigDialog::s_iMinWidth = 0; +int ConfigDialog::s_iMinHeight = 0; diff --git a/src/app/valentina/dialogs/configdialog.h b/src/app/valentina/dialogs/configdialog.h index bb1932032..f7d8b5e1f 100644 --- a/src/app/valentina/dialogs/configdialog.h +++ b/src/app/valentina/dialogs/configdialog.h @@ -49,6 +49,7 @@ protected: virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(ConfigDialog) QListWidget *contentsWidget; @@ -61,6 +62,13 @@ private: QPushButton *cancelButton; QPushButton *okButton; bool isInitialized; + // the following static variables are used to preserve the dialog size when it + // is opened again and to hold the minimum size (which will be determined when + // the dialog is opened for the first time) + static int s_iLastWidth; + static int s_iLastHeight; + static int s_iMinWidth; + static int s_iMinHeight; void createIcons(); void createIcon(const QString &icon, const QString &text); void Apply(); From 1738972c8559af25418a0992f01ad6a614ab02a0 Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Thu, 9 Jun 2016 13:22:11 +0200 Subject: [PATCH 2/9] Updated ChangeLog.txt --HG-- branch : feature --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8c7aec59e..a2efe1e09 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size - [#193] Undeletable zombie arc objects. - New feature. Groups. - Tool "Curve intersect axis" store data about subpaths. From 96b2d28604cf55fb72eee808b2c51fdd8eec9c20 Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Fri, 10 Jun 2016 21:34:21 +0200 Subject: [PATCH 3/9] Fixed issue #479. Improve feature: The Preferences dialog box in Valentina and Tape should be expandable. --HG-- branch : feature --- ChangeLog.txt | 2 +- src/app/tape/dialogs/tapeconfigdialog.cpp | 20 ++++++++++- src/app/tape/dialogs/tapeconfigdialog.h | 1 + src/app/valentina/dialogs/configdialog.cpp | 40 ++++++++-------------- src/app/valentina/dialogs/configdialog.h | 9 +---- src/libs/vmisc/vcommonsettings.cpp | 13 +++++++ src/libs/vmisc/vcommonsettings.h | 4 +++ 7 files changed, 54 insertions(+), 35 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a2efe1e09..02bb6efef 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,5 @@ # Version 0.5.0 -- [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size +- [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size. - [#193] Undeletable zombie arc objects. - New feature. Groups. - Tool "Curve intersect axis" store data about subpaths. diff --git a/src/app/tape/dialogs/tapeconfigdialog.cpp b/src/app/tape/dialogs/tapeconfigdialog.cpp index cb489ee24..7f9c27b42 100644 --- a/src/app/tape/dialogs/tapeconfigdialog.cpp +++ b/src/app/tape/dialogs/tapeconfigdialog.cpp @@ -147,12 +147,30 @@ void TapeConfigDialog::showEvent(QShowEvent *event) } // do your init stuff here - setMaximumSize(size()); setMinimumSize(size()); + QSize sz = qApp->Settings()->GetPreferenceDialogSize(); + if (sz.isEmpty() == false) + { + resize(sz); + } + isInitialized = true;//first show windows are held } +//--------------------------------------------------------------------------------------------------------------------- +void TapeConfigDialog::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 (isInitialized == true) + { + qApp->Settings()->SetPreferenceDialogSize(size()); + } +} + //--------------------------------------------------------------------------------------------------------------------- void TapeConfigDialog::createIcons() { diff --git a/src/app/tape/dialogs/tapeconfigdialog.h b/src/app/tape/dialogs/tapeconfigdialog.h index b88a8c83f..54e2f6ac8 100644 --- a/src/app/tape/dialogs/tapeconfigdialog.h +++ b/src/app/tape/dialogs/tapeconfigdialog.h @@ -50,6 +50,7 @@ protected: virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(TapeConfigDialog) QListWidget *contentsWidget; diff --git a/src/app/valentina/dialogs/configdialog.cpp b/src/app/valentina/dialogs/configdialog.cpp index 8d41f0a59..5ae67a90a 100644 --- a/src/app/valentina/dialogs/configdialog.cpp +++ b/src/app/valentina/dialogs/configdialog.cpp @@ -87,8 +87,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) : QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(horizontalLayout); - //mainLayout->addStretch(1); - //mainLayout->addSpacing(12); + mainLayout->addSpacing(12); mainLayout->addLayout(buttonsLayout); mainLayout->setStretch(0, 1); setLayout(mainLayout); @@ -96,11 +95,6 @@ ConfigDialog::ConfigDialog(QWidget *parent) : setWindowTitle(tr("Config Dialog")); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); - - if (s_iLastWidth > 0 && s_iLastHeight > 0) - { - resize(s_iLastWidth, s_iLastHeight); - } } //--------------------------------------------------------------------------------------------------------------------- @@ -151,27 +145,28 @@ void ConfigDialog::showEvent(QShowEvent *event) } // do your init stuff here - //setMaximumSize(size()); - if (s_iMinWidth > 0 && s_iMinHeight > 0) + setMinimumSize(size()); + + QSize sz = qApp->Settings()->GetPreferenceDialogSize(); + if (sz.isEmpty() == false) { - setMinimumSize(s_iMinWidth, s_iMinHeight); - } - else - { - setMinimumSize(size()); - s_iMinWidth = width(); - s_iMinHeight = height(); + resize(sz); } isInitialized = true;//first show windows are held } //--------------------------------------------------------------------------------------------------------------------- -void ConfigDialog::resizeEvent(QResizeEvent *) +void ConfigDialog::resizeEvent(QResizeEvent *event) { - // remember the size for the next time this dialog is opened - s_iLastWidth = width(); - s_iLastHeight = height(); + 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 (isInitialized == true) + { + qApp->Settings()->SetPreferenceDialogSize(size()); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -240,8 +235,3 @@ void ConfigDialog::RetranslateUi() contentsWidget->item(3)->setText(tr("Paths")); } -//--------------------------------------------------------------------------------------------------------------------- -int ConfigDialog::s_iLastWidth = 0; -int ConfigDialog::s_iLastHeight = 0; -int ConfigDialog::s_iMinWidth = 0; -int ConfigDialog::s_iMinHeight = 0; diff --git a/src/app/valentina/dialogs/configdialog.h b/src/app/valentina/dialogs/configdialog.h index f7d8b5e1f..f64321588 100644 --- a/src/app/valentina/dialogs/configdialog.h +++ b/src/app/valentina/dialogs/configdialog.h @@ -49,7 +49,7 @@ protected: virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(ConfigDialog) QListWidget *contentsWidget; @@ -62,13 +62,6 @@ private: QPushButton *cancelButton; QPushButton *okButton; bool isInitialized; - // the following static variables are used to preserve the dialog size when it - // is opened again and to hold the minimum size (which will be determined when - // the dialog is opened for the first time) - static int s_iLastWidth; - static int s_iLastHeight; - static int s_iMinWidth; - static int s_iMinHeight; void createIcons(); void createIcon(const QString &icon, const QString &text); void Apply(); diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index 2093f1b50..41416fdd8 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -64,6 +64,7 @@ const QString VCommonSettings::SettingGeneralRestoreFileList = QString const QString VCommonSettings::SettingGeneralGeometry = QStringLiteral("geometry"); const QString VCommonSettings::SettingGeneralWindowState = QStringLiteral("windowState"); const QString VCommonSettings::SettingGeneralToolbarsState = QStringLiteral("toolbarsState"); +const QString VCommonSettings::SettingPreferenceDialogSize = QStringLiteral("preferenceDialogSize"); //--------------------------------------------------------------------------------------------------------------------- VCommonSettings::VCommonSettings(Format format, Scope scope, const QString &organization, @@ -414,3 +415,15 @@ void VCommonSettings::SetToolbarsState(const QByteArray &value) { setValue(SettingGeneralToolbarsState, value); } + +//--------------------------------------------------------------------------------------------------------------------- +QSize VCommonSettings::GetPreferenceDialogSize() const +{ + return value(SettingPreferenceDialogSize, QSize(0, 0)).toSize(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void VCommonSettings::SetPreferenceDialogSize(const QSize& sz) +{ + setValue(SettingPreferenceDialogSize, sz); +} diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h index 8cc2092de..d8e516282 100644 --- a/src/libs/vmisc/vcommonsettings.h +++ b/src/libs/vmisc/vcommonsettings.h @@ -99,6 +99,9 @@ public: QByteArray GetToolbarsState() const; void SetToolbarsState(const QByteArray &value); + QSize GetPreferenceDialogSize() const; + void SetPreferenceDialogSize(const QSize& sz); + private: Q_DISABLE_COPY(VCommonSettings) @@ -124,6 +127,7 @@ private: static const QString SettingGeneralGeometry; static const QString SettingGeneralWindowState; static const QString SettingGeneralToolbarsState; + static const QString SettingPreferenceDialogSize; }; #endif // VCOMMONSETTINGS_H From 24a7294a38d59d1b8eaed26bb9ed6c7ceb8f627d Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Fri, 10 Jun 2016 21:57:47 +0200 Subject: [PATCH 4/9] Made the preferences dialog in Tape look a bit better with resizeable left column --HG-- branch : feature --- ChangeLog.txt | 1 + src/app/tape/dialogs/tapeconfigdialog.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 02bb6efef..c440305bb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- [#479] Preferences dialog size is now saved between the sessions in Valentina and Tape app - [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size. - [#193] Undeletable zombie arc objects. - New feature. Groups. diff --git a/src/app/tape/dialogs/tapeconfigdialog.cpp b/src/app/tape/dialogs/tapeconfigdialog.cpp index 7f9c27b42..cf60198e1 100644 --- a/src/app/tape/dialogs/tapeconfigdialog.cpp +++ b/src/app/tape/dialogs/tapeconfigdialog.cpp @@ -89,11 +89,12 @@ TapeConfigDialog::TapeConfigDialog(QWidget *parent) QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(horizontalLayout); - mainLayout->addStretch(1); mainLayout->addSpacing(12); mainLayout->addLayout(buttonsLayout); setLayout(mainLayout); + mainLayout->setStretch(0, 1); + setWindowTitle(tr("Config Dialog")); qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); From 97a61f16c3e2585df9616863a4d366de9db7d369 Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Fri, 10 Jun 2016 22:26:06 +0200 Subject: [PATCH 5/9] Trying to resolve conflict --HG-- branch : feature --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c440305bb..987104fce 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,5 @@ # Version 0.5.0 -- [#479] Preferences dialog size is now saved between the sessions in Valentina and Tape app +- Size of preferences dialog in both Valentina and Tape app is now preserved between sessions - [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size. - [#193] Undeletable zombie arc objects. - New feature. Groups. From 1cb22b94a8725e1d53e7b3ce8cbdf7d0b59ec6f5 Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Fri, 10 Jun 2016 22:38:39 +0200 Subject: [PATCH 6/9] Trying to resolve conflict --HG-- branch : feature --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 987104fce..7fffa005b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ # Version 0.5.0 - Size of preferences dialog in both Valentina and Tape app is now preserved between sessions - [#479] Preferences dialog is now extendable and when it is opened again, it will be resized to its previous size. +- [#508] Settings saved to INI files in different folders. - [#193] Undeletable zombie arc objects. - New feature. Groups. - Tool "Curve intersect axis" store data about subpaths. From 1ca5b4dfa6a2aee998777784db9645b6601b2a88 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Sat, 11 Jun 2016 15:51:48 +0300 Subject: [PATCH 7/9] Resolved issue #180. Search field in tape app and dialog Increments. --HG-- branch : develop --- ChangeLog.txt | 1 + src/app/tape/tape.pri | 6 +-- .../valentina/dialogs/dialogincrements.cpp | 29 ++++++++++- src/app/valentina/dialogs/dialogincrements.h | 6 +++ src/app/valentina/dialogs/dialogincrements.ui | 52 +++++++++++++++++-- src/libs/vmisc/vmisc.pri | 6 ++- src/{app/tape => libs/vmisc}/vtablesearch.cpp | 0 src/{app/tape => libs/vmisc}/vtablesearch.h | 0 8 files changed, 88 insertions(+), 12 deletions(-) rename src/{app/tape => libs/vmisc}/vtablesearch.cpp (100%) rename src/{app/tape => libs/vmisc}/vtablesearch.h (100%) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7fffa005b..cb52a2484 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -28,6 +28,7 @@ - [#487] True dart point always goes to origin when the label is moved. - [#128] New Tool: Slash and Spread. - [#409] New feature: Export measurement file to Excel .csv. +- [#180] New feature: Search field in tape app and dialog Increments. # Version 0.4.5 - [#435] Valentina doesn't change the cursor. diff --git a/src/app/tape/tape.pri b/src/app/tape/tape.pri index a8671ed02..45d4322f4 100644 --- a/src/app/tape/tape.pri +++ b/src/app/tape/tape.pri @@ -12,8 +12,7 @@ SOURCES += \ $$PWD/dialogs/configpages/tapeconfigurationpage.cpp \ $$PWD/dialogs/configpages/tapepathpage.cpp \ $$PWD/dialogs/dialogexporttocsv.cpp \ - $$PWD/vlitepattern.cpp \ - $$PWD/vtablesearch.cpp + $$PWD/vlitepattern.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp @@ -29,8 +28,7 @@ HEADERS += \ $$PWD/dialogs/configpages/tapeconfigurationpage.h \ $$PWD/dialogs/configpages/tapepathpage.h \ $$PWD/dialogs/dialogexporttocsv.h \ - $$PWD/vlitepattern.h \ - $$PWD/vtablesearch.h + $$PWD/vlitepattern.h FORMS += \ $$PWD/tmainwindow.ui \ diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index c308b3ff4..b13541c62 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -58,14 +58,18 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par ui(new Ui::DialogIncrements), data(data), doc(doc), - formulaBaseHeight(0) + formulaBaseHeight(0), + search() { ui->setupUi(this); #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) ui->lineEditName->setClearButtonEnabled(true); + ui->lineEditFind->setClearButtonEnabled(true); #endif + search = QSharedPointer(new VTableSearch(ui->tableWidgetIncrement)); + formulaBaseHeight = ui->plainTextEditFormula->height(); qApp->Settings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale(QLocale::C)); @@ -102,6 +106,9 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par connect(ui->lineEditName, &QLineEdit::editingFinished, this, &DialogIncrements::SaveIncrName); connect(ui->plainTextEditDescription, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrDescription); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrFormula); + connect(ui->lineEditFind, &QLineEdit::textEdited, this, &DialogIncrements::Find); + connect(ui->toolButtonFindPrevious, &QToolButton::clicked, this, &DialogIncrements::FindPrevious); + connect(ui->toolButtonFindNext, &QToolButton::clicked, this, &DialogIncrements::FindNext); if (ui->tableWidgetIncrement->rowCount() > 0) { @@ -428,6 +435,8 @@ void DialogIncrements::FullUpdateFromFile() FillLengthsCurves(); FillRadiusesArcs(); FillAnglesCurves(); + + search->RefreshList(ui->lineEditFind->text()); } //--------------------------------------------------------------------------------------------------------------------- @@ -775,6 +784,24 @@ void DialogIncrements::ShowIncrementDetails() } } +//--------------------------------------------------------------------------------------------------------------------- +void DialogIncrements::Find(const QString &term) +{ + search->Find(term); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogIncrements::FindPrevious() +{ + search->FindPrevious(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogIncrements::FindNext() +{ + search->FindNext(); +} + //--------------------------------------------------------------------------------------------------------------------- DialogIncrements::~DialogIncrements() { diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h index 03a07e8e0..33f6402a5 100644 --- a/src/app/valentina/dialogs/dialogincrements.h +++ b/src/app/valentina/dialogs/dialogincrements.h @@ -31,6 +31,7 @@ #include "../vtools/dialogs/tools/dialogtool.h" #include "../xml/vpattern.h" +#include "../vmisc/vtablesearch.h" class VIndividualMeasurements; class QTableWidget; @@ -72,6 +73,9 @@ private slots: void DeployFormula(); void Fx(); void FullUpdateFromFile(); + void Find(const QString &term); + void FindPrevious(); + void FindNext(); private: Q_DISABLE_COPY(DialogIncrements) @@ -87,6 +91,8 @@ private: int formulaBaseHeight; + QSharedPointer search; + template void FillTable(const QMap &varTable, QTableWidget *table); diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index 9f82196e8..6c807b301 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -39,13 +39,56 @@ QTabWidget::North - 3 + 0 Increments + + + + 0 + + + + + Find: + + + + + + + Search + + + + + + + ... + + + + :/icons/win.icon.theme/16x16/actions/go-previous.png:/icons/win.icon.theme/16x16/actions/go-previous.png + + + + + + + ... + + + + :/icons/win.icon.theme/16x16/actions/go-next.png:/icons/win.icon.theme/16x16/actions/go-next.png + + + + + @@ -230,8 +273,7 @@ - - + .. @@ -245,8 +287,7 @@ - - + .. @@ -620,6 +661,7 @@ + diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri index b75dfda45..fbfb5e6d4 100644 --- a/src/libs/vmisc/vmisc.pri +++ b/src/libs/vmisc/vmisc.pri @@ -10,7 +10,8 @@ SOURCES += \ $$PWD/vcommonsettings.cpp \ $$PWD/vtapesettings.cpp \ $$PWD/commandoptions.cpp \ - $$PWD/qxtcsvmodel.cpp + $$PWD/qxtcsvmodel.cpp \ + $$PWD/vtablesearch.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp @@ -29,7 +30,8 @@ HEADERS += \ $$PWD/vlockguard.h \ $$PWD/vsysexits.h \ $$PWD/commandoptions.h \ - $$PWD/qxtcsvmodel.h + $$PWD/qxtcsvmodel.h \ + $$PWD/vtablesearch.h # Qt's versions # 5.0.0, 5.0.1, 5.0.2 diff --git a/src/app/tape/vtablesearch.cpp b/src/libs/vmisc/vtablesearch.cpp similarity index 100% rename from src/app/tape/vtablesearch.cpp rename to src/libs/vmisc/vtablesearch.cpp diff --git a/src/app/tape/vtablesearch.h b/src/libs/vmisc/vtablesearch.h similarity index 100% rename from src/app/tape/vtablesearch.h rename to src/libs/vmisc/vtablesearch.h From 43cba1b10f46c7f5510ffbacfc525675f73ce928 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Sat, 11 Jun 2016 16:27:14 +0300 Subject: [PATCH 8/9] Fixed build in Windows. --HG-- branch : develop --- .../toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index fb6c5c6c0..8108b1976 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -38,7 +38,7 @@ #include "../vgeometry/vsplinepath.h" #include "../vgeometry/vabstractcubicbezier.h" #include "../vgeometry/vabstractcubicbezierpath.h" -#include "../../../../../visualization/line/vistoolcurveintersectaxis.h" +#include "../vtools/visualization/line/vistoolcurveintersectaxis.h" #include "../toolcut/vtoolcutsplinepath.h" const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersectAxis"); From 45f9737fba7cbad9d8501c025eef850e0c50396d Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Sat, 11 Jun 2016 19:50:20 +0300 Subject: [PATCH 9/9] Used Lambda expressions for slots in TMainWindow and DialogIncrements. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 24 +++---------------- src/app/tape/tmainwindow.h | 5 +--- .../valentina/dialogs/dialogincrements.cpp | 24 +++---------------- src/app/valentina/dialogs/dialogincrements.h | 3 --- 4 files changed, 7 insertions(+), 49 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index b76562758..4133df72f 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -459,24 +459,6 @@ void TMainWindow::CreateFromExisting() } } -//--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::Find(const QString &term) -{ - search->Find(term); -} - -//--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::FindPrevious() -{ - search->FindPrevious(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::FindNext() -{ - search->FindNext(); -} - //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::closeEvent(QCloseEvent *event) { @@ -2018,9 +2000,9 @@ void TMainWindow::InitWindow() connect(ui->comboBoxPMSystem, static_cast(&QComboBox::currentIndexChanged), this, &TMainWindow::SavePMSystem); - connect(ui->lineEditFind, &QLineEdit::textEdited, this, &TMainWindow::Find); - connect(ui->toolButtonFindPrevious, &QToolButton::clicked, this, &TMainWindow::FindPrevious); - connect(ui->toolButtonFindNext, &QToolButton::clicked, this, &TMainWindow::FindNext); + connect(ui->lineEditFind, &QLineEdit::textEdited, [=] (const QString &term){search->Find(term);}); + connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=] (){search->FindPrevious();}); + connect(ui->toolButtonFindNext, &QToolButton::clicked, [=] (){search->FindNext();}); ui->plainTextEditNotes->setPlainText(m->Notes()); connect(ui->plainTextEditNotes, &QPlainTextEdit::textChanged, this, &TMainWindow::SaveNotes); diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 587387ee7..e349f391a 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -35,7 +35,7 @@ #include "../vmisc/def.h" #include "../vmisc/vlockguard.h" #include "../vformat/vmeasurements.h" -#include "vtablesearch.h" +#include "../vmisc/vtablesearch.h" namespace Ui { @@ -129,9 +129,6 @@ private slots: void NewWindow(); void Preferences(); void PatternUnitChanged(int index); - void Find(const QString &term); - void FindPrevious(); - void FindNext(); private: Q_DISABLE_COPY(TMainWindow) diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index b13541c62..6ddb5c78f 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -106,9 +106,9 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par connect(ui->lineEditName, &QLineEdit::editingFinished, this, &DialogIncrements::SaveIncrName); connect(ui->plainTextEditDescription, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrDescription); connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogIncrements::SaveIncrFormula); - connect(ui->lineEditFind, &QLineEdit::textEdited, this, &DialogIncrements::Find); - connect(ui->toolButtonFindPrevious, &QToolButton::clicked, this, &DialogIncrements::FindPrevious); - connect(ui->toolButtonFindNext, &QToolButton::clicked, this, &DialogIncrements::FindNext); + connect(ui->lineEditFind, &QLineEdit::textEdited, [=](const QString &term){search->Find(term);}); + connect(ui->toolButtonFindPrevious, &QToolButton::clicked, [=](){search->FindPrevious();}); + connect(ui->toolButtonFindNext, &QToolButton::clicked, [=](){search->FindNext();}); if (ui->tableWidgetIncrement->rowCount() > 0) { @@ -784,24 +784,6 @@ void DialogIncrements::ShowIncrementDetails() } } -//--------------------------------------------------------------------------------------------------------------------- -void DialogIncrements::Find(const QString &term) -{ - search->Find(term); -} - -//--------------------------------------------------------------------------------------------------------------------- -void DialogIncrements::FindPrevious() -{ - search->FindPrevious(); -} - -//--------------------------------------------------------------------------------------------------------------------- -void DialogIncrements::FindNext() -{ - search->FindNext(); -} - //--------------------------------------------------------------------------------------------------------------------- DialogIncrements::~DialogIncrements() { diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h index 33f6402a5..d54ef48b3 100644 --- a/src/app/valentina/dialogs/dialogincrements.h +++ b/src/app/valentina/dialogs/dialogincrements.h @@ -73,9 +73,6 @@ private slots: void DeployFormula(); void Fx(); void FullUpdateFromFile(); - void Find(const QString &term); - void FindPrevious(); - void FindNext(); private: Q_DISABLE_COPY(DialogIncrements)