Skip to content

Commit 3ebf52b

Browse files
committed
Fix UI fot renumbering.
1 parent 27994a7 commit 3ebf52b

2 files changed

Lines changed: 23 additions & 15 deletions

File tree

addons/src/renumber/renumberdialog.cpp

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (C) 2006-2018 by Artur Kozioł, artkoz78@gmail.com
3-
* Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
3+
* Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
44
*
55
* This file is part of GCodeWorkShop.
66
*
@@ -77,58 +77,66 @@ void RenumberDialog::divideClicked()
7777

7878
void RenumberDialog::renumClicked()
7979
{
80+
startAtlabel->setEnabled(true);
8081
formInput->setEnabled(true);
8182
startAtInput->setEnabled(true);
8283
incInput->setEnabled(true);
84+
toLabel->setEnabled(true);
8385
toInput->setEnabled(true);
8486

85-
mRenumLines->setChecked(true);
86-
mAllLines->setChecked(false);
87-
mRemoveAll->setChecked(false);
88-
8987
mRenumWithComm->setEnabled(false);
9088
mRenumEmpty->setEnabled(false);
91-
89+
mRenumMarked->setEnabled(true);
9290
mCheckDivide->setEnabled(true);
91+
divideClicked();
9392
}
9493

9594
void RenumberDialog::mRenumHeClicked()
9695
{
96+
startAtlabel->setEnabled(false);
9797
formInput->setEnabled(false);
9898
startAtInput->setEnabled(true);
9999
incInput->setEnabled(true);
100+
toLabel->setEnabled(false);
100101
toInput->setEnabled(false);
101102

102103
mRenumWithComm->setEnabled(false);
103104
mRenumEmpty->setEnabled(true);
104-
105-
mCheckDivide->setEnabled(false);
105+
mRenumMarked->setEnabled(false);
106+
mCheckDivide->setEnabled(true);
107+
divideClicked();
106108
}
107109

108110
void RenumberDialog::allLinesClicked()
109111
{
112+
startAtlabel->setEnabled(false);
110113
formInput->setEnabled(false);
111114
startAtInput->setEnabled(true);
112115
incInput->setEnabled(true);
116+
toLabel->setEnabled(false);
113117
toInput->setEnabled(false);
114118

115119
mRenumWithComm->setEnabled(true);
116120
mRenumEmpty->setEnabled(true);
117-
121+
mRenumMarked->setEnabled(false);
118122
mCheckDivide->setEnabled(true);
123+
divideClicked();
119124
}
120125

121126
void RenumberDialog::removeAllClicked()
122127
{
128+
startAtlabel->setEnabled(false);
123129
formInput->setEnabled(false);
124130
startAtInput->setEnabled(false);
125131
incInput->setEnabled(false);
132+
toLabel->setEnabled(false);
126133
toInput->setEnabled(false);
127134

128135
mRenumWithComm->setEnabled(false);
129136
mRenumEmpty->setEnabled(false);
130-
137+
mRenumMarked->setEnabled(false);
131138
mCheckDivide->setEnabled(false);
139+
divideClicked();
132140
}
133141

134142
void RenumberDialog::setOptions(const RenumberOptions& options)
@@ -181,7 +189,7 @@ RenumberOptions RenumberDialog::options()
181189
options.from = formInput->value();
182190
options.inc = incInput->value();
183191
options.renumEmpty = mRenumEmpty->isChecked();
184-
options.renumComm = !mRenumWithComm->isChecked();
192+
options.renumComm = mRenumWithComm->isChecked();
185193
options.renumMarked = mRenumMarked->isChecked();
186194
options.to = toInput->value();
187195
options.width = mSpinBox->value();

addons/src/renumber/renumberdialog.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</property>
105105
</widget>
106106
</item>
107-
<item row="2" column="1">
107+
<item row="3" column="1">
108108
<widget class="QSpinBox" name="formInput">
109109
<property name="minimum">
110110
<number>1</number>
@@ -117,7 +117,7 @@
117117
</property>
118118
</widget>
119119
</item>
120-
<item row="3" column="1">
120+
<item row="2" column="1">
121121
<widget class="QSpinBox" name="incInput">
122122
<property name="minimum">
123123
<number>1</number>
@@ -146,14 +146,14 @@
146146
</property>
147147
</widget>
148148
</item>
149-
<item row="2" column="0">
149+
<item row="3" column="0">
150150
<widget class="QLabel" name="startAtlabel">
151151
<property name="text">
152152
<string>Start from old nr.:</string>
153153
</property>
154154
</widget>
155155
</item>
156-
<item row="3" column="0">
156+
<item row="2" column="0">
157157
<widget class="QLabel" name="inclabel">
158158
<property name="text">
159159
<string>Increment numbers by :</string>

0 commit comments

Comments
 (0)