Skip to content

Commit 3e88ab9

Browse files
krasko78krasko78
committed
11565: Allow a dialog title to be passed to StandardDialog
1 parent b6500d0 commit 3e88ab9

File tree

10 files changed

+139
-107
lines changed

10 files changed

+139
-107
lines changed

‎src/framework/autobot/internal/autobotinteractive.cpp‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ std::shared_ptr<IInteractive> AutobotInteractive::realInteractive() const
3737
}
3838

3939
IInteractive::Result AutobotInteractive::question(const std::string& title, const std::string& text, const Buttons& buttons,
40-
const Button& def, const Options& options) const
40+
const Button& def, const Options& options,
41+
const std::string& dialogTitle) const
4142
{
42-
return m_real->question(title, text, buttons, def, options);
43+
return m_real->question(title, text, buttons, def, options, dialogTitle);
4344
}
4445

4546
IInteractive::Result AutobotInteractive::question(const std::string& title, const Text& text, const ButtonDatas& buttons,
46-
int defBtn, const Options& options) const
47+
int defBtn, const Options& options, const std::string& dialogTitle) const
4748
{
48-
return m_real->question(title, text, buttons, defBtn, options);
49+
return m_real->question(title, text, buttons, defBtn, options, dialogTitle);
4950
}
5051

5152
IInteractive::ButtonData AutobotInteractive::buttonData(Button b) const
@@ -54,52 +55,53 @@ IInteractive::ButtonData AutobotInteractive::buttonData(Button b) const
5455
}
5556

5657
IInteractive::Result AutobotInteractive::info(const std::string& title, const std::string& text, const Buttons& buttons,
57-
int defBtn, const Options& options) const
58+
int defBtn, const Options& options, const std::string& dialogTitle) const
5859
{
59-
return m_real->info(title, text, buttons, defBtn, options);
60+
return m_real->info(title, text, buttons, defBtn, options, dialogTitle);
6061
}
6162

6263
IInteractive::Result AutobotInteractive::info(const std::string& title, const Text& text, const ButtonDatas& buttons, int defBtn,
63-
const Options& options) const
64+
const Options& options, const std::string& dialogTitle) const
6465
{
65-
return m_real->info(title, text, buttons, defBtn, options);
66+
return m_real->info(title, text, buttons, defBtn, options, dialogTitle);
6667
}
6768

6869
IInteractive::Result AutobotInteractive::warning(const std::string& title, const std::string& text, const Buttons& buttons,
69-
const Button& def, const Options& options) const
70+
const Button& def, const Options& options, const std::string& dialogTitle) const
7071
{
71-
return m_real->warning(title, text, buttons, def, options);
72+
return m_real->warning(title, text, buttons, def, options, dialogTitle);
7273
}
7374

7475
IInteractive::Result AutobotInteractive::warning(const std::string& title, const Text& text, const ButtonDatas& buttons,
75-
int defBtn, const Options& options) const
76+
int defBtn, const Options& options, const std::string& dialogTitle) const
7677
{
77-
return m_real->warning(title, text, buttons, defBtn, options);
78+
return m_real->warning(title, text, buttons, defBtn, options, dialogTitle);
7879
}
7980

8081
IInteractive::Result AutobotInteractive::warning(const std::string& title, const Text& text, const std::string& detailedText,
8182
const ButtonDatas& buttons, int defBtn,
82-
const Options& options) const
83+
const Options& options, const std::string& dialogTitle) const
8384
{
84-
return m_real->warning(title, text, detailedText, buttons, defBtn, options);
85+
return m_real->warning(title, text, detailedText, buttons, defBtn, options, dialogTitle);
8586
}
8687

8788
IInteractive::Result AutobotInteractive::error(const std::string& title, const std::string& text, const Buttons& buttons,
88-
const Button& def, const Options& options) const
89+
const Button& def, const Options& options, const std::string& dialogTitle) const
8990
{
90-
return m_real->error(title, text, buttons, def, options);
91+
return m_real->error(title, text, buttons, def, options, dialogTitle);
9192
}
9293

