Skip to content

Commit 917aab3

Browse files
committed
remove unused element from setting form
1 parent a10100b commit 917aab3

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

res/calce.lng

-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
"Dialogs"
99
"OK"
10-
"Save"
1110
"Cancel"
12-
"Advanced"
1311

1412
"Show results during the input"
1513
"Case-sensitive input"

res/calcr.lng

-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
"Разделы"
99
"OK"
10-
"Сохранить"
1110
"Отмена"
12-
"Дополнительно"
1311

1412
"Показывать результаты при вводе"
1513
"Ввод чувствителен к регистру"

src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
5656

5757
set(FLAGS_CXX_DEFAULT /Zi)
5858
set(FLAGS_CXX_RELEASE /W3 /Oi /Ot /GL /GS- /Ob1 /GF /GR)
59-
set(FLAGS_CXX_DEBUG /W4 /GS)
59+
set(FLAGS_CXX_DEBUG /W3 /GS)
6060

6161
set(LINK_FLAGS "/MAP /MANIFEST:NO")
6262

src/plugcalc/config.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ static const struct
116116

117117
{ CALC_DI_BUTTON, 0, -1, 0, 0, CALC_DIF_CENTERGROUP | CALC_DIF_DEFAULTBUTTON, mOk, nullptr, nullptr },
118118
{ CALC_DI_BUTTON, 0, 0, 0, 0, CALC_DIF_CENTERGROUP, mCancel, nullptr, nullptr },
119-
{ CALC_DI_BUTTON, 0, 0, 0, 0, CALC_DIF_CENTERGROUP|CALC_DIF_BTNNOCLOSE|CALC_DIF_DISABLE, mAdvanced, nullptr, nullptr },
120119
};
121120

122121

@@ -240,9 +239,8 @@ bool ConfigDialog()
240239

241240
int ExitCode, ok_id = -2;
242241

243-
CalcDialogItem *dlg = new CalcDialogItem[num];
244-
if (!dlg)
245-
return false;
242+
auto *dlg = new CalcDialogItem[num];
243+
246244
int Y1 = 0;
247245
for (int i = 0; i < num; i++)
248246
{
@@ -278,7 +276,7 @@ bool ConfigDialog()
278276
dlg[0].Y2 = Y1 + 1;
279277

280278
DlgConfig cfg;
281-
if (!cfg.Init(CALC_DIALOG_CONFIG, -1, -1, 58, 16, L"Config", dlg, num))
279+
if (!cfg.Init(CALC_DIALOG_CONFIG, -1, -1, 58, 15, L"Config", dlg, num))
282280
return false;
283281

284282
ExitCode = (int)cfg.Run();

src/plugcalc/messages.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enum
66
mName, mMenuName, mConfigName, mLang,
77

88
mDialogs,
9-
mOk, mSave, mCancel, mAdvanced,
9+
mOk, mCancel,
1010

1111
mConfigShowResults,
1212
mConfigCaseSensitive,

0 commit comments

Comments
 (0)