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
e5563d54
Commit
e5563d54
authored
Nov 26, 2014
by
René J.V. Bertin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KDE/4.14' of
git://anongit.kde.org/kdepim
into KDE/4.14
parents
6305d1c6
569b43cc
Changes
90
Hide whitespace changes
Inline
Side-by-side
Showing
90 changed files
with
1106 additions
and
602 deletions
+1106
-602
agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
...owupreminderagent/akonadi_followupreminder_agent.notifyrc
+1
-1
agents/followupreminderagent/followupreminder.desktop
agents/followupreminderagent/followupreminder.desktop
+2
-2
agents/followupreminderagent/followupreminderinfowidget.cpp
agents/followupreminderagent/followupreminderinfowidget.cpp
+1
-0
agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
+2
-0
calendarviews/eventview.h
calendarviews/eventview.h
+2
-2
examples/mailreader/mailreader.desktop
examples/mailreader/mailreader.desktop
+1
-0
kalarm/Changelog
kalarm/Changelog
+1
-1
kmail/CMakeLists.txt
kmail/CMakeLists.txt
+5
-0
kmail/editor/composer.h
kmail/editor/composer.h
+0
-2
kmail/editor/kmcomposewin.cpp
kmail/editor/kmcomposewin.cpp
+6
-12
kmail/editor/kmcomposewin.h
kmail/editor/kmcomposewin.h
+0
-1
kmail/kmail_part.rc
kmail/kmail_part.rc
+2
-1
kmail/kmconfigureagent.cpp
kmail/kmconfigureagent.cpp
+69
-0
kmail/kmconfigureagent.h
kmail/kmconfigureagent.h
+38
-0
kmail/kmmainwidget.cpp
kmail/kmmainwidget.cpp
+12
-28
kmail/kmmainwidget.h
kmail/kmmainwidget.h
+2
-3
kmail/kmmainwin.rc
kmail/kmmainwin.rc
+2
-1
kmail/kmstartup.cpp
kmail/kmstartup.cpp
+2
-1
kmail/kmstartup.h
kmail/kmstartup.h
+0
-6
kmail/util.cpp
kmail/util.cpp
+0
-10
kmail/util.h
kmail/util.h
+0
-1
knotes/data/knotes.notifyrc
knotes/data/knotes.notifyrc
+0
-73
korganizer/README
korganizer/README
+0
-280
korganizer/calendarview.cpp
korganizer/calendarview.cpp
+4
-4
korganizer/calendarview.h
korganizer/calendarview.h
+2
-2
korganizer/interfaces/korganizer/baseview.h
korganizer/interfaces/korganizer/baseview.h
+2
-2
korganizer/koeventpopupmenu.cpp
korganizer/koeventpopupmenu.cpp
+6
-6
korganizer/koeventpopupmenu.h
korganizer/koeventpopupmenu.h
+2
-2
korganizer/koeventview.cpp
korganizer/koeventview.cpp
+4
-4
korganizer/koviewmanager.cpp
korganizer/koviewmanager.cpp
+4
-4
korganizer/views/agendaview/koagendaview.cpp
korganizer/views/agendaview/koagendaview.cpp
+4
-4
korganizer/views/journalview/kojournalview.cpp
korganizer/views/journalview/kojournalview.cpp
+4
-4
korganizer/views/listview/kolistview.cpp
korganizer/views/listview/kolistview.cpp
+4
-4
korganizer/views/monthview/monthview.cpp
korganizer/views/monthview/monthview.cpp
+4
-4
korganizer/views/multiagendaview/multiagendaview.cpp
korganizer/views/multiagendaview/multiagendaview.cpp
+4
-4
korganizer/views/timelineview/kotimelineview.cpp
korganizer/views/timelineview/kotimelineview.cpp
+4
-4
korganizer/views/timespentview/kotimespentview.cpp
korganizer/views/timespentview/kotimespentview.cpp
+4
-4
korganizer/views/todoview/kotodoview.cpp
korganizer/views/todoview/kotodoview.cpp
+4
-4
korganizer/views/whatsnextview/kowhatsnextview.cpp
korganizer/views/whatsnextview/kowhatsnextview.cpp
+4
-4
ktimetracker/support/ktimetracker.desktop
ktimetracker/support/ktimetracker.desktop
+1
-1
messagecomposer/attachment/attachmentcontrollerbase.cpp
messagecomposer/attachment/attachmentcontrollerbase.cpp
+56
-10
messagecomposer/attachment/attachmentcontrollerbase.h
messagecomposer/attachment/attachmentcontrollerbase.h
+4
-1
messagecomposer/attachment/attachmentmodel.cpp
messagecomposer/attachment/attachmentmodel.cpp
+1
-1
messagecomposer/composer/composer.cpp
messagecomposer/composer/composer.cpp
+0
-2
messagecomposer/helper/messagehelper.cpp
messagecomposer/helper/messagehelper.cpp
+1
-2
messagecomposer/job/skeletonmessagejob.cpp
messagecomposer/job/skeletonmessagejob.cpp
+0
-1
messagecomposer/part/globalpart.cpp
messagecomposer/part/globalpart.cpp
+9
-5
messagecomposer/part/infopart.cpp
messagecomposer/part/infopart.cpp
+7
-2
messagecomposer/part/textpart.cpp
messagecomposer/part/textpart.cpp
+7
-2
messagecomposer/tests/CMakeLists.txt
messagecomposer/tests/CMakeLists.txt
+3
-0
messagecomposer/tests/globalparttest.cpp
messagecomposer/tests/globalparttest.cpp
+42
-0
messagecomposer/tests/globalparttest.h
messagecomposer/tests/globalparttest.h
+32
-0
messagecomposer/tests/infoparttest.cpp
messagecomposer/tests/infoparttest.cpp
+39
-0
messagecomposer/tests/infoparttest.h
messagecomposer/tests/infoparttest.h
+33
-0
messagecomposer/tests/textparttest.cpp
messagecomposer/tests/textparttest.cpp
+39
-0
messagecomposer/tests/textparttest.h
messagecomposer/tests/textparttest.h
+32
-0
messagecore/CMakeLists.txt
messagecore/CMakeLists.txt
+1
-0
messagecore/attachment/attachmentfromfolderjob.cpp
messagecore/attachment/attachmentfromfolderjob.cpp
+4
-6
messagecore/attachment/attachmentfromurljob.cpp
messagecore/attachment/attachmentfromurljob.cpp
+8
-9
messagecore/attachment/attachmentpart.cpp
messagecore/attachment/attachmentpart.cpp
+22
-10
messagecore/attachment/attachmentpart.h
messagecore/attachment/attachmentpart.h
+5
-1
messagecore/attachment/attachmentupdatejob.cpp
messagecore/attachment/attachmentupdatejob.cpp
+130
-0
messagecore/attachment/attachmentupdatejob.h
messagecore/attachment/attachmentupdatejob.h
+46
-0
messagecore/tests/CMakeLists.txt
messagecore/tests/CMakeLists.txt
+1
-0
messagecore/tests/attachmentupdatejobtest.cpp
messagecore/tests/attachmentupdatejobtest.cpp
+201
-0
messagecore/tests/attachmentupdatejobtest.h
messagecore/tests/attachmentupdatejobtest.h
+40
-0
messagecore/tests/stringutiltest.cpp
messagecore/tests/stringutiltest.cpp
+21
-0
messagecore/tests/stringutiltest.h
messagecore/tests/stringutiltest.h
+2
-0
messagelist/pane.cpp
messagelist/pane.cpp
+24
-17
messagelist/pane.h
messagelist/pane.h
+1
-2
messageviewer/findbar/findbarmailwebview.cpp
messageviewer/findbar/findbarmailwebview.cpp
+1
-0
messageviewer/viewer/editorwatcher.cpp
messageviewer/viewer/editorwatcher.cpp
+3
-3
messageviewer/viewer/editorwatcher.h
messageviewer/viewer/editorwatcher.h
+6
-3
messageviewer/viewer/nodehelper.cpp
messageviewer/viewer/nodehelper.cpp
+1
-1
messageviewer/viewer/viewer_p.cpp
messageviewer/viewer/viewer_p.cpp
+1
-1
pimcommon/autocorrection/autocorrectionlistwidget.cpp
pimcommon/autocorrection/autocorrectionlistwidget.cpp
+1
-0
pimcommon/autocorrection/autocorrectiontreewidget.cpp
pimcommon/autocorrection/autocorrectiontreewidget.cpp
+1
-0
pimcommon/autocorrection/tests/autocorrectiontest.cpp
pimcommon/autocorrection/tests/autocorrectiontest.cpp
+28
-1
pimcommon/autocorrection/tests/autocorrectiontest.h
pimcommon/autocorrection/tests/autocorrectiontest.h
+1
-1
pimcommon/widgets/splittercollapser.cpp
pimcommon/widgets/splittercollapser.cpp
+30
-23
pimcommon/widgets/splittercollapser.h
pimcommon/widgets/splittercollapser.h
+1
-0
pimsettingexporter/abstractimportexportjob.cpp
pimsettingexporter/abstractimportexportjob.cpp
+5
-5
pimsettingexporter/addressbook/exportaddressbookjob.cpp
pimsettingexporter/addressbook/exportaddressbookjob.cpp
+1
-1
pimsettingexporter/alarm/exportalarmjob.cpp
pimsettingexporter/alarm/exportalarmjob.cpp
+1
-1
pimsettingexporter/calendar/exportcalendarjob.cpp
pimsettingexporter/calendar/exportcalendarjob.cpp
+1
-1
pimsettingexporter/jot/exportjotjob.cpp
pimsettingexporter/jot/exportjotjob.cpp
+1
-1
pimsettingexporter/mail/exportmailjob.cpp
pimsettingexporter/mail/exportmailjob.cpp
+1
-1
pimsettingexporter/notes/exportnotesjob.cpp
pimsettingexporter/notes/exportnotesjob.cpp
+1
-1
storageservicemanager/storageservicemanagermainwindow.cpp
storageservicemanager/storageservicemanagermainwindow.cpp
+1
-0
storageservicemanager/storageservicetreewidget.cpp
storageservicemanager/storageservicetreewidget.cpp
+0
-1
No files found.
agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
View file @
e5563d54
...
...
@@ -10,7 +10,7 @@ Comment[el]=Πράκτορας υπενθύμισης συνέχισης επι
Comment[en_GB]=Followup reminder agent
Comment[es]=Seguimiento de agente de recordatorio
Comment[et]=Vastamise meeldetuletuse agent
Comment[fi]=Vastaamisesta muistuttaja
Comment[fi]=Vastaamise
n seuranna
sta muistuttaja
Comment[fr]=Agent de rappel des messages suivis
Comment[gl]=Axente de lembranzas de seguimento
Comment[hu]=Nyomkövető emlékeztető ügynök
...
...
agents/followupreminderagent/followupreminder.desktop
View file @
e5563d54
...
...
@@ -9,7 +9,7 @@ Name[el]=Πράκτορας υπενθύμισης συνέχισης επικο
Name[en_GB]=Followup Reminder Agent
Name[es]=Seguimiento de agente de recordatorio
Name[et]=Vastamise meeldetuletuse agent
Name[fi]=Vastaamisesta muistuttaja
Name[fi]=Vastaamise
n seuranna
sta muistuttaja
Name[fr]=Agent de rappel des messages suivis
Name[gl]=Axente de lembranzas de seguimento
Name[hu]=Nyomkövető emlékeztető ügynök
...
...
@@ -43,7 +43,7 @@ Comment[el]=Ο πράκτορας υπενθύμισης συνέχισης επ
Comment[en_GB]=Followup Reminder Agent allows to remind you when an email was not answered.
Comment[es]=El seguimiento de agente de recordatorio le permite recordar cuando no se ha respondido a un correo.
Comment[et]=Vastamise meeldetuletuse agent laseb meelde tuletada, kui sa pole kirjale vastust saanud.
Comment[fi]=Vastaamisesta muistuttaja voi muistuttaa sinua, kun sähköpostiin ei ole vastattu.
Comment[fi]=Vastaamise
n seuranna
sta muistuttaja voi muistuttaa sinua, kun sähköpostiin ei ole vastattu.
Comment[fr]=L'agent de rappel des messages suivis permet de se rappeler lorsqu'il n'y a pas eu de réponse à un courriel.
Comment[gl]=O Axente de lembranzas de seguimento permite lembrarlle cando non se respondeu a unha mensaxe de correo.
Comment[hu]=A Nyomkövető emlékeztető ügynök lehetővé teszi, hogy emlékeztesse önt, ha egy levél nem lett megválaszolva.
...
...
agents/followupreminderagent/followupreminderinfowidget.cpp
View file @
e5563d54
...
...
@@ -187,6 +187,7 @@ void FollowUpReminderInfoWidget::customContextMenuRequested(const QPoint &pos)
QAction
*
showMessage
=
0
;
if
(
mailItem
&&
mailItem
->
data
(
0
,
AnswerItemFound
).
toBool
())
{
showMessage
=
menu
.
addAction
(
i18n
(
"Show Message"
));
menu
.
addSeparator
();
}
QAction
*
deleteItem
=
menu
.
addAction
(
KIcon
(
QLatin1String
(
"edit-delete"
)),
i18n
(
"Delete"
));
QAction
*
result
=
menu
.
exec
(
QCursor
::
pos
());
...
...
agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
View file @
e5563d54
...
...
@@ -134,8 +134,10 @@ Action=Popup
Name=An error occurred during filtering
Name[ca]=S'ha detectat un error durant el filtratge
Name[de]=Beim Filtern ist ein Fehler aufgetreten
Name[en_GB]=An error occurred during filtering
Name[es]=Ocurrió un error durante el filtrado
Name[fi]=Suodattamisen aikana tapahtui virhe
Name[it]=Si è verificato un errore durante il filtraggio
Name[nl]=Er is een fout opgetreden bij het filteren
Name[pl]=Podczas filtrowania wystąpił błąd
Name[pt]=Ocorreu um erro durante a filtragem
...
...
calendarviews/eventview.h
View file @
e5563d54
...
...
@@ -435,12 +435,12 @@ class EVENTVIEWS_EXPORT EventView : public QWidget
/**
* Copy the incidence to the specified resource.
*/
void
copyIncidenceToResourceSignal
(
const
Akonadi
::
Item
&
,
const
QString
&
);
void
copyIncidenceToResourceSignal
(
const
Akonadi
::
Item
&
,
const
Akonadi
::
Collection
&
);
/**
* Move the incidence to the specified resource.
*/
void
moveIncidenceToResourceSignal
(
const
Akonadi
::
Item
&
,
const
QString
&
);
void
moveIncidenceToResourceSignal
(
const
Akonadi
::
Item
&
,
const
Akonadi
::
Collection
&
);
/** Dissociate from a recurring incidence the occurrence on the given
* date to a new incidence or dissociate all occurrences from the
...
...
examples/mailreader/mailreader.desktop
View file @
e5563d54
...
...
@@ -67,6 +67,7 @@ GenericName[ga]=Feidhmchlár KDE4
GenericName[gl]=Unha aplicación do KDE4
GenericName[hu]=KDE4-alkalmazás
GenericName[ia]=Un application de KDE 4
GenericName[it]=Un'applicazione KDE4
GenericName[ja]=KDE4 アプリケーション
GenericName[kk]=KDE4 қолданбасы
GenericName[km]=កម្មវិធីរបស់ KDE4
...
...
kalarm/Changelog
View file @
e5563d54
KAlarm Change Log
=== Version 2.10.12 --- 30 September 2014 ===
=== Version 2.10.12
(KDE 4.14.2)
--- 30 September 2014 ===
- Make New Audio Alarm dialogue use sound file repeat preference setting.
=== Version 2.10.11 (KDE 4.14.0) --- 12 August 2014 ===
...
...
kmail/CMakeLists.txt
View file @
e5563d54
...
...
@@ -186,6 +186,7 @@ if (KDEPIM_BUILD_DESKTOP)
util.cpp
messageactions.cpp
foldershortcutactionmanager.cpp
kmconfigureagent.cpp
${
kmailprivate_attributes_LIB_SRCS
}
${
kmailprivate_tag_LIB_SRCS
}
${
kmailprivate_job_LIB_SRCS
}
...
...
@@ -231,6 +232,10 @@ if (KDEPIM_BUILD_DESKTOP)
${
CMAKE_SOURCE_DIR
}
/kmail/dbusinterface/org.freedesktop.Akonadi.NewMailNotifier.xml
)
qt4_add_dbus_interfaces
(
kmailprivate_LIB_SRCS
${
CMAKE_SOURCE_DIR
}
/agents/followupreminderagent/org.freedesktop.Akonadi.FollowUpReminder.xml
)
kde4_add_ui_files
(
kmailprivate_LIB_SRCS
ui/composercryptoconfiguration.ui
...
...
kmail/editor/composer.h
View file @
e5563d54
...
...
@@ -46,8 +46,6 @@ public:
HDR_FROM
=
0x01
,
HDR_REPLY_TO
=
0x02
,
HDR_SUBJECT
=
0x20
,
HDR_NEWSGROUPS
=
0x40
,
HDR_FOLLOWUP_TO
=
0x80
,
HDR_IDENTITY
=
0x100
,
HDR_TRANSPORT
=
0x200
,
HDR_FCC
=
0x400
,
...
...
kmail/editor/kmcomposewin.cpp
View file @
e5563d54
...
...
@@ -226,6 +226,7 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
mLabelWidth
(
0
),
mComposerBase
(
0
),
mSelectSpecialChar
(
0
),
m_verifyMissingAttachment
(
0
),
mPreventFccOverwrite
(
false
),
mCheckForForgottenAttachments
(
true
),
mIgnoreStickyFields
(
false
),
...
...
@@ -237,7 +238,6 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
mStatusBarLabelToggledOverrideMode
(
0
),
mStatusBarLabelSpellCheckingChangeMode
(
0
)
{
m_verifyMissingAttachment
=
0
;
mComposerBase
=
new
MessageComposer
::
ComposerViewBase
(
this
,
this
);
mComposerBase
->
setIdentityManager
(
kmkernel
->
identityManager
()
);
...
...
@@ -424,13 +424,13 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
mAttachmentMissing
=
new
AttachmentMissingWarning
(
this
);
connect
(
mAttachmentMissing
,
SIGNAL
(
attachMissingFile
()),
this
,
SLOT
(
slotAttachMissingFile
()));
connect
(
mAttachmentMissing
,
SIGNAL
(
closeAttachMissingFile
()),
this
,
SLOT
(
slotCloseAttachMissingFile
()));
connect
(
mAttachmentMissing
,
SIGNAL
(
explicitClosedMissingAttachment
()),
this
,
SLOT
(
slotExplicitClosedMissingAttachment
()));
v
->
addWidget
(
mAttachmentMissing
);
if
(
GlobalSettings
::
self
()
->
showForgottenAttachmentWarning
())
{
m_verifyMissingAttachment
=
new
QTimer
(
this
);
m_verifyMissingAttachment
->
start
(
1000
*
5
);
m_verifyMissingAttachment
->
setSingleShot
(
true
);
m_verifyMissingAttachment
->
setInterval
(
1000
*
5
);
connect
(
m_verifyMissingAttachment
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
slotVerifyMissingAttachmentTimeout
())
);
}
connect
(
attachmentController
,
SIGNAL
(
fileAttached
()),
mAttachmentMissing
,
SLOT
(
slotFileAttached
())
);
...
...
@@ -524,6 +524,9 @@ void KMComposeWin::slotEditorTextChanged()
mFindNextText
->
setEnabled
(
textIsNotEmpty
);
mReplaceText
->
setEnabled
(
textIsNotEmpty
);
mSelectAll
->
setEnabled
(
textIsNotEmpty
);
if
(
m_verifyMissingAttachment
&&
!
m_verifyMissingAttachment
->
isActive
())
{
m_verifyMissingAttachment
->
start
();
}
}
//-----------------------------------------------------------------------------
...
...
@@ -3567,19 +3570,10 @@ void KMComposeWin::slotAttachMissingFile()
mComposerBase
->
attachmentController
()
->
showAddAttachmentDialog
();
}
void
KMComposeWin
::
slotCloseAttachMissingFile
()
{
if
(
m_verifyMissingAttachment
)
{
m_verifyMissingAttachment
->
start
();
}
}
void
KMComposeWin
::
slotVerifyMissingAttachmentTimeout
()
{
if
(
mComposerBase
->
hasMissingAttachments
(
GlobalSettings
::
self
()
->
attachmentKeywords
()
))
{
mAttachmentMissing
->
animatedShow
();
}
else
{
m_verifyMissingAttachment
->
start
();
}
}
...
...
kmail/editor/kmcomposewin.h
View file @
e5563d54
...
...
@@ -438,7 +438,6 @@ private slots:
void
slotCreateAddressBookContact
();
void
slotAttachMissingFile
();
void
slotCloseAttachMissingFile
();
void
slotExplicitClosedMissingAttachment
();
void
slotVerifyMissingAttachmentTimeout
();
void
slotCheckSendNow
();
...
...
kmail/kmail_part.rc
View file @
e5563d54
...
...
@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
<kpartgui version="50
0
" name="kmmainwin" >
<kpartgui version="50
1
" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
...
...
@@ -32,6 +32,7 @@
<Action name="send_queued" />
<Action name="send_queued_via" />
<Action name="message_delayed"/>
<Action name="followup_reminder_messages"/>
<Separator/>
<Action name="file_quit" />
</Menu>
...
...
kmail/kmconfigureagent.cpp
0 → 100644
View file @
e5563d54
/*
Copyright (c) 2014 Montel Laurent <montel@kde.org>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "kmconfigureagent.h"
#include <KMessageBox>
#include <KLocalizedString>
#include "archivemailagentinterface.h"
#include "sendlateragentinterface.h"
#include "followupreminderinterface.h"
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
KMConfigureAgent
::
KMConfigureAgent
(
QWidget
*
parentWidget
,
QObject
*
parent
)
:
QObject
(
parent
),
mParentWidget
(
parentWidget
)
{
}
KMConfigureAgent
::~
KMConfigureAgent
()
{
}
void
KMConfigureAgent
::
slotConfigureAutomaticArchiving
()
{
OrgFreedesktopAkonadiArchiveMailAgentInterface
archiveMailInterface
(
QLatin1String
(
"org.freedesktop.Akonadi.ArchiveMailAgent"
),
QLatin1String
(
"/ArchiveMailAgent"
),
QDBusConnection
::
sessionBus
(),
this
);
if
(
archiveMailInterface
.
isValid
())
{
archiveMailInterface
.
showConfigureDialog
(
(
qlonglong
)
mParentWidget
->
winId
()
);
}
else
{
KMessageBox
::
error
(
mParentWidget
,
i18n
(
"Archive Mail Agent was not registered."
));
}
}
void
KMConfigureAgent
::
slotConfigureSendLater
()
{
OrgFreedesktopAkonadiSendLaterAgentInterface
sendLaterInterface
(
QLatin1String
(
"org.freedesktop.Akonadi.SendLaterAgent"
),
QLatin1String
(
"/SendLaterAgent"
),
QDBusConnection
::
sessionBus
(),
this
);
if
(
sendLaterInterface
.
isValid
())
{
sendLaterInterface
.
showConfigureDialog
(
(
qlonglong
)
mParentWidget
->
winId
()
);
}
else
{
KMessageBox
::
error
(
mParentWidget
,
i18n
(
"Send Later Agent was not registered."
));
}
}
void
KMConfigureAgent
::
slotConfigureFollowupReminder
()
{
OrgFreedesktopAkonadiFollowUpReminderAgentInterface
followUpInterface
(
QLatin1String
(
"org.freedesktop.Akonadi.FollowUpReminder"
),
QLatin1String
(
"/FollowUpReminder"
),
QDBusConnection
::
sessionBus
(),
this
);
if
(
followUpInterface
.
isValid
())
{
followUpInterface
.
showConfigureDialog
(
(
qlonglong
)
mParentWidget
->
winId
()
);
}
else
{
KMessageBox
::
error
(
mParentWidget
,
i18n
(
"Followup Reminder Agent was not registered."
));
}
}
kmail/kmconfigureagent.h
0 → 100644
View file @
e5563d54
/*
Copyright (c) 2014 Montel Laurent <montel@kde.org>
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef KMCONFIGUREAGENT_H
#define KMCONFIGUREAGENT_H
#include <QObject>
class
KMConfigureAgent
:
public
QObject
{
Q_OBJECT
public:
explicit
KMConfigureAgent
(
QWidget
*
parentWidget
,
QObject
*
parent
=
0
);
~
KMConfigureAgent
();
public
Q_SLOTS
:
void
slotConfigureSendLater
();
void
slotConfigureAutomaticArchiving
();
void
slotConfigureFollowupReminder
();
private:
QWidget
*
mParentWidget
;
};
#endif // KMCONFIGUREAGENT_H
kmail/kmmainwidget.cpp
View file @
e5563d54
...
...
@@ -53,9 +53,7 @@ using KSieveUi::SieveDebugDialog;
#include "collectionpage/collectionviewpage.h"
#include "collectionpage/collectionmailinglistpage.h"
#include "tag/tagselectdialog.h"
#include "archivemailagentinterface.h"
#include "job/createnewcontactjob.h"
#include "sendlateragentinterface.h"
#include "folderarchive/folderarchiveutil.h"
#include "folderarchive/folderarchivemanager.h"
...
...
@@ -97,7 +95,7 @@ using KSieveUi::SieveDebugDialog;
#include "widgets/displaymessageformatactionmenu.h"
#include "ksieveui/vacation/vacationmanager.h"
#include "kmconfigureagent.h"
// LIBKDEPIM includes
#include "progresswidget/progressmanager.h"
...
...
@@ -196,7 +194,6 @@ using KSieveUi::SieveDebugDialog;
#include <QDBusPendingCallWatcher>
// System includes
#include <assert.h>
#include <errno.h> // ugh
#include <akonadi/standardactionmanager.h>
#include <job/removeduplicatemailjob.h>
...
...
@@ -238,6 +235,7 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
mFolderDisplayFormatPreference
(
MessageViewer
::
Viewer
::
UseGlobalSetting
),
mSearchMessages
(
0
)
{
mConfigAgent
=
new
KMConfigureAgent
(
this
,
this
);
// must be the first line of the constructor:
mStartupDone
=
false
;
mWasEverShown
=
false
;
...
...
@@ -611,8 +609,8 @@ void KMMainWidget::writeFolderConfig()
void
KMMainWidget
::
layoutSplitters
()
{
// This function can only be called when the old splitters are already deleted
assert
(
!
mSplitter1
);
assert
(
!
mSplitter2
);
Q_ASSERT
(
!
mSplitter1
);
Q_ASSERT
(
!
mSplitter2
);
// For some reason, this is necessary here so that the copy action still
// works after changing the folder layout.
...
...
@@ -3094,13 +3092,19 @@ void KMMainWidget::setupActions()
{
KAction
*
action
=
new
KAction
(
i18n
(
"&Configure Automatic Archiving..."
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"tools_automatic_archiving"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotConfigureAutomaticArchiving
()));
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mConfigAgent
,
SLOT
(
slotConfigureAutomaticArchiving
()));
}
{
KAction
*
action
=
new
KAction
(
i18n
(
"Delayed Messages..."
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"message_delayed"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
SLOT
(
slotConfigureSendLater
()));
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mConfigAgent
,
SLOT
(
slotConfigureSendLater
()));
}
{
KAction
*
action
=
new
KAction
(
i18n
(
"Followup Reminder Messages..."
),
this
);
actionCollection
()
->
addAction
(
QLatin1String
(
"followup_reminder_messages"
),
action
);
connect
(
action
,
SIGNAL
(
triggered
(
bool
)),
mConfigAgent
,
SLOT
(
slotConfigureFollowupReminder
()));
}
...
...
@@ -4730,26 +4734,6 @@ void KMMainWidget::savePaneSelection()
}
}
void
KMMainWidget
::
slotConfigureAutomaticArchiving
()
{
OrgFreedesktopAkonadiArchiveMailAgentInterface
archiveMailInterface
(
QLatin1String
(
"org.freedesktop.Akonadi.ArchiveMailAgent"
),
QLatin1String
(
"/ArchiveMailAgent"
),
QDBusConnection
::
sessionBus
(),
this
);
if
(
archiveMailInterface
.
isValid
())
{
archiveMailInterface
.
showConfigureDialog
(
(
qlonglong
)
winId
()
);
}
else
{
KMessageBox
::
error
(
this
,
i18n
(
"Archive Mail Agent was not registered."
));
}
}
void
KMMainWidget
::
slotConfigureSendLater
()
{
OrgFreedesktopAkonadiSendLaterAgentInterface
sendLaterInterface
(
QLatin1String
(
"org.freedesktop.Akonadi.SendLaterAgent"
),
QLatin1String
(
"/SendLaterAgent"
),
QDBusConnection
::
sessionBus
(),
this
);
if
(
sendLaterInterface
.
isValid
())
{
sendLaterInterface
.
showConfigureDialog
(
(
qlonglong
)
winId
()
);
}
else
{
KMessageBox
::
error
(
this
,
i18n
(
"Send Later Agent was not registered."
));
}
}
void
KMMainWidget
::
updatePaneTagComboBox
()
{
if
(
mMessagePane
)
{
...
...
kmail/kmmainwidget.h
View file @
e5563d54
...
...
@@ -48,7 +48,7 @@ class Message;
class
KUrl
;
class
QVBoxLayout
;
class
QSplitter
;
class
KMConfigureAgent
;
class
DisplayMessageFormatActionMenu
;
class
QMenu
;
class
KAction
;
...
...
@@ -426,11 +426,9 @@ protected slots:
void
slotCollectionChanged
(
const
Akonadi
::
Collection
&
,
const
QSet
<
QByteArray
>&
);
void
slotCreateNewTab
(
bool
);
void
slotUpdateActionsAfterMailChecking
();
void
slotConfigureAutomaticArchiving
();
void
slotExportData
();
void
slotCreateAddressBookContact
();
void
slotOpenRecentMsg
(
const
KUrl
&
url
);
void
slotConfigureSendLater
();
private:
void
checkAkonadiServerManagerState
();
...
...
@@ -629,6 +627,7 @@ private:
DisplayMessageFormatActionMenu
*
mDisplayMessageFormatMenu
;
MessageViewer
::
Viewer
::
DisplayFormatMessage
mFolderDisplayFormatPreference
;
KAction
*
mSearchMessages
;
KMConfigureAgent
*
mConfigAgent
;
};
#endif
...
...
kmail/kmmainwin.rc
View file @
e5563d54
...
...
@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE kpartgui>
<kpartgui version="50
0
" name="kmmainwin" >
<kpartgui version="50
1
" name="kmmainwin" >
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&File</text>
...
...
@@ -32,6 +32,7 @@
<Action name="send_queued" />
<Action name="send_queued_via" />
<Action name="message_delayed"/>
<Action name="followup_reminder_messages"/>
<Separator/>
<Action name="file_quit" />
</Menu>
...
...
kmail/kmstartup.cpp
View file @
e5563d54
...
...
@@ -106,7 +106,8 @@ void insertLibraryCataloguesAndIcons() {
KLocale
*
l
=
KGlobal
::
locale
();
KIconLoader
*
il
=
KIconLoader
::
global
();
for
(
unsigned
int
i
=
0
;
i
<
sizeof
catalogs
/
sizeof
*
catalogs
;
++
i
)
{
unsigned
int
catalogSize
=
(
sizeof
catalogs
/
sizeof
*
catalogs
);
for
(
unsigned
int
i
=
0
;
i
<
catalogSize
;
++
i
)
{
l
->
insertCatalog
(
QLatin1String
(
catalogs
[
i
])
);
il
->
addAppDir
(
QLatin1String
(
catalogs
[
i
])
);
}
...
...
kmail/kmstartup.h
View file @
e5563d54
...
...
@@ -20,12 +20,6 @@
#include "kmail_export.h"
extern
"C"
{
KMAIL_EXPORT
void
kmsetSignalHandler
(
void
(
*
handler
)(
int
)
);
KMAIL_EXPORT
void
kmsignalHandler
(
int
sigId
);
KMAIL_EXPORT
void
kmcrashHandler
(
int
sigId
);
}
namespace
KMail
{
KMAIL_EXPORT
void
checkConfigUpdates
();
KMAIL_EXPORT
void
insertLibraryCataloguesAndIcons
();
...
...
kmail/util.cpp
View file @
e5563d54
...
...
@@ -223,16 +223,6 @@ QColor KMail::Util::quoteL3Color()
}
void
KMail
::
Util
::
reduceQuery
(
QString
&
query
)
{
QRegExp
rx
(
QLatin1String
(
"<[
\\
w]+://[
\\
w
\\
d-_.]+(/[
\\
d
\\
w/-._]+/)*([
\\
w
\\
d-._]+)#([
\\
w
\\
d]+)>"
));
query
.
replace
(
rx
,
QLatin1String
(
"
\\
2:
\\
3"
));
query
.
replace
(
QLatin1String
(
"rdf-schema:"
),
QLatin1String
(
"rdfs:"
)
);
query
.
replace
(
QLatin1String
(
"22-rdf-syntax-ns:"
),
QLatin1String
(
"rdf:"
)
);
query
.
replace
(
QLatin1String
(
"XMLSchema:"
),
QLatin1String
(
"xsd:"
)
);
query
=
query
.
simplified
();
}
void
KMail
::
Util
::
migrateFromKMail1
()
{
// Akonadi migration
...
...
kmail/util.h
View file @
e5563d54
...
...
@@ -102,7 +102,6 @@ QColor misspelledColor();
QColor
quoteL1Color
();
QColor
quoteL2Color
();
QColor
quoteL3Color
();
void
reduceQuery
(
QString
&
query
);
void
migrateFromKMail1
();
}
}
...
...
knotes/data/knotes.notifyrc
deleted
100644 → 0
View file @
6305d1c6
[Global]
IconName=knotes
Comment=notes
Comment[bs]=bilješke
Comment[ca]=notes
Comment[ca@valencia]=notes
Comment[cs]=poznámky
Comment[da]=noter
Comment[de]=Notizen
Comment[el]=σημειώσεις
Comment[en_GB]=notes
Comment[es]=notas
Comment[et]=sedelid
Comment[fi]=muistiinpanot
Comment[fr]=Notes
Comment[gl]=notas
Comment[hu]=jegyzetek
Comment[ia]=notas
Comment[it]=note
Comment[nb]=notater
Comment[nds]=Notizen
Comment[nl]=notities
Comment[pl]=notatki
Comment[pt]=notas
Comment[pt_BR]=notas
Comment[ru]=Заметки
Comment[sk]=poznámky
Comment[sr]=Белешке
Comment[sr@ijekavian]=Белешке
Comment[sr@ijekavianlatin]=Beleške
Comment[sr@latin]=Beleške
Comment[sv]=anteckningar
Comment[tr]=notlar
Comment[uk]=нотатки
Comment[x-test]=xxnotesxx
Comment[zh_TW]=便條
[Event/receivednote]
Name=Received note
Name[bs]=Primljena bilješka
Name[ca]=S'ha rebut una nota
Name[ca@valencia]=S'ha rebut una nota
Name[da]=Modtog en note
Name[de]=Erhaltene Notiz
Name[el]=Σημείωση λήφθηκε
Name[en_GB]=Received note
Name[es]=Nota recibida
Name[et]=Saadi sedel
Name[fi]=Muistiinpano vastaanotettu
Name[fr]=Notes reçues
Name[gl]=Nota recibida
Name[hu]=Fogadott jegyzet
Name[ia]=Nota recipite
Name[it]=Nota ricevuta
Name[nb]=Mottatt notat
Name[nds]=Notiz kregen
Name[nl]=Ontvangen notitie
Name[pl]=Otrzymana notatka
Name[pt]=Nota recebida
Name[pt_BR]=Nota recebida
Name[ru]=Получена заметка
Name[sk]=Prijatá poznámka
Name[sr]=Примљена белешка
Name[sr@ijekavian]=Примљена белешка
Name[sr@ijekavianlatin]=Primljena beleška
Name[sr@latin]=Primljena beleška
Name[sv]=Mottagen anteckning
Name[tr]=Alınan not
Name[uk]=Отримано нотатку
Name[x-test]=xxReceived notexx
Name[zh_TW]=接收到便條
Action=Popup
korganizer/README
deleted
100644 → 0
View file @
6305d1c6
+-----------------------+
| K O R G A N I Z E R |
+-----------------------+
version 3.3 pre
http://korganizer.kde.org
Next release: KDEPIM-3.3 (something like May 2004)
QUICK NOTES ON WHAT'S NEW IN THE DIFFERENT VERSIONS:
* Official 3.2 release (January 2004)
- New Features:
- Support for multiple calendars and todo lists. Korganizer can now
transparently merge calendar data from different files or other calendar
data sources for example calendars on the web. They can conveniently
activated, deactivated, added and removed from the graphical user
interface.
- Kontact integration. KOrganizer now is fully integrated with Kontact, the
complete KDE personal information management application. Within Kontact
some additional features are available like conversion of mails to events