From 5b43f9177b16fc00160214409c9cf135c6edcd8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 30 Mar 2018 09:25:39 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@368 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/blockview/blockview.cpp | 2 ++ qad/widgets/session_manager.h | 58 +++++++++++++++++------------------ 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/qad/blockview/blockview.cpp b/qad/blockview/blockview.cpp index bf8a82c..17b2fb9 100644 --- a/qad/blockview/blockview.cpp +++ b/qad/blockview/blockview.cpp @@ -601,6 +601,8 @@ void BlockView::wheelEvent(QWheelEvent * e) { if (e->modifiers().testFlag(Qt::ControlModifier)) { double scl = 1. - e->delta() / 500.; //scale(scl, scl); + if (!is_nav_anim || (nav_anim.state() != QPropertyAnimation::Running)) + nav_target = _nav(); QRectF r = nav_target; double cx = double(e->pos().x()) / viewport()->width(), cy = double(e->pos().y()) / viewport()->height(); double pw = r.width(), ph = r.height(); diff --git a/qad/widgets/session_manager.h b/qad/widgets/session_manager.h index 6dac195..8de48bc 100644 --- a/qad/widgets/session_manager.h +++ b/qad/widgets/session_manager.h @@ -21,37 +21,37 @@ public: SessionManager(const QString & file = QString()) {setFile(file);} ~SessionManager() {;} - inline void setFile(const QString & file) {file_ = file;} + void setFile(const QString & file) {file_ = file;} - inline void addEntry(QMainWindow * e) {mwindows.push_back(QPair(e->objectName(), e));} - inline void addEntry(QCheckBox * e) {checks.push_back(QPair(e->objectName(), e));} - inline void addEntry(QLineEdit * e) {lines.push_back(QPair(e->objectName(), e));} - inline void addEntry(QComboBox * e) {combos.push_back(QPair(e->objectName(), e));} - inline void addEntry(QDoubleSpinBox * e) {dspins.push_back(QPair(e->objectName(), e));} - inline void addEntry(QSpinBox * e) {spins.push_back(QPair(e->objectName(), e));} - inline void addEntry(SpinSlider * e) {spinsliders.push_back(QPair(e->objectName(), e));} - inline void addEntry(QTabWidget * e) {tabs.push_back(QPair(e->objectName(), e));} - inline void addEntry(QAction * e) {actions.push_back(QPair(e->objectName(), e));} - inline void addEntry(QAbstractButton * e) {buttons.push_back(QPair(e->objectName(), e));} - inline void addMainWidget(QWidget * e) {widgets.push_back(QPair(e->objectName(), e));} + void addEntry(QMainWindow * e) {mwindows.push_back(QPair(e->objectName(), e));} + void addEntry(QCheckBox * e) {checks.push_back(QPair(e->objectName(), e));} + void addEntry(QLineEdit * e) {lines.push_back(QPair(e->objectName(), e));} + void addEntry(QComboBox * e) {combos.push_back(QPair(e->objectName(), e));} + void addEntry(QDoubleSpinBox * e) {dspins.push_back(QPair(e->objectName(), e));} + void addEntry(QSpinBox * e) {spins.push_back(QPair(e->objectName(), e));} + void addEntry(SpinSlider * e) {spinsliders.push_back(QPair(e->objectName(), e));} + void addEntry(QTabWidget * e) {tabs.push_back(QPair(e->objectName(), e));} + void addEntry(QAction * e) {actions.push_back(QPair(e->objectName(), e));} + void addEntry(QAbstractButton * e) {buttons.push_back(QPair(e->objectName(), e));} + void addMainWidget(QWidget * e) {widgets.push_back(QPair(e->objectName(), e));} - inline void addEntry(const QString & name, QMainWindow * e) {mwindows.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QCheckBox * e) {checks.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QLineEdit * e) {lines.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QComboBox * e) {combos.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QDoubleSpinBox * e) {dspins.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QSpinBox * e) {spins.push_back(QPair(name, e));} - inline void addEntry(const QString & name, SpinSlider * e) {spinsliders.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QTabWidget * e) {tabs.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QAbstractButton * e) {buttons.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QAction * e) {actions.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QStringList * e) {stringlists.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QString * e) {strings.push_back(QPair(name, e));} - inline void addEntry(const QString & name, QColor * e) {colors.push_back(QPair(name, e));} - inline void addEntry(const QString & name, bool * e) {bools.push_back(QPair(name, e));} - inline void addEntry(const QString & name, int * e) {ints.push_back(QPair(name, e));} - inline void addEntry(const QString & name, float * e) {floats.push_back(QPair(name, e));} - inline void addMainWidget(const QString & name, QWidget * e) {widgets.push_back(QPair(name, e));} + void addEntry(const QString & name, QMainWindow * e) {mwindows.push_back(QPair(name, e));} + void addEntry(const QString & name, QCheckBox * e) {checks.push_back(QPair(name, e));} + void addEntry(const QString & name, QLineEdit * e) {lines.push_back(QPair(name, e));} + void addEntry(const QString & name, QComboBox * e) {combos.push_back(QPair(name, e));} + void addEntry(const QString & name, QDoubleSpinBox * e) {dspins.push_back(QPair(name, e));} + void addEntry(const QString & name, QSpinBox * e) {spins.push_back(QPair(name, e));} + void addEntry(const QString & name, SpinSlider * e) {spinsliders.push_back(QPair(name, e));} + void addEntry(const QString & name, QTabWidget * e) {tabs.push_back(QPair(name, e));} + void addEntry(const QString & name, QAbstractButton * e) {buttons.push_back(QPair(name, e));} + void addEntry(const QString & name, QAction * e) {actions.push_back(QPair(name, e));} + void addEntry(const QString & name, QStringList * e) {stringlists.push_back(QPair(name, e));} + void addEntry(const QString & name, QString * e) {strings.push_back(QPair(name, e));} + void addEntry(const QString & name, QColor * e) {colors.push_back(QPair(name, e));} + void addEntry(const QString & name, bool * e) {bools.push_back(QPair(name, e));} + void addEntry(const QString & name, int * e) {ints.push_back(QPair(name, e));} + void addEntry(const QString & name, float * e) {floats.push_back(QPair(name, e));} + void addMainWidget(const QString & name, QWidget * e) {widgets.push_back(QPair(name, e));} void save(); void load(bool onlyMainwindow = false);