9394
IInteractive::Result AutobotInteractive::error(const std::string& title, const Text& text, const ButtonDatas& buttons,
94-
int defBtn, const Options& options) const
95+
int defBtn, const Options& options, const std::string& dialogTitle) const
9596
{
96-
return m_real->error(title, text, buttons, defBtn, options);
97+
return m_real->error(title, text, buttons, defBtn, options, dialogTitle);
9798
}
9899

99100
IInteractive::Result AutobotInteractive::error(const std::string& title, const Text& text, const std::string& detailedText,
100-
const ButtonDatas& buttons, int defBtn, const Options& options) const
101+
const ButtonDatas& buttons, int defBtn, const Options& options,
102+
const std::string& dialogTitle) const
101103
{
102-
return m_real->error(title, text, detailedText, buttons, defBtn, options);
104+
return m_real->error(title, text, detailedText, buttons, defBtn, options, dialogTitle);
103105
}
104106

105107
Ret AutobotInteractive::showProgress(const std::string& title, Progress* progress) const

‎src/framework/autobot/internal/autobotinteractive.h‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,41 @@ class AutobotInteractive : public IInteractive
3636
std::shared_ptr<IInteractive> realInteractive() const;
3737

3838
Result question(const std::string& title, const std::string& text, const Buttons& buttons, const Button& def = Button::NoButton,
39-
const Options& options = {}) const override;
39+
const Options& options = {}, const std::string& dialogTitle = "") const override;
4040

4141
Result question(const std::string& title, const Text& text, const ButtonDatas& buttons, int defBtn = int(Button::NoButton),
42-
const Options& options = {}) const override;
42+
const Options& options = {}, const std::string& dialogTitle = "") const override;
4343

4444
ButtonData buttonData(Button b) const override;
4545

4646
// info
4747
Result info(const std::string& title, const std::string& text, const Buttons& buttons = {}, int defBtn = int(Button::NoButton),
48-
const Options& options = {}) const override;
48+
const Options& options = {}, const std::string& dialogTitle = "") const override;
4949

5050
Result info(const std::string& title, const Text& text, const ButtonDatas& buttons, int defBtn = int(Button::NoButton),
51-
const Options& options = {}) const override;
51+
const Options& options = {}, const std::string& dialogTitle = "") const override;
5252

5353
// warning
5454
Result warning(const std::string& title, const std::string& text, const Buttons& buttons = {}, const Button& def = Button::NoButton,
55-
const Options& options = {}) const override;
55+
const Options& options = {}, const std::string& dialogTitle = "") const override;
5656

5757
Result warning(const std::string& title, const Text& text, const ButtonDatas& buttons = {}, int defBtn = int(Button::NoButton),
58-
const Options& options = {}) const override;
58+
const Options& options = {}, const std::string& dialogTitle = "") const override;
5959

6060
Result warning(const std::string& title, const Text& text, const std::string& detailedText, const ButtonDatas& buttons = {},
61-
int defBtn = int(Button::NoButton), const Options& options = {}) const override;
61+
int defBtn = int(Button::NoButton), const Options& options = {},
62+
const std::string& dialogTitle = "") const override;
6263

6364
// error
6465
Result error(const std::string& title, const std::string& text, const Buttons& buttons = {}, const Button& def = Button::NoButton,
65-
const Options& options = {}) const override;
66+
const Options& options = {}, const std::string& dialogTitle = "") const override;
6667

6768
Result error(const std::string& title, const Text& text, const ButtonDatas& buttons = {}, int defBtn = int(Button::NoButton),
68-
const Options& options = {}) const override;
69+
const Options& options = {}, const std::string& dialogTitle = "") const override;
6970

7071
Result error(const std::string& title, const Text& text, const std::string& detailedText, const ButtonDatas& buttons = {},
71-
int defBtn = int(Button::NoButton), const Options& options = {}) const override;
72+
int defBtn = int(Button::NoButton), const Options& options = {},
73+
const std::string& dialogTitle = "") const override;
7274

7375
// progress
7476
Ret showProgress(const std::string& title, Progress* progress) const override;

‎src/framework/global/iinteractive.h‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,39 +146,43 @@ class IInteractive : MODULE_EXPORT_INTERFACE
146146
DECLARE_FLAGS(Options, Option)
147147

148148
virtual Result question(const std::string& title, const std::string& text, const Buttons& buttons, const Button& def = Button::NoButton,
149-
const Options& options = {}) const = 0;
149+
const Options& options = {}, const std::string& dialogTitle = "") const = 0;
150150

151151
virtual Result question(const std::string& title, const Text& text, const ButtonDatas& buttons, int defBtn = int(Button::NoButton),
152-
const Options& options = {}) const = 0;
152+
const Options& options = {}, const std::string& dialogTitle = "") const = 0;
153153

154154
virtual ButtonData buttonData(Button b) const = 0;
155155

156156
// info
157157
virtual Result info(const std::string& title, const std::string& text, const Buttons& buttons = {}, int defBtn = int(Button::NoButton),
158-
const Options& options = {}) const = 0;
158+
const Options& options = {}, const std::string& dialogTitle = "") const = 0;
159159

160160
virtual Result info(const std::string& title, const Text& text, const ButtonDatas& buttons = {}, int defBtn = int(Button::NoButton),
161-
const Options& options = {}) const = 0;
161+
const Options& options = {}, const std::string& dialogTitle = "") const = 0;
162162

163163
// warning
164164
virtual Result warning(const std::string& title, const std::string& text, const Buttons& buttons = {},
165-
const Button& def = Button::NoButton, const Options& options = { WithIcon }) const = 0;
165+
const Button& def = Button::NoButton, const Options& options = { WithIcon },
166+
const std::string& dialogTitle = "") const = 0;
166167

167168
virtual Result warning(const std::string& title, const Text& text, const ButtonDatas& buttons = {}, int defBtn = int(Button::NoButton),
168-
const Options& options = { WithIcon }) const = 0;
169+
const Options& options = { WithIcon }, const std::string& dialogTitle = "") const = 0;
169170

170171
virtual Result warning(const std::string& title, const Text& text, const std::string& detailedText, const ButtonDatas& buttons = {},
171-
int defBtn = int(Button::NoButton), const Options& options = { WithIcon }) const = 0;
172+
int defBtn = int(Button::NoButton), const Options& options = { WithIcon },
173+
const std::string& dialogTitle = "") const = 0;
172174

173175
// error
174176
virtual Result error(const std::string& title, const std::string& text, const Buttons& buttons = {},
175-
const Button& def = Button::NoButton, const Options& options = { WithIcon }) const = 0;
177+
const Button& def = Button::NoButton, const Options& options = { WithIcon },
178+
const std::string& dialogTitle = "") const = 0;
176179

177180
virtual Result error(const std::string& title, const Text& text, const ButtonDatas& buttons = {}, int defBtn = int(Button::NoButton),
178-
const Options& options = { WithIcon }) const = 0;
181+
const Options& options = { WithIcon }, const std::string& dialogTitle = "") const = 0;
179182

180183
virtual Result error(const std::string& title, const Text& text, const std::string& detailedText, const ButtonDatas& buttons = {},
181-
int defBtn = int(Button::NoButton), const Options& options = { WithIcon }) const = 0;
184+
int defBtn = int(Button::NoButton), const Options& options = { WithIcon },
185+
const std::string& dialogTitle = "") const = 0;
182186

183187
// progress
184188
virtual Ret showProgress(const std::string& title, Progress* progress) const = 0;

‎src/framework/global/internal/interactive.cpp‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,16 @@ static QString filterToString(const std::vector<std::string>& filter)
7676
IInteractive::Result Interactive::question(const std::string& title, const std::string& text,
7777
const Buttons& buttons,
7878
const Button& def,
79-
const Options& options) const
79+
const Options& options,
80+
const std::string& dialogTitle) const
8081
{
81-
return question(title, Text(text), buttonDataList(buttons), int(def), options);
82+
return question(title, Text(text), buttonDataList(buttons), int(def), options, dialogTitle);
8283
}
8384

8485
IInteractive::Result Interactive::question(const std::string& title, const Text& text, const ButtonDatas& btns, int defBtn,
85-
const Options& options) const
86+
const Options& options, const std::string& dialogTitle) const
8687
{
87-
return standardDialogResult(provider()->question(title, text, btns, defBtn, options));
88+
return standardDialogResult(provider()->question(title, text, btns, defBtn, options, dialogTitle));
8889
}
8990

9091
IInteractive::ButtonData Interactive::buttonData(Button b) const
@@ -126,56 +127,58 @@ IInteractive::ButtonData Interactive::buttonData(Button b) const
126127

127128
IInteractive::Result Interactive::info(const std::string& title, const std::string& text, const Buttons& buttons,
128129
int defBtn,
129-
const Options& options) const
130+
const Options& options,
131+
const std::string& dialogTitle) const
130132
{
131-
return standardDialogResult(provider()->info(title, text, buttonDataList(buttons), defBtn, options));
133+
return standardDialogResult(provider()->info(title, text, buttonDataList(buttons), defBtn, options, dialogTitle));
132134
}
133135

134136
IInteractive::Result Interactive::info(const std::string& title, const Text& text, const ButtonDatas& buttons, int defBtn,
135-
const Options& options) const
137+
const Options& options, const std::string& dialogTitle) const
136138
{
137-
return standardDialogResult(provider()->info(title, text, buttons, defBtn, options));
139+
return standardDialogResult(provider()->info(title, text, buttons, defBtn, options, dialogTitle));
138140
}
139141

140142
Interactive::Result Interactive::warning(const std::string& title, const std::string& text, const Buttons& buttons, const Button& defBtn,
141-
const Options& options) const
143+
const Options& options, const std::string& dialogTitle) const
142144
{
143-
return standardDialogResult(provider()->warning(title, text, {}, buttonDataList(buttons), int(defBtn), options));
145+
return standardDialogResult(provider()->warning(title, text, {}, buttonDataList(buttons), int(defBtn), options, dialogTitle));
144146
}
145147

146148
IInteractive::Result Interactive::warning(const std::string& title, const Text& text, const ButtonDatas& buttons,
147149
int defBtn,
148-
const Options& options) const
150+
const Options& options,
151+
const std::string& dialogTitle) const
149152
{
150-
return standardDialogResult(provider()->warning(title, text, {}, buttons, defBtn, options));
153+
return standardDialogResult(provider()->warning(title, text, {}, buttons, defBtn, options, dialogTitle));
151154
}
152155

153156
IInteractive::Result Interactive::warning(const std::string& title, const Text& text, const std::string& detailedText,
154157
const ButtonDatas& buttons, int defBtn,
155-
const Options& options) const
158+
const Options& options, const std::string& dialogTitle) const
156159
{
157-
return standardDialogResult(provider()->warning(title, text, detailedText, buttons, defBtn, options));
160+
return standardDialogResult(provider()->warning(title, text, detailedText, buttons, defBtn, options, dialogTitle));
158161
}
159162

160163
IInteractive::Result Interactive::error(const std::string& title, const std::string& text,
161164
const Buttons& buttons, const Button& defBtn,
162-
const Options& options) const
165+
const Options& options, const std::string& dialogTitle) const
163166
{
164-
return standardDialogResult(provider()->error(title, text, {}, buttonDataList(buttons), int(defBtn), options));
167+
return standardDialogResult(provider()->error(title, text, {}, buttonDataList(buttons), int(defBtn), options, dialogTitle));
165168
}
166169

167170
IInteractive::Result Interactive::error(const std::string& title, const Text& text,
168171
const ButtonDatas& buttons, int defBtn,
169-
const Options& options) const
172+
const Options& options, const std::string& dialogTitle) const
170173
{
171-
return standardDialogResult(provider()->error(title, text, {}, buttons, defBtn, options));
174+
return standardDialogResult(provider()->error(title, text, {}, buttons, defBtn, options, dialogTitle));
172175
}
173176

174177
IInteractive::Result Interactive::error(const std::string& title, const Text& text, const std::string& detailedText,
175178
const ButtonDatas& buttons, int defBtn,
176-
const Options& options) const
179+
const Options& options, const std::string& dialogTitle) const
177180
{
178-
return standardDialogResult(provider()->error(title, text, detailedText, buttons, defBtn, options));
181+
return standardDialogResult(provider()->error(title, text, detailedText, buttons, defBtn, options, dialogTitle));
179182
}
180183

181184
Ret Interactive::showProgress(const std::string& title, Progress* progress) const

0 commit comments

Comments
 (0)