Skip to content

Commit 3860f1e

Browse files
u-235u-235
committed
Addons: skip change a dialog geometry if no settings available
1 parent 51bb743 commit 3860f1e

10 files changed

Lines changed: 50 additions & 30 deletions

File tree

‎addons/src/bhc/bhcdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,11 @@ void BHCDialog::loadSettings(const BHCOptions& defaultOptions)
513513

514514
mSettings->beginGroup(CFG_SECTION);
515515

516-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
517-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
518-
setGeometry(QRect(pos, size));
516+
if (mSettings->contains(CFG_KEY_POS)) {
517+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
518+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
519+
setGeometry(QRect(pos, size));
520+
}
519521

520522
BHCOptions opt;
521523
opt.load(mSettings, defaultOptions);

‎addons/src/chamfer/chamferdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,11 @@ void ChamferDialog::loadSettings(const ChamferOptions& defaultOptions)
332332

333333
mSettings->beginGroup(CFG_SECTION);
334334

335-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
336-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
337-
setGeometry(QRect(pos, size));
335+
if (mSettings->contains(CFG_KEY_POS)) {
336+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
337+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
338+
setGeometry(QRect(pos, size));
339+
}
338340

339341
ChamferOptions opt;
340342
opt.load(mSettings, defaultOptions);

‎addons/src/cleanup/cleanupdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,11 @@ void CleanUpDialog::loadSettings(const CleanUpOptions& defaultOptions)
278278

279279
mSettings->beginGroup(CFG_SECTION);
280280

281-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
282-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
283-
setGeometry(QRect(pos, size));
281+
if (mSettings->contains(CFG_KEY_POS)) {
282+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
283+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
284+
setGeometry(QRect(pos, size));
285+
}
284286

285287
CleanUpOptions opt;
286288
opt.load(mSettings, defaultOptions);

‎addons/src/dot/dotdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,11 @@ void DotDialog::loadSettings(const DotOptions& defaultOptions)
135135

136136
mSettings->beginGroup(CFG_SECTION);
137137

138-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
139-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
140-
setGeometry(QRect(pos, size));
138+
if (mSettings->contains(CFG_KEY_POS)) {
139+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
140+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
141+
setGeometry(QRect(pos, size));
142+
}
141143

142144
DotOptions opt;
143145
opt.load(mSettings, defaultOptions);

‎addons/src/feeds/feedsdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,11 @@ void FeedsDialog::loadSettings(const FeedsOptions& defaultOptions)
354354

355355
mSettings->beginGroup(CFG_SECTION);
356356

357-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
358-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
359-
setGeometry(QRect(pos, size));
357+
if (mSettings->contains(CFG_KEY_POS)) {
358+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
359+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
360+
setGeometry(QRect(pos, size));
361+
}
360362

361363
FeedsOptions opt;
362364
opt.load(mSettings, defaultOptions);

‎addons/src/i2m/i2mdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,11 @@ void I2MDialog::loadSettings(const I2MOptions& defaultOptions)
234234

235235
mSettings->beginGroup(CFG_SECTION);
236236

237-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
238-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
239-
setGeometry(QRect(pos, size));
237+
if (mSettings->contains(CFG_KEY_POS)) {
238+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
239+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
240+
setGeometry(QRect(pos, size));
241+
}
240242

241243
I2MOptions opt;
242244
opt.load(mSettings, defaultOptions);

‎addons/src/i2mprog/i2mprogdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ void I2MProgDialog::loadSettings(const I2MProgOptions& defaultOptions)
9696

9797
mSettings->beginGroup(CFG_SECTION);
9898

99-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
100-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
101-
setGeometry(QRect(pos, size));
99+
if (mSettings->contains(CFG_KEY_POS)) {
100+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
101+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
102+
setGeometry(QRect(pos, size));
103+
}
102104

103105
I2MProgOptions opt;
104106
opt.load(mSettings, defaultOptions);

‎addons/src/renumber/renumberdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,11 @@ void RenumberDialog::loadSettings(const RenumberOptions& defaultOptions)
222222

223223
mSettings->beginGroup(CFG_SECTION);
224224

225-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
226-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
227-
setGeometry(QRect(pos, size));
225+
if (mSettings->contains(CFG_KEY_POS)) {
226+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
227+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
228+
setGeometry(QRect(pos, size));
229+
}
228230

229231
RenumberOptions opt;
230232
opt.load(mSettings, defaultOptions);

‎addons/src/swapaxes/swapaxesdialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,11 @@ void SwapAxesDialog::loadSettings(const SwapAxesOptions& defaultOptions)
145145

146146
mSettings->beginGroup(CFG_SECTION);
147147

148-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
149-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
150-
setGeometry(QRect(pos, size));
148+
if (mSettings->contains(CFG_KEY_POS)) {
149+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
150+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
151+
setGeometry(QRect(pos, size));
152+
}
151153

152154
SwapAxesOptions opt;
153155
opt.load(mSettings, defaultOptions);

‎addons/src/triangle/triangledialog.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,9 +756,11 @@ void TriangleDialog::loadSettings(const TriangleOptions& defaultOptions)
756756

757757
mSettings->beginGroup(CFG_SECTION);
758758

759-
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
760-
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
761-
setGeometry(QRect(pos, size));
759+
if (mSettings->contains(CFG_KEY_POS)) {
760+
QPoint pos = mSettings->value(CFG_KEY_POS, geometry().topLeft()).toPoint();
761+
QSize size = mSettings->value(CFG_KEY_SIZE, geometry().size()).toSize();
762+
setGeometry(QRect(pos, size));
763+
}
762764

763765
TriangleOptions opt;
764766
opt.load(mSettings, defaultOptions);

0 commit comments

Comments
 (0)