Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi
Commits
9fef32a9
Commit
9fef32a9
authored
Dec 05, 2021
by
Claudio Cambra
Browse files
Fix brackets issue
parent
33730662
Pipeline
#105782
passed with stage
in 5 minutes and 13 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/widgets/standardactionmanager.cpp
View file @
9fef32a9
...
...
@@ -1851,181 +1851,185 @@ QAction *StandardActionManager::createAction(Type type)
if
(
d
->
pluralLabels
.
contains
(
type
)
&&
!
d
->
pluralLabels
.
value
(
type
).
isEmpty
())
{
action
->
setText
(
d
->
pluralLabels
.
value
(
type
).
subs
(
1
).
toString
());
}
#if KI18N_VERSION < QT_VERSION_CHECK(5, 89, 0)
}
else
if
(
standardActionData
[
type
].
label
)
{
else
if
(
standardActionData
[
type
].
label
)
{
action
->
setText
(
i18n
(
standardActionData
[
type
].
label
));
}
#else
}
else
if
(
!
standardActionData
[
type
].
label
.
isEmpty
())
{
else
if
(
!
standardActionData
[
type
].
label
.
isEmpty
())
{
action
->
setText
(
standardActionData
[
type
].
label
.
toString
());
}
#endif
if
(
d
->
pluralIconLabels
.
contains
(
type
)
&&
!
d
->
pluralIconLabels
.
value
(
type
).
isEmpty
())
{
action
->
setIconText
(
d
->
pluralIconLabels
.
value
(
type
).
subs
(
1
).
toString
());
if
(
d
->
pluralIconLabels
.
contains
(
type
)
&&
!
d
->
pluralIconLabels
.
value
(
type
).
isEmpty
())
{
action
->
setIconText
(
d
->
pluralIconLabels
.
value
(
type
).
subs
(
1
).
toString
());
}
#if KI18N_VERSION < QT_VERSION_CHECK(5, 89, 0)
}
else
if
(
standardActionData
[
type
].
iconLabel
)
{
action
->
setIconText
(
i18n
(
standardActionData
[
type
].
iconLabel
));
else
if
(
standardActionData
[
type
].
iconLabel
)
{
action
->
setIconText
(
i18n
(
standardActionData
[
type
].
iconLabel
));
}
#else
}
else
if
(
!
standardActionData
[
type
].
iconLabel
.
isEmpty
())
{
action
->
setIconText
(
standardActionData
[
type
].
iconLabel
.
toString
());
else
if
(
!
standardActionData
[
type
].
iconLabel
.
isEmpty
())
{
action
->
setIconText
(
standardActionData
[
type
].
iconLabel
.
toString
());
}
#endif
}
if
(
standardActionData
[
type
].
icon
)
{
action
->
setIcon
(
standardActionDataIcon
(
standardActionData
[
type
]));
}
if
(
d
->
actionCollection
)
{
d
->
actionCollection
->
setDefaultShortcut
(
action
,
QKeySequence
(
standardActionData
[
type
].
shortcut
));
}
else
{
action
->
setShortcut
(
standardActionData
[
type
].
shortcut
);
}
if
(
standardActionData
[
type
].
icon
)
{
action
->
setIcon
(
standardActionDataIcon
(
standardActionData
[
type
]));
}
if
(
d
->
actionCollection
)
{
d
->
actionCollection
->
setDefaultShortcut
(
action
,
QKeySequence
(
standardActionData
[
type
].
shortcut
));
}
else
{
action
->
setShortcut
(
standardActionData
[
type
].
shortcut
);
}
if
(
standardActionData
[
type
].
slot
)
{
switch
(
standardActionData
[
type
].
actionType
)
{
case
NormalAction
:
case
ActionWithAlternative
:
connect
(
action
,
SIGNAL
(
triggered
()),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
case
MenuAction
:
{
auto
actionMenu
=
qobject_cast
<
KActionMenu
*>
(
action
);
connect
(
actionMenu
->
menu
(),
SIGNAL
(
triggered
(
QAction
*
)),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
}
case
ToggleAction
:
{
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
}
case
ActionAlternative
:
Q_ASSERT
(
0
);
}
if
(
standardActionData
[
type
].
slot
)
{
switch
(
standardActionData
[
type
].
actionType
)
{
case
NormalAction
:
case
ActionWithAlternative
:
connect
(
action
,
SIGNAL
(
triggered
()),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
case
MenuAction
:
{
auto
actionMenu
=
qobject_cast
<
KActionMenu
*>
(
action
);
connect
(
actionMenu
->
menu
(),
SIGNAL
(
triggered
(
QAction
*
)),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
}
if
(
type
==
ToggleWorkOffline
)
{
// inititalize the action state with information from config file
disconnect
(
action
,
SIGNAL
(
triggered
(
bool
)),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
action
->
setChecked
(
workOffline
());
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
// TODO: find a way to check for updates to the config file
case
ToggleAction
:
{
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
break
;
}
Q_ASSERT
(
standardActionData
[
type
].
name
);
Q_ASSERT
(
d
->
actionCollection
);
d
->
actionCollection
->
addAction
(
QString
::
fromLatin1
(
standardActionData
[
type
].
name
),
action
);
d
->
actions
[
type
]
=
action
;
if
((
standardActionData
[
type
].
actionType
==
ActionWithAlternative
)
&&
(
standardActionData
[
type
+
1
].
actionType
==
ActionAlternative
))
{
createAction
(
static_cast
<
Type
>
(
type
+
1
));
// ensure that alternative actions are initialized when not created by createAllActions
case
ActionAlternative
:
Q_ASSERT
(
0
);
}
d
->
updateActions
();
return
action
;
}
void
StandardActionManager
::
createAllActions
()
{
for
(
uint
i
=
0
;
i
<
LastType
;
++
i
)
{
createAction
(
static_cast
<
Type
>
(
i
));
}
if
(
type
==
ToggleWorkOffline
)
{
// inititalize the action state with information from config file
disconnect
(
action
,
SIGNAL
(
triggered
(
bool
)),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
action
->
setChecked
(
workOffline
());
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
// TODO: find a way to check for updates to the config file
}
QAction
*
StandardActionManager
::
action
(
Type
type
)
const
{
Q_ASSERT
(
type
<
LastType
);
return
d
->
actions
[
type
];
Q_ASSERT
(
standardActionData
[
type
].
name
);
Q_ASSERT
(
d
->
actionCollection
);
d
->
actionCollection
->
addAction
(
QString
::
fromLatin1
(
standardActionData
[
type
].
name
),
action
);
d
->
actions
[
type
]
=
action
;
if
((
standardActionData
[
type
].
actionType
==
ActionWithAlternative
)
&&
(
standardActionData
[
type
+
1
].
actionType
==
ActionAlternative
))
{
createAction
(
static_cast
<
Type
>
(
type
+
1
));
// ensure that alternative actions are initialized when not created by createAllActions
}
d
->
updateActions
();
return
action
;
}
void
StandardActionManager
::
setActionText
(
Type
type
,
const
KLocalizedString
&
text
)
{
Q_ASSERT
(
type
<
LastType
);
d
->
pluralLabels
.
insert
(
type
,
text
);
d
->
updateActions
();
void
StandardActionManager
::
createAllActions
()
{
for
(
uint
i
=
0
;
i
<
LastType
;
++
i
)
{
createAction
(
static_cast
<
Type
>
(
i
));
}
}
void
StandardActionManager
::
interceptAction
(
Type
type
,
bool
intercept
)
{
Q_ASSERT
(
type
<
LastType
);
QAction
*
StandardActionManager
::
action
(
Type
type
)
const
{
Q_ASSERT
(
type
<
LastType
);
return
d
->
actions
[
type
];
}
const
QAction
*
action
=
d
->
actions
[
type
];
void
StandardActionManager
::
setActionText
(
Type
type
,
const
KLocalizedString
&
text
)
{
Q_ASSERT
(
type
<
LastType
);
d
->
pluralLabels
.
insert
(
type
,
text
);
d
->
updateActions
();
}
if
(
!
action
)
{
return
;
}
void
StandardActionManager
::
interceptAction
(
Type
type
,
bool
intercept
)
{
Q_ASSERT
(
type
<
LastType
);
if
(
intercept
)
{
disconnect
(
action
,
SIGNAL
(
triggered
()),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
}
else
{
connect
(
action
,
SIGNAL
(
triggered
()),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
}
}
const
QAction
*
action
=
d
->
actions
[
type
];
Akonadi
::
Collection
::
List
StandardActionManager
::
selectedCollections
()
const
{
Collection
::
List
collections
;
if
(
!
action
)
{
return
;
}
if
(
!
d
->
collectionSelectionModel
)
{
return
collections
;
}
if
(
intercept
)
{
disconnect
(
action
,
SIGNAL
(
triggered
()),
this
,
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
}
else
{
connect
(
action
,
SIGNAL
(
triggered
()),
standardActionData
[
type
].
slot
);
// clazy:exclude=old-style-connect
}
}
const
QModelIndexList
lst
=
safeSelectedRows
(
d
->
collectionSelectionModel
);
for
(
const
QModelIndex
&
index
:
lst
)
{
const
auto
collection
=
index
.
data
(
EntityTreeModel
::
CollectionRole
).
value
<
Collection
>
();
if
(
collection
.
isValid
())
{
collections
<<
collection
;
}
}
Akonadi
::
Collection
::
List
StandardActionManager
::
selectedCollections
()
const
{
Collection
::
List
collections
;
if
(
!
d
->
collectionSelectionModel
)
{
return
collections
;
}
Item
::
List
StandardActionManager
::
selectedItems
()
const
{
Item
::
List
items
;
if
(
!
d
->
itemSelectionModel
)
{
return
items
;
}
const
QModelIndexList
lst
=
safeSelectedRows
(
d
->
itemSelectionModel
);
for
(
const
QModelIndex
&
index
:
lst
)
{
const
Item
item
=
index
.
data
(
EntityTreeModel
::
ItemRole
).
value
<
Item
>
();
if
(
item
.
isValid
())
{
items
<<
item
;
}
const
QModelIndexList
lst
=
safeSelectedRows
(
d
->
collectionSelectionModel
);
for
(
const
QModelIndex
&
index
:
lst
)
{
const
auto
collection
=
index
.
data
(
EntityTreeModel
::
CollectionRole
).
value
<
Collection
>
();
if
(
collection
.
isValid
())
{
collections
<<
collection
;
}
}
return
collections
;
}
Item
::
List
StandardActionManager
::
selectedItems
()
const
{
Item
::
List
items
;
if
(
!
d
->
itemSelectionModel
)
{
return
items
;
}
void
StandardActionManager
::
setContextText
(
Type
type
,
TextContext
context
,
const
QString
&
text
)
{
d
->
setContextText
(
type
,
context
,
text
);
const
QModelIndexList
lst
=
safeSelectedRows
(
d
->
itemSelectionModel
);
for
(
const
QModelIndex
&
index
:
lst
)
{
const
Item
item
=
index
.
data
(
EntityTreeModel
::
ItemRole
).
value
<
Item
>
();
if
(
item
.
isValid
())
{
items
<<
item
;
}
}
void
StandardActionManager
::
setContextText
(
Type
type
,
TextContext
context
,
const
KLocalizedString
&
text
)
{
d
->
setContextText
(
type
,
context
,
text
);
}
return
items
;
}
void
StandardActionManager
::
set
MimeTypeFilter
(
const
QStringList
&
mimeTypes
)
{
d
->
mMimeTypeFilter
=
mimeTypes
;
}
void
StandardActionManager
::
set
ContextText
(
Type
type
,
TextContext
context
,
const
QString
&
text
)
{
d
->
setContextText
(
type
,
context
,
text
)
;
}
void
StandardActionManager
::
setC
apabilityFilter
(
const
QStringList
&
capabilities
)
{
d
->
mCapabilityFilter
=
capabilities
;
}
void
StandardActionManager
::
setC
ontextText
(
Type
type
,
TextContext
context
,
const
KLocalizedString
&
text
)
{
d
->
setContextText
(
type
,
context
,
text
)
;
}
void
StandardActionManager
::
set
CollectionPropertiesPageNames
(
const
QStringList
&
nam
es
)
{
d
->
m
CollectionPropertiesPageNames
=
nam
es
;
}
void
StandardActionManager
::
set
MimeTypeFilter
(
const
QStringList
&
mimeTyp
es
)
{
d
->
m
MimeTypeFilter
=
mimeTyp
es
;
}
void
StandardActionManager
::
createActionFolderMenu
(
QMenu
*
menu
,
Type
type
)
{
d
->
createActionFolderMenu
(
menu
,
type
)
;
}
void
StandardActionManager
::
setCapabilityFilter
(
const
QStringList
&
capabilities
)
{
d
->
mCapabilityFilter
=
capabilities
;
}
void
StandardActionManager
::
addRecentCollection
(
Akonadi
::
Collection
::
Id
id
)
const
{
RecentCollectionAction
::
addRecentCollection
(
id
);
}
void
StandardActionManager
::
setCollectionPropertiesPageNames
(
const
QStringList
&
names
)
{
d
->
mCollectionPropertiesPageNames
=
names
;
}
void
StandardActionManager
::
createActionFolderMenu
(
QMenu
*
menu
,
Type
type
)
{
d
->
createActionFolderMenu
(
menu
,
type
);
}
void
StandardActionManager
::
addRecentCollection
(
Akonadi
::
Collection
::
Id
id
)
const
{
RecentCollectionAction
::
addRecentCollection
(
id
);
}
#include "moc_standardactionmanager.cpp"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment