Skip to content
GitLab
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
73a9e145
Commit
73a9e145
authored
Feb 23, 2022
by
David Jarvie
Browse files
Tidy
parent
0a7bc059
Pipeline
#141273
passed with stage
in 1 minute and 34 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
73a9e145
...
...
@@ -112,10 +112,10 @@ if (NOT APPLE)
endif
()
if
(
X11_FOUND
)
if
(
QT_MAJOR_VERSION STREQUAL
"5"
)
find_package
(
Qt5X11Extras
${
QT_REQUIRED_VERSION
}
REQUIRED NO_MODULE
)
find_package
(
Qt5X11Extras
${
QT_REQUIRED_VERSION
}
REQUIRED NO_MODULE
)
else
()
#TODO
endif
()
#TODO
X11 on Qt6
endif
()
endif
()
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
src/appicons/CMakeLists.txt
View file @
73a9e145
ecm_install_icons
(
ICONS 128-apps-kalarm.png 16-apps-kalarm.png 22-apps-kalarm.png 32-apps-kalarm.png 48-apps-kalarm.png 64-apps-kalarm.png DESTINATION
${
KDE_INSTALL_ICONDIR
}
THEME hicolor
)
ecm_install_icons
(
ICONS
128-apps-kalarm.png
16-apps-kalarm.png
22-apps-kalarm.png
32-apps-kalarm.png
48-apps-kalarm.png
64-apps-kalarm.png
DESTINATION
${
KDE_INSTALL_ICONDIR
}
THEME hicolor
)
src/autostart/CMakeLists.txt
View file @
73a9e145
...
...
@@ -6,11 +6,14 @@ set(kalarmautostart_SRCS
autostart.cpp
)
ecm_qt_declare_logging_category
(
kalarmautostart_SRCS HEADER kalarm_autostart_debug.h IDENTIFIER KALARMAUTOSTART_LOG CATEGORY_NAME org.kde.pim.autostart_kalarm
DESCRIPTION
"kalarm (autostart_kalarm)"
OLD_CATEGORY_NAMES log_autostart_kalarm
EXPORT KALARM
)
ecm_qt_declare_logging_category
(
kalarmautostart_SRCS
HEADER kalarm_autostart_debug.h
IDENTIFIER KALARMAUTOSTART_LOG
CATEGORY_NAME org.kde.pim.autostart_kalarm
DESCRIPTION
"kalarm (autostart_kalarm)"
OLD_CATEGORY_NAMES log_autostart_kalarm
EXPORT KALARM
)
file
(
GLOB ICONS_SRCS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../appicons/*-apps-kalarm.png"
)
...
...
src/data/org.kde.kalarm.desktop
View file @
73a9e145
...
...
@@ -110,7 +110,7 @@ GenericName[lt]=Asmeninių žinučių-priminimų planuoklis
GenericName[lv]=Personīgais atgādinājumu plānotājs
GenericName[mk]=Закажување лични аларми
GenericName[mr]=वैयक्तिक एलार्म नियोजक
GenericName[ms]=Penjadual Penggera Peribadi
GenericName[ms]=Penjadual Penggera Peribadi
GenericName[nb]=Personlig varslingsplanlegger
GenericName[nds]=Persöönlich Anstöötgever
GenericName[ne]=व्यक्तिगत संसूचक अनुसूचक
...
...
src/datepicker.cpp
View file @
73a9e145
...
...
@@ -125,7 +125,7 @@ DatePicker::DatePicker(QWidget* parent)
connect
(
mDayMatrix
,
&
DayMatrix
::
newAlarmFromTemplate
,
this
,
&
DatePicker
::
slotNewAlarmFromTemplate
);
// Initialise the display.
mMonthShown
.
setDate
(
currentDate
.
year
(),
currentDate
.
month
(),
1
);
mMonthShown
.
setDate
(
currentDate
.
year
(),
currentDate
.
month
(),
1
);
newMonthShown
();
updateDisplay
();
...
...
@@ -210,7 +210,7 @@ void DatePicker::nextMonthClicked()
void
DatePicker
::
updateToday
()
{
const
QDate
currentDate
=
KADateTime
::
currentDateTime
(
Preferences
::
timeSpec
()).
date
();
const
QDate
monthToShow
(
currentDate
.
year
(),
currentDate
.
month
(),
1
);
const
QDate
monthToShow
(
currentDate
.
year
(),
currentDate
.
month
(),
1
);
if
(
monthToShow
>
mMonthShown
)
{
mMonthShown
=
monthToShow
;
...
...
src/messagenotification.cpp
View file @
73a9e145
...
...
@@ -76,7 +76,7 @@ public:
connect
(
qApp
,
&
QGuiApplication
::
saveStateRequest
,
this
,
&
MNSessionManager
::
saveState
);
#endif
}
~
MNSessionManager
()
override
{}
~
MNSessionManager
()
override
{}
static
void
create
()
{
...
...
src/pixmaps/CMakeLists.txt
View file @
73a9e145
ecm_install_icons
(
ICONS
16-actions-document-new-from-template.png 16-actions-new-command-alarm.png 22-actions-kalarm-disabled.png 22-actions-kalarm.png 22-actions-new-command-alarm.png
16-actions-new-audio-alarm.png 22-actions-document-new-from-template.png 22-actions-kalarm-partdisabled.png 22-actions-new-audio-alarm.png
DESTINATION
${
KDE_INSTALL_DATADIR
}
/kalarm/icons THEME oxygen
)
ecm_install_icons
(
ICONS
16-actions-document-new-from-template.png
16-actions-new-command-alarm.png
22-actions-kalarm-disabled.png
22-actions-kalarm.png
22-actions-new-command-alarm.png
16-actions-new-audio-alarm.png
22-actions-document-new-from-template.png
22-actions-kalarm-partdisabled.png
22-actions-new-audio-alarm.png
DESTINATION
${
KDE_INSTALL_DATADIR
}
/kalarm/icons
THEME oxygen
)
src/resources/singlefileresource.cpp
View file @
73a9e145
...
...
@@ -270,7 +270,6 @@ int SingleFileResource::doLoad(QHash<QString, KAEvent>& newEvents, bool readThro
mDownloadJob
->
setProperty
(
"QEventLoopLocker"
,
QVariant
::
fromValue
(
ref
));
connect
(
mDownloadJob
,
&
KJob
::
result
,
this
,
&
SingleFileResource
::
slotDownloadJobResult
);
// connect(mDownloadJob, SIGNAL(percent(KJob*,ulong)), SLOT(handleProgress(KJob*,ulong)));
setStatus
(
Status
::
Loading
);
return
0
;
// loading initiated
}
...
...
@@ -389,7 +388,6 @@ int SingleFileResource::doSave(bool writeThroughCache, bool force, QString& erro
mUploadJob
->
setProperty
(
"QEventLoopLocker"
,
QVariant
::
fromValue
(
ref
));
connect
(
mUploadJob
,
&
KJob
::
result
,
this
,
&
SingleFileResource
::
slotUploadJobResult
);
// connect(mUploadJob, SIGNAL(percent(KJob*,ulong)), SLOT(handleProgress(KJob*,ulong)));
setStatus
(
Status
::
Saving
);
return
0
;
}
...
...
@@ -427,9 +425,9 @@ void SingleFileResource::close()
mDownloadJob
->
kill
();
save
(
nullptr
,
true
);
// write through cache
// If a remote file upload job has been started, the use of
//
QEventLoopLocker
should ensure that it continues to completion even if
//
the
destructor for this instance is executed.
// If a remote file upload job has been started, the use of
QEventLoopLocker
//
in doSave()
should ensure that it continues to completion even if
the
// destructor for this instance is executed.
if
(
mSettings
&&
mSettings
->
url
().
isLocalFile
())
KDirWatch
::
self
()
->
removeFile
(
mSettings
->
url
().
toLocalFile
());
...
...
@@ -679,7 +677,7 @@ QByteArray SingleFileResource::calculateHash(const QString& fileName) const
{
if
(
file
.
open
(
QIODevice
::
ReadOnly
))
{
const
qint64
blockSize
=
512
*
1024
;
//
R
ead blocks of 512K
const
qint64
blockSize
=
512
*
1024
;
//
r
ead blocks of 512K
QCryptographicHash
hash
(
QCryptographicHash
::
Md5
);
while
(
!
file
.
atEnd
())
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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