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
KAlarm
Commits
460d45e0
Commit
460d45e0
authored
Nov 12, 2014
by
Laurent Montel
😁
Browse files
not necessary
parent
bf3bf166
Changes
6
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
460d45e0
...
...
@@ -115,9 +115,7 @@ ki18n_wrap_ui(kalarm_bin_SRCS
)
qt5_add_dbus_adaptor
(
kalarm_bin_SRCS org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler
)
if
(
KMAIL_SUPPORTED
)
qt5_add_dbus_interfaces
(
kalarm_bin_SRCS
${
CMAKE_BINARY_DIR
}
/kmail/org.kde.kmail.kmail.xml
)
endif
()
qt5_add_dbus_interfaces
(
kalarm_bin_SRCS
${
CMAKE_BINARY_DIR
}
/kmail/org.kde.kmail.kmail.xml
)
#REACTIVATE qt5_add_dbus_interfaces(kalarm_bin_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
kcfg_generate_dbus_interface
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/kalarmresource.kcfg org.kde.Akonadi.KAlarm.Settings
)
...
...
@@ -135,9 +133,7 @@ kconfig_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc)
kde4_add_app_icon
(
kalarm_bin_SRCS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/appicons/ox*-app-kalarm.png"
)
add_executable
(
kalarm_bin
${
kalarm_bin_SRCS
}
)
add_dependencies
(
kalarm_bin kalarm_resource_xml kalarmdir_resource_xml
)
if
(
KMAIL_SUPPORTED
)
add_dependencies
(
kalarm_bin kmail_xml
)
endif
()
add_dependencies
(
kalarm_bin kmail_xml
)
set_target_properties
(
kalarm_bin PROPERTIES OUTPUT_NAME kalarm
)
...
...
kamail.cpp
View file @
460d45e0
...
...
@@ -61,12 +61,10 @@
#include <pwd.h>
#ifdef KMAIL_SUPPORTED
#include "kmailinterface.h"
static
const
QLatin1String
KMAIL_DBUS_SERVICE
(
"org.kde.kmail"
);
//static const QLatin1String KMAIL_DBUS_PATH("/KMail");
#endif
namespace
HeaderParsing
{
...
...
@@ -615,7 +613,6 @@ QStringList KAMail::errors(const QString& err, ErrType prefix)
return
errs
;
}
#ifdef KMAIL_SUPPORTED
/******************************************************************************
* Get the body of an email from KMail, given its serial number.
*/
...
...
@@ -635,7 +632,6 @@ QString KAMail::getMailBody(quint32 serialNumber)
}
return
reply
.
value
();
}
#endif
/******************************************************************************
* Extract the pure addresses from given email addresses.
...
...
kamail.h
View file @
460d45e0
...
...
@@ -66,9 +66,7 @@ class KAMail : public QObject
static
QString
convertAddresses
(
const
QString
&
addresses
,
KCalCore
::
Person
::
List
&
);
static
QString
convertAttachments
(
const
QString
&
attachments
,
QStringList
&
list
);
static
QString
controlCentreAddress
();
#ifdef KMAIL_SUPPORTED
static
QString
getMailBody
(
quint32
serialNumber
);
#endif
static
QString
i18n_NeedFromEmailAddress
();
static
QString
i18n_sent_mail
();
...
...
mainwindow.cpp
View file @
460d45e0
...
...
@@ -1297,7 +1297,6 @@ void MainWindow::executeDropEvent(MainWindow* win, QDropEvent* e)
getMailHeader
(
"Subject"
,
content
),
body
,
sernum
);
}
#ifdef KMAIL_SUPPORTED
else
if
(
KPIM
::
MailList
::
canDecode
(
data
))
{
mailList
=
KPIM
::
MailList
::
fromMimeData
(
data
);
...
...
@@ -1313,7 +1312,6 @@ void MainWindow::executeDropEvent(MainWindow* win, QDropEvent* e)
KLocale
::
global
()
->
formatDateTime
(
dt
),
summary
.
subject
(),
body
,
summary
.
serialNumber
());
}
#endif
else
if
(
ICalDrag
::
fromMimeData
(
data
,
calendar
))
{
// iCalendar - If events are included, use the first event
...
...
messagewin.cpp
View file @
460d45e0
...
...
@@ -96,11 +96,9 @@ static FullScreenType haveFullScreenWindow(int screen);
static
FullScreenType
findFullScreenWindows
(
const
QVector
<
QRect
>&
screenRects
,
QVector
<
FullScreenType
>&
screenTypes
);
#endif
#ifdef KMAIL_SUPPORTED
#include "kmailinterface.h"
static
const
QLatin1String
KMAIL_DBUS_SERVICE
(
"org.kde.kmail"
);
static
const
QLatin1String
KMAIL_DBUS_PATH
(
"/KMail"
);
#endif
// The delay for enabling message window buttons if a zero delay is
// configured, i.e. the windows are placed far from the cursor.
...
...
@@ -182,11 +180,7 @@ MessageWin::MessageWin(const KAEvent* event, const KAAlarm& alarm, int flags)
mDefaultDeferMinutes
(
event
->
deferDefaultMinutes
()),
mAlarmType
(
alarm
.
type
()),
mAction
(
event
->
actionSubType
()),
#ifdef KMAIL_SUPPORTED
mKMailSerialNumber
(
event
->
kmailSerialNumber
()),
#else
mKMailSerialNumber
(
0
),
#endif
mCommandError
(
event
->
commandError
()),
mRestoreHeight
(
0
),
mAudioRepeatPause
(
event
->
repeatSoundPause
()),
...
...
@@ -2011,7 +2005,6 @@ void MessageWin::slotOk()
close
();
}
#ifdef KMAIL_SUPPORTED
/******************************************************************************
* Called when the KMail button is clicked.
* Tells KMail to display the email message displayed in this message window.
...
...
@@ -2034,7 +2027,6 @@ void MessageWin::slotShowKMailMessage()
else
if
(
!
reply
.
value
())
KAMessageBox
::
sorry
(
this
,
xi18nc
(
"@info"
,
"Unable to locate this email in <application>KMail</application>"
));
}
#endif
/******************************************************************************
* Called when the Edit... button is clicked.
...
...
messagewin.h
View file @
460d45e0
...
...
@@ -108,9 +108,7 @@ class MessageWin : public MainWindowBase
void
checkDeferralLimit
();
void
displayMainWindow
();
void
showRestoredAlarm
();
#ifdef KMAIL_SUPPORTED
void
slotShowKMailMessage
();
#endif
void
slotSpeak
();
void
audioTerminating
();
void
startAudio
();
...
...
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