Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
KDE Pim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Unmaintained
KDE Pim
Commits
e098ea6b
Commit
e098ea6b
authored
Apr 28, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use QStringLiteral
parent
5200917b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
36 deletions
+36
-36
korganizer/actionmanager.cpp
korganizer/actionmanager.cpp
+24
-24
korganizer/impl/korganizerifaceimpl.cpp
korganizer/impl/korganizerifaceimpl.cpp
+1
-1
korganizer/kontactplugin/korganizer/todosummarywidget.cpp
korganizer/kontactplugin/korganizer/todosummarywidget.cpp
+3
-3
korganizer/plugins/hebrew/hebrew.cpp
korganizer/plugins/hebrew/hebrew.cpp
+2
-2
korganizer/prefs/koprefsdialog.cpp
korganizer/prefs/koprefsdialog.cpp
+6
-6
No files found.
korganizer/actionmanager.cpp
View file @
e098ea6b
...
...
@@ -287,7 +287,7 @@ void ActionManager::initActions()
mImportAction
->
setWhatsThis
(
i18n
(
"Select this menu entry if you would like to merge the contents "
"of another iCalendar into your current calendar."
));
mACollection
->
addAction
(
Q
Latin1String
(
"import_icalendar"
),
mImportAction
);
mACollection
->
addAction
(
Q
StringLiteral
(
"import_icalendar"
),
mImportAction
);
connect
(
mImportAction
,
&
QAction
::
triggered
,
this
,
&
ActionManager
::
file_import
);
QAction
*
importAction
=
new
QAction
(
i18n
(
"&Import From UNIX Ical Tool"
),
this
);
...
...
@@ -295,23 +295,23 @@ void ActionManager::initActions()
importAction
->
setWhatsThis
(
i18n
(
"Select this menu entry if you would like to import the contents "
"of a non-iCalendar formatted file into your current calendar."
));
mACollection
->
addAction
(
Q
Latin1String
(
"import_ical"
),
importAction
);
mACollection
->
addAction
(
Q
StringLiteral
(
"import_ical"
),
importAction
);
connect
(
importAction
,
&
QAction
::
triggered
,
this
,
&
ActionManager
::
file_icalimport
);
action
=
new
QAction
(
i18n
(
"Get &Hot New Stuff..."
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"downloadnewstuff"
),
action
);
mACollection
->
addAction
(
Q
StringLiteral
(
"downloadnewstuff"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
ActionManager
::
downloadNewStuff
);
action
=
new
QAction
(
i18n
(
"Export &Web Page..."
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"export_web"
),
action
);
mACollection
->
addAction
(
Q
StringLiteral
(
"export_web"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
mCalendarView
,
&
CalendarView
::
exportWeb
);
action
=
new
QAction
(
i18n
(
"Export as &iCalendar..."
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"export_icalendar"
),
action
);
mACollection
->
addAction
(
Q
StringLiteral
(
"export_icalendar"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
mCalendarView
,
&
CalendarView
::
exportICalendar
);
action
=
new
QAction
(
i18n
(
"Export as &vCalendar..."
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"export_vcalendar"
),
action
);
mACollection
->
addAction
(
Q
StringLiteral
(
"export_vcalendar"
),
action
);
connect
(
action
,
&
QAction
::
triggered
,
mCalendarView
,
&
CalendarView
::
exportVCalendar
);
//Laurent: 2009-03-24 comment it until upload will implement
...
...
@@ -371,56 +371,56 @@ void ActionManager::initActions()
/************************** VIEW MENU *********************************/
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-upcoming-events"
)),
i18n
(
"What's &Next"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_whatsnext"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-upcoming-events"
)),
i18n
(
"What's &Next"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_whatsnext"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showWhatsNextView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-month"
)),
i18n
(
"&Month"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_month"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-month"
)),
i18n
(
"&Month"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_month"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showMonthView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-agenda"
)),
i18n
(
"&Agenda"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_agenda"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-agenda"
)),
i18n
(
"&Agenda"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_agenda"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showAgendaView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-list"
)),
i18n
(
"&Event List"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_list"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-list"
)),
i18n
(
"&Event List"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_list"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showListView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-tasks"
)),
i18n
(
"&To-do List"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_todo"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-tasks"
)),
i18n
(
"&To-do List"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_todo"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showTodoView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-journal"
)),
i18n
(
"&Journal"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_journal"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-journal"
)),
i18n
(
"&Journal"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_journal"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showJournalView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-timeline"
)),
i18n
(
"Time&line"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_timeline"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-timeline"
)),
i18n
(
"Time&line"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_timeline"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showTimeLineView
()));
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-calendar-time-spent"
)),
i18n
(
"Time&spent"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"view_timespent"
),
action
);
action
=
new
QAction
(
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-calendar-time-spent"
)),
i18n
(
"Time&spent"
),
this
);
mACollection
->
addAction
(
Q
StringLiteral
(
"view_timespent"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
->
viewManager
(),
SLOT
(
showTimeSpentView
()));
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ REFRESH ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
action
=
new
QAction
(
i18n
(
"&Refresh"
),
this
);
mACollection
->
addAction
(
Q
Latin1String
(
"update"
),
action
);
mACollection
->
addAction
(
Q
StringLiteral
(
"update"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mCalendarView
,
SLOT
(
updateView
()));
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTER ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mFilterAction
=
new
KSelectAction
(
i18n
(
"F&ilter"
),
this
);
mFilterAction
->
setToolBarMode
(
KSelectAction
::
MenuMode
);
mACollection
->
addAction
(
Q
Latin1String
(
"filter_select"
),
mFilterAction
);
mACollection
->
addAction
(
Q
StringLiteral
(
"filter_select"
),
mFilterAction
);
mFilterAction
->
setEditable
(
false
);
connect
(
mFilterAction
,
SIGNAL
(
triggered
(
int
)),
mCalendarView
,
SLOT
(
filterActivated
(
int
)));
...
...
korganizer/impl/korganizerifaceimpl.cpp
View file @
e098ea6b
...
...
@@ -43,7 +43,7 @@ KOrganizerIfaceImpl::KOrganizerIfaceImpl(ActionManager *actionManager,
setObjectName
(
QLatin1String
(
name
));
new
KorganizerAdaptor
(
this
);
QDBusConnection
::
sessionBus
().
registerObject
(
Q
Latin1String
(
"/Korganizer"
),
this
,
QDBusConnection
::
ExportAdaptors
);
Q
StringLiteral
(
"/Korganizer"
),
this
,
QDBusConnection
::
ExportAdaptors
);
}
KOrganizerIfaceImpl
::~
KOrganizerIfaceImpl
()
...
...
korganizer/kontactplugin/korganizer/todosummarywidget.cpp
View file @
e098ea6b
...
...
@@ -314,9 +314,9 @@ void TodoSummaryWidget::viewTodo(const QString &uid)
Akonadi
::
Item
::
Id
id
=
mCalendar
->
item
(
uid
).
id
();
if
(
id
!=
-
1
)
{
mPlugin
->
core
()
->
selectPlugin
(
Q
Latin1String
(
"kontact_todoplugin"
));
//ensure loaded
mPlugin
->
core
()
->
selectPlugin
(
Q
StringLiteral
(
"kontact_todoplugin"
));
//ensure loaded
OrgKdeKorganizerKorganizerInterface
korganizer
(
Q
Latin1String
(
"org.kde.korganizer"
),
QLatin1String
(
"/Korganizer"
),
QDBusConnection
::
sessionBus
());
Q
StringLiteral
(
"org.kde.korganizer"
),
QStringLiteral
(
"/Korganizer"
),
QDBusConnection
::
sessionBus
());
korganizer
.
editIncidence
(
QString
::
number
(
id
));
}
...
...
@@ -359,7 +359,7 @@ void TodoSummaryWidget::popupMenu(const QString &uid)
if
(
!
todo
->
isCompleted
())
{
doneIt
=
popup
.
addAction
(
i18n
(
"&Mark To-do Completed"
));
doneIt
->
setIcon
(
KIconLoader
::
global
()
->
loadIcon
(
Q
Latin1String
(
"task-complete"
),
KIconLoader
::
Small
));
doneIt
->
setIcon
(
KIconLoader
::
global
()
->
loadIcon
(
Q
StringLiteral
(
"task-complete"
),
KIconLoader
::
Small
));
doneIt
->
setEnabled
(
mCalendar
->
hasRight
(
item
,
Akonadi
::
Collection
::
CanChangeItem
));
}
// TODO: add icons to the menu actions
...
...
korganizer/plugins/hebrew/hebrew.cpp
View file @
e098ea6b
...
...
@@ -32,11 +32,11 @@ using namespace EventViews::CalendarDecoration;
Hebrew
::
Hebrew
()
{
KConfig
config
(
Q
Latin1String
(
"korganizerrc"
),
KConfig
::
NoGlobals
);
KConfig
config
(
Q
StringLiteral
(
"korganizerrc"
),
KConfig
::
NoGlobals
);
KConfigGroup
group
(
&
config
,
"Hebrew Calendar Plugin"
);
areWeInIsrael
=
group
.
readEntry
(
"UseIsraelSettings"
,
(
KLocale
::
global
()
->
country
()
==
Q
Latin1String
(
".il"
)));
"UseIsraelSettings"
,
(
KLocale
::
global
()
->
country
()
==
Q
StringLiteral
(
".il"
)));
showParsha
=
group
.
readEntry
(
"ShowParsha"
,
true
);
showChol
=
group
.
readEntry
(
"ShowChol_HaMoed"
,
true
);
showOmer
=
group
.
readEntry
(
"ShowOmer"
,
true
);
...
...
korganizer/prefs/koprefsdialog.cpp
View file @
e098ea6b
...
...
@@ -96,7 +96,7 @@ KOPrefsDialogMain::KOPrefsDialogMain(QWidget *parent)
// Personal Settings
QWidget
*
personalFrame
=
new
QWidget
(
this
);
QVBoxLayout
*
personalLayout
=
new
QVBoxLayout
(
personalFrame
);
tabWidget
->
addTab
(
personalFrame
,
QIcon
::
fromTheme
(
Q
Latin1String
(
"preferences-desktop-personal"
)),
tabWidget
->
addTab
(
personalFrame
,
QIcon
::
fromTheme
(
Q
StringLiteral
(
"preferences-desktop-personal"
)),
i18nc
(
"@title:tab personal settings"
,
"Personal"
));
KPIM
::
KPrefsWidBool
*
emailControlCenter
=
...
...
@@ -162,7 +162,7 @@ KOPrefsDialogMain::KOPrefsDialogMain(QWidget *parent)
// System Tray Settings
QFrame
*
systrayFrame
=
new
QFrame
(
this
);
QVBoxLayout
*
systrayLayout
=
new
QVBoxLayout
(
systrayFrame
);
tabWidget
->
addTab
(
systrayFrame
,
QIcon
::
fromTheme
(
Q
Latin1String
(
"preferences-other"
)),
tabWidget
->
addTab
(
systrayFrame
,
QIcon
::
fromTheme
(
Q
StringLiteral
(
"preferences-other"
)),
i18nc
(
"@title:tab systray settings"
,
"System Tray"
));
QGroupBox
*
systrayGroupBox
=
...
...
@@ -543,7 +543,7 @@ public:
// Tab: Views->General
QFrame
*
generalFrame
=
new
QFrame
(
this
);
tabWidget
->
addTab
(
generalFrame
,
QIcon
::
fromTheme
(
Q
Latin1String
(
"view-choose"
)),
tabWidget
->
addTab
(
generalFrame
,
QIcon
::
fromTheme
(
Q
StringLiteral
(
"view-choose"
)),
i18nc
(
"@title:tab general settings"
,
"General"
));
QBoxLayout
*
generalLayout
=
new
QVBoxLayout
(
generalFrame
);
...
...
@@ -1214,7 +1214,7 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins(QWidget *parent)
QBoxLayout
*
buttonRowLayout
=
new
QHBoxLayout
(
buttonRow
);
mConfigureButton
=
new
QPushButton
(
buttonRow
);
KGuiItem
::
assign
(
mConfigureButton
,
KGuiItem
(
i18nc
(
"@action:button"
,
"Configure &Plugin..."
),
Q
Latin1String
(
"configure"
),
QString
(),
Q
StringLiteral
(
"configure"
),
QString
(),
i18nc
(
"@info:whatsthis"
,
"This button allows you to configure"
" the plugin that you have selected in the list above"
)));
...
...
@@ -1479,7 +1479,7 @@ QString KOPrefsDesignerFields::localUiDir()
QString
KOPrefsDesignerFields
::
uiPath
()
{
return
Q
Latin1String
(
"korganizer/designer/event/"
);
return
Q
StringLiteral
(
"korganizer/designer/event/"
);
}
void
KOPrefsDesignerFields
::
writeActivePages
(
const
QStringList
&
activePages
)
...
...
@@ -1495,6 +1495,6 @@ QStringList KOPrefsDesignerFields::readActivePages()
QString
KOPrefsDesignerFields
::
applicationName
()
{
return
Q
Latin1String
(
"KORGANIZER"
);
return
Q
StringLiteral
(
"KORGANIZER"
);
}
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