Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Akonadi Contacts
Commits
1b95fce2
Commit
1b95fce2
authored
Jan 18, 2017
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor optimization
parent
e334a957
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
26 deletions
+32
-26
src/editor/generalinfoeditor/mail/mailwidget.cpp
src/editor/generalinfoeditor/mail/mailwidget.cpp
+1
-3
src/editor/generalinfoeditor/web/webwidget.cpp
src/editor/generalinfoeditor/web/webwidget.cpp
+1
-3
src/standardcontactactionmanager.cpp
src/standardcontactactionmanager.cpp
+30
-20
No files found.
src/editor/generalinfoeditor/mail/mailwidget.cpp
View file @
1b95fce2
...
...
@@ -125,9 +125,7 @@ KContacts::Email MailWidget::email()
value
.
append
(
QStringLiteral
(
"PREF"
));
}
}
else
{
if
(
value
.
contains
(
QStringLiteral
(
"PREF"
)))
{
value
.
removeAll
(
QStringLiteral
(
"PREF"
));
}
value
.
removeAll
(
QStringLiteral
(
"PREF"
));
}
if
(
!
value
.
isEmpty
())
{
parameters
.
insert
(
QStringLiteral
(
"type"
),
value
);
...
...
src/editor/generalinfoeditor/web/webwidget.cpp
View file @
1b95fce2
...
...
@@ -128,9 +128,7 @@ KContacts::ResourceLocatorUrl WebWidget::url()
value
.
append
(
QStringLiteral
(
"PREF"
));
}
}
else
{
if
(
value
.
contains
(
QStringLiteral
(
"PREF"
)))
{
value
.
removeAll
(
QStringLiteral
(
"PREF"
));
}
value
.
removeAll
(
QStringLiteral
(
"PREF"
));
}
if
(
!
value
.
isEmpty
())
{
parameters
.
insert
(
QStringLiteral
(
"type"
),
value
);
...
...
src/standardcontactactionmanager.cpp
View file @
1b95fce2
...
...
@@ -343,11 +343,13 @@ public:
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
CopyItems
,
ki18np
(
"Copy Contact"
,
"Copy %1 Contacts"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
)
->
setText
(
i18n
(
"Copy Contact To"
));
QAction
*
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Copy Contact To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
)
->
setText
(
i18n
(
"Copy Contact To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Copy Contact To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
DeleteItems
))
{
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
DeleteItems
,
...
...
@@ -357,25 +359,30 @@ public:
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
CutItems
,
ki18np
(
"Cut Contact"
,
"Cut %1 Contacts"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
)
->
setText
(
i18n
(
"Move Contact To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Move Contact To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
)
->
setText
(
i18n
(
"Move Contact To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Move Contact To"
));
}
if
(
mActions
.
contains
(
StandardContactActionManager
::
EditItem
))
{
mActions
.
value
(
StandardContactActionManager
::
EditItem
)
->
setText
(
i18n
(
"Edit Contact..."
));
act
=
mActions
.
value
(
StandardContactActionManager
::
EditItem
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Edit Contact..."
));
}
}
else
if
(
mimeType
==
KContacts
::
ContactGroup
::
mimeType
())
{
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItems
))
{
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
CopyItems
,
ki18np
(
"Copy Group"
,
"Copy %1 Groups"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
)
->
setText
(
i18n
(
"Copy Group To"
));
QAction
*
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToMenu
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Copy Group To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
)
->
setText
(
i18n
(
"Copy Group To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
CopyItemToDialog
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Copy Group To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
DeleteItems
))
{
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
DeleteItems
,
...
...
@@ -385,14 +392,17 @@ public:
mGenericManager
->
setActionText
(
Akonadi
::
StandardActionManager
::
CutItems
,
ki18np
(
"Cut Group"
,
"Cut %1 Groups"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
)
->
setText
(
i18n
(
"Move Group To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToMenu
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Move Group To"
));
}
if
(
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
))
{
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
)
->
setText
(
i18n
(
"Move Group To"
));
act
=
mGenericManager
->
action
(
Akonadi
::
StandardActionManager
::
MoveItemToDialog
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Move Group To"
));
}
if
(
mActions
.
contains
(
StandardContactActionManager
::
EditItem
))
{
mActions
.
value
(
StandardContactActionManager
::
EditItem
)
->
setText
(
i18n
(
"Edit Group..."
));
act
=
mActions
.
value
(
StandardContactActionManager
::
EditItem
);
if
(
act
)
{
act
->
setText
(
i18n
(
"Edit Group..."
));
}
}
}
...
...
Write
Preview
Markdown
is supported
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