Differential D17793 Diff 48174 libs/ui/input/kis_shortcut_configuration.cpp

Changeset View

Standalone View

View Options

libs/ui/input/kis_shortcut_configuration.cpp

Context not available.
23#include <QKeySequence> 23​#include <QKeySequence>
24#include <KLocalizedString> 24​#include <KLocalizedString>
25 25​
26​#include <boost/preprocessor/repeat_from_to.hpp>
27​#include <boost/preprocessor/stringize.hpp>
28​#include <boost/preprocessor/arithmetic/add.hpp>
29​
30​
26class KisShortcutConfiguration::Private 31​class KisShortcutConfiguration::Private
27{ 32​{
28public: 33​public:
Context not available.
228 } 233​ }
229} 234​}
230 235​
236​#define EXTRA_BUTTON(z, n, _)\
237​ if (buttons & Qt::ExtraButton##n) { \
238​ if (buttonCount++ > 0) { text.append(sep); } \
239​ text.append(i18nc("Mouse Button " BOOST_PP_STRINGIZE(BOOST_PP_ADD(n, 3)), \
yurchorUnsubmitted
Not Done

i18nc() does not work this way. It would be better i18nc("Mouse Button", "Mouse %1", BOOST_PP_STRINGIZE(BOOST_PP_ADD(n, 3)).

Thanks in advance for fixing this.

yurchor: i18nc() does not work this way. It would be better i18nc("Mouse Button", "Mouse %1"…
240​ "Mouse " BOOST_PP_STRINGIZE(BOOST_PP_ADD(n, 3)))); \
241​ }
242​
231QString KisShortcutConfiguration::buttonsToText(Qt::MouseButtons buttons) 243​QString KisShortcutConfiguration::buttonsToText(Qt::MouseButtons buttons)
232{ 244​{
233 QString text; 245​ QString text;
Context not available.
248 text.append(i18nc("Right Mouse Button", "Right")); 260​ text.append(i18nc("Right Mouse Button", "Right"));
249 } 261​ }
250 262​
251 if (buttons & Qt::MidButton) { 263​ if (buttons & Qt::MiddleButton) {
252 if (buttonCount++ > 0) { 264​ if (buttonCount++ > 0) {
253 text.append(sep); 265​ text.append(sep);
254 } 266​ }
Context not available.
256 text.append(i18nc("Middle Mouse Button", "Middle")); 268​ text.append(i18nc("Middle Mouse Button", "Middle"));
257 } 269​ }
258 270​
259 if (buttons & Qt::XButton1) { 271​ if (buttons & Qt::BackButton) {
260 if (buttonCount++ > 0) { 272​ if (buttonCount++ > 0) {
261 text.append(sep); 273​ text.append(sep);
262 } 274​ }
Context not available.
264 text.append(i18nc("Mouse Back Button", "Back")); 276​ text.append(i18nc("Mouse Back Button", "Back"));
265 } 277​ }
266 278​
267 if (buttons & Qt::XButton2) { 279​ if (buttons & Qt::ForwardButton) {
268 if (buttonCount++ > 0) { 280​ if (buttonCount++ > 0) {
269 text.append(sep); 281​ text.append(sep);
270 } 282​ }
Context not available.
272 text.append(i18nc("Mouse Forward Button", "Forward")); 284​ text.append(i18nc("Mouse Forward Button", "Forward"));
273 } 285​ }
274 286​
287​ if (buttons & Qt::TaskButton) {
288​ if (buttonCount++ > 0) {
289​ text.append(sep);
290​ }
291​
292​ text.append(i18nc("Mouse Task Button", "Task"));
293​ }
294​
295​ BOOST_PP_REPEAT_FROM_TO(4, 25, EXTRA_BUTTON, _)
296​
275 if (buttonCount == 0) { 297​ if (buttonCount == 0) {
276 text.append(i18nc("No mouse buttons for shortcut", "None")); 298​ text.append(i18nc("No mouse buttons for shortcut", "None"));
277 } 299​ }
Context not available.