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
KOrganizer
Commits
dc22b577
Commit
dc22b577
authored
Jul 16, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split koprefsdialoggroupwarescheduling
parent
056bae88
Pipeline
#27387
passed with stage
in 15 minutes and 27 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
220 additions
and
154 deletions
+220
-154
src/CMakeLists.txt
src/CMakeLists.txt
+1
-0
src/prefs/koprefsdialog.cpp
src/prefs/koprefsdialog.cpp
+2
-135
src/prefs/koprefsdialog.h
src/prefs/koprefsdialog.h
+1
-19
src/prefs/koprefsdialoggroupwarescheduling.cpp
src/prefs/koprefsdialoggroupwarescheduling.cpp
+166
-0
src/prefs/koprefsdialoggroupwarescheduling.h
src/prefs/koprefsdialoggroupwarescheduling.h
+50
-0
No files found.
src/CMakeLists.txt
View file @
dc22b577
...
...
@@ -64,6 +64,7 @@ set(kcm_korganizer_PART_SRCS
prefs/koprefsuserfeedback.cpp
prefs/koprefsdesignerfields.cpp
prefs/koprefsdialogplugins.cpp
prefs/koprefsdialoggroupwarescheduling.cpp
korganizer_debug.cpp
prefs/koprefsdialog.cpp
widgets/kitemiconcheckcombo.cpp
...
...
src/prefs/koprefsdialog.cpp
View file @
dc22b577
...
...
@@ -28,7 +28,7 @@
#include "kocore.h"
#include "koglobals.h"
#include "koprefs.h"
#include "ui_kogroupwareprefspage.h"
#include <KTimeComboBox>
#include <CalendarSupport/KCalPrefs>
...
...
@@ -82,6 +82,7 @@
#include <QButtonGroup>
#include <QFontDialog>
#include <QCheckBox>
#include <QLineEdit>
KOPrefsDialogMain
::
KOPrefsDialogMain
(
QWidget
*
parent
)
:
KCModule
(
parent
)
...
...
@@ -1287,137 +1288,3 @@ Q_DECL_EXPORT KCModule *create_korganizerconfiggroupscheduling(QWidget *parent,
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
KOPrefsDialogGroupwareScheduling
::
KOPrefsDialogGroupwareScheduling
(
QWidget
*
parent
)
:
KCModule
(
parent
)
{
mGroupwarePage
=
new
Ui
::
KOGroupwarePrefsPage
();
QWidget
*
widget
=
new
QWidget
(
this
);
widget
->
setObjectName
(
QStringLiteral
(
"KOGrouparePrefsPage"
));
mGroupwarePage
->
setupUi
(
widget
);
mGroupwarePage
->
groupwareTab
->
setTabIcon
(
0
,
QIcon
::
fromTheme
(
QStringLiteral
(
"go-up"
)));
mGroupwarePage
->
groupwareTab
->
setTabIcon
(
1
,
QIcon
::
fromTheme
(
QStringLiteral
(
"go-down"
)));
// signals and slots connections
connect
(
mGroupwarePage
->
publishDays
,
qOverload
<
int
>
(
&
QSpinBox
::
valueChanged
),
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishUrl
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishUser
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishPassword
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishSavePassword
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveEnable
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveUser
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrievePassword
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveSavePassword
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveUrl
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishDelay
,
qOverload
<
int
>
(
&
QSpinBox
::
valueChanged
),
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
fullDomainRetrieval
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishEnable
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
(
new
QVBoxLayout
(
this
))
->
addWidget
(
widget
);
load
();
}
KOPrefsDialogGroupwareScheduling
::~
KOPrefsDialogGroupwareScheduling
()
{
delete
mGroupwarePage
;
}
void
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
()
{
Q_EMIT
changed
(
true
);
}
void
KOPrefsDialogGroupwareScheduling
::
load
()
{
mGroupwarePage
->
publishEnable
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishAuto
());
mGroupwarePage
->
publishDelay
->
setValue
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishDelay
());
mGroupwarePage
->
publishDays
->
setValue
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishDays
());
mGroupwarePage
->
publishUrl
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishUrl
());
mGroupwarePage
->
publishUser
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishUser
());
mGroupwarePage
->
publishPassword
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishPassword
());
mGroupwarePage
->
publishSavePassword
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishSavePassword
());
mGroupwarePage
->
retrieveEnable
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveAuto
());
mGroupwarePage
->
fullDomainRetrieval
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyFullDomainRetrieval
());
mGroupwarePage
->
retrieveUrl
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveUrl
());
mGroupwarePage
->
retrieveUser
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveUser
());
mGroupwarePage
->
retrievePassword
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrievePassword
());
mGroupwarePage
->
retrieveSavePassword
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveSavePassword
());
}
void
KOPrefsDialogGroupwareScheduling
::
save
()
{
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishAuto
(
mGroupwarePage
->
publishEnable
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishDelay
(
mGroupwarePage
->
publishDelay
->
value
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishDays
(
mGroupwarePage
->
publishDays
->
value
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishUrl
(
mGroupwarePage
->
publishUrl
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishUser
(
mGroupwarePage
->
publishUser
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishPassword
(
mGroupwarePage
->
publishPassword
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishSavePassword
(
mGroupwarePage
->
publishSavePassword
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveAuto
(
mGroupwarePage
->
retrieveEnable
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyFullDomainRetrieval
(
mGroupwarePage
->
fullDomainRetrieval
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveUrl
(
mGroupwarePage
->
retrieveUrl
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveUser
(
mGroupwarePage
->
retrieveUser
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrievePassword
(
mGroupwarePage
->
retrievePassword
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveSavePassword
(
mGroupwarePage
->
retrieveSavePassword
->
isChecked
());
// clear the url cache for our user
const
QString
configFile
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1String
(
"/korganizer/freebusyurls"
);
KConfig
cfg
(
configFile
);
cfg
.
deleteGroup
(
CalendarSupport
::
KCalPrefs
::
instance
()
->
email
());
Akonadi
::
CalendarSettings
::
self
()
->
save
();
}
extern
"C"
{
Q_DECL_EXPORT
KCModule
*
create_korganizerconfigfreebusy
(
QWidget
*
parent
,
const
char
*
)
{
return
new
KOPrefsDialogGroupwareScheduling
(
parent
);
}
}
src/prefs/koprefsdialog.h
View file @
dc22b577
...
...
@@ -36,9 +36,7 @@ class QCheckBox;
class
QGroupBox
;
class
QLineEdit
;
namespace
Ui
{
class
KOGroupwarePrefsPage
;
}
namespace
Akonadi
{
class
CollectionComboBox
;
...
...
@@ -144,21 +142,5 @@ private:
QCheckBox
*
mBccBox
=
nullptr
;
};
class
KOGroupwarePrefsPage
;
class
KCM_KORGANIZER_EXPORT
KOPrefsDialogGroupwareScheduling
:
public
KCModule
{
Q_OBJECT
public:
explicit
KOPrefsDialogGroupwareScheduling
(
QWidget
*
parent
);
~
KOPrefsDialogGroupwareScheduling
()
override
;
void
save
()
override
;
void
load
()
override
;
private:
void
slotConfigChanged
();
Ui
::
KOGroupwarePrefsPage
*
mGroupwarePage
=
nullptr
;
};
#endif
src/prefs/koprefsdialoggroupwarescheduling.cpp
0 → 100644
View file @
dc22b577
/*
This file is part of KOrganizer.
Copyright (c) 2000,2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
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.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
*/
#include "koprefsdialoggroupwarescheduling.h"
#include "ui_kogroupwareprefspage.h"
#include <akonadi/calendar/calendarsettings.h> //krazy:exclude=camelcase this is a generated file
#include <QIcon>
#include <QStandardPaths>
#include <QVBoxLayout>
#include <CalendarSupport/KCalPrefs>
KOPrefsDialogGroupwareScheduling
::
KOPrefsDialogGroupwareScheduling
(
QWidget
*
parent
)
:
KCModule
(
parent
)
{
mGroupwarePage
=
new
Ui
::
KOGroupwarePrefsPage
();
QWidget
*
widget
=
new
QWidget
(
this
);
widget
->
setObjectName
(
QStringLiteral
(
"KOGrouparePrefsPage"
));
mGroupwarePage
->
setupUi
(
widget
);
mGroupwarePage
->
groupwareTab
->
setTabIcon
(
0
,
QIcon
::
fromTheme
(
QStringLiteral
(
"go-up"
)));
mGroupwarePage
->
groupwareTab
->
setTabIcon
(
1
,
QIcon
::
fromTheme
(
QStringLiteral
(
"go-down"
)));
// signals and slots connections
connect
(
mGroupwarePage
->
publishDays
,
qOverload
<
int
>
(
&
QSpinBox
::
valueChanged
),
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishUrl
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishUser
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishPassword
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishSavePassword
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveEnable
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveUser
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrievePassword
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveSavePassword
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
retrieveUrl
,
&
QLineEdit
::
textChanged
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishDelay
,
qOverload
<
int
>
(
&
QSpinBox
::
valueChanged
),
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
fullDomainRetrieval
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
connect
(
mGroupwarePage
->
publishEnable
,
&
QCheckBox
::
toggled
,
this
,
&
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
);
(
new
QVBoxLayout
(
this
))
->
addWidget
(
widget
);
load
();
}
KOPrefsDialogGroupwareScheduling
::~
KOPrefsDialogGroupwareScheduling
()
{
delete
mGroupwarePage
;
}
void
KOPrefsDialogGroupwareScheduling
::
slotConfigChanged
()
{
Q_EMIT
changed
(
true
);
}
void
KOPrefsDialogGroupwareScheduling
::
load
()
{
mGroupwarePage
->
publishEnable
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishAuto
());
mGroupwarePage
->
publishDelay
->
setValue
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishDelay
());
mGroupwarePage
->
publishDays
->
setValue
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishDays
());
mGroupwarePage
->
publishUrl
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishUrl
());
mGroupwarePage
->
publishUser
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishUser
());
mGroupwarePage
->
publishPassword
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishPassword
());
mGroupwarePage
->
publishSavePassword
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyPublishSavePassword
());
mGroupwarePage
->
retrieveEnable
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveAuto
());
mGroupwarePage
->
fullDomainRetrieval
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyFullDomainRetrieval
());
mGroupwarePage
->
retrieveUrl
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveUrl
());
mGroupwarePage
->
retrieveUser
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveUser
());
mGroupwarePage
->
retrievePassword
->
setText
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrievePassword
());
mGroupwarePage
->
retrieveSavePassword
->
setChecked
(
Akonadi
::
CalendarSettings
::
self
()
->
freeBusyRetrieveSavePassword
());
}
void
KOPrefsDialogGroupwareScheduling
::
save
()
{
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishAuto
(
mGroupwarePage
->
publishEnable
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishDelay
(
mGroupwarePage
->
publishDelay
->
value
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishDays
(
mGroupwarePage
->
publishDays
->
value
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishUrl
(
mGroupwarePage
->
publishUrl
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishUser
(
mGroupwarePage
->
publishUser
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishPassword
(
mGroupwarePage
->
publishPassword
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyPublishSavePassword
(
mGroupwarePage
->
publishSavePassword
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveAuto
(
mGroupwarePage
->
retrieveEnable
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyFullDomainRetrieval
(
mGroupwarePage
->
fullDomainRetrieval
->
isChecked
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveUrl
(
mGroupwarePage
->
retrieveUrl
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveUser
(
mGroupwarePage
->
retrieveUser
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrievePassword
(
mGroupwarePage
->
retrievePassword
->
text
());
Akonadi
::
CalendarSettings
::
self
()
->
setFreeBusyRetrieveSavePassword
(
mGroupwarePage
->
retrieveSavePassword
->
isChecked
());
// clear the url cache for our user
const
QString
configFile
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1String
(
"/korganizer/freebusyurls"
);
KConfig
cfg
(
configFile
);
cfg
.
deleteGroup
(
CalendarSupport
::
KCalPrefs
::
instance
()
->
email
());
Akonadi
::
CalendarSettings
::
self
()
->
save
();
}
extern
"C"
{
Q_DECL_EXPORT
KCModule
*
create_korganizerconfigfreebusy
(
QWidget
*
parent
,
const
char
*
)
{
return
new
KOPrefsDialogGroupwareScheduling
(
parent
);
}
}
src/prefs/koprefsdialoggroupwarescheduling.h
0 → 100644
View file @
dc22b577
/*
This file is part of KOrganizer.
Copyright (c) 2000,2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
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.
As a special exception, permission is given to link this program
with any edition of Qt, and distribute the resulting executable,
without including the source code for Qt in the source distribution.
*/
#ifndef KOPREFSDIALOGGROUPWARESCHEDULING_H
#define KOPREFSDIALOGGROUPWARESCHEDULING_H
#include <KCModule>
#include "kcm_korganizer_export.h"
namespace
Ui
{
class
KOGroupwarePrefsPage
;
}
class
KOGroupwarePrefsPage
;
class
KCM_KORGANIZER_EXPORT
KOPrefsDialogGroupwareScheduling
:
public
KCModule
{
Q_OBJECT
public:
explicit
KOPrefsDialogGroupwareScheduling
(
QWidget
*
parent
);
~
KOPrefsDialogGroupwareScheduling
()
override
;
void
save
()
override
;
void
load
()
override
;
private:
void
slotConfigChanged
();
Ui
::
KOGroupwarePrefsPage
*
mGroupwarePage
=
nullptr
;
};
#endif // KOPREFSDIALOGGROUPWARESCHEDULING_H
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