Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Plasma
SDDM KCM
Commits
07aedf7e
Commit
07aedf7e
authored
May 15, 2018
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Warning--
parent
a2083bb2
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
25 additions
and
21 deletions
+25
-21
sddmthemeinstaller.cpp
sddmthemeinstaller.cpp
+2
-2
src/advanceconfig.h
src/advanceconfig.h
+1
-1
src/configwidgets/selectimagebutton.cpp
src/configwidgets/selectimagebutton.cpp
+1
-1
src/cursortheme/cursortheme.cpp
src/cursortheme/cursortheme.cpp
+3
-0
src/cursortheme/dummytheme.h
src/cursortheme/dummytheme.h
+1
-1
src/cursortheme/sortproxymodel.h
src/cursortheme/sortproxymodel.h
+2
-2
src/cursortheme/thememodel.cpp
src/cursortheme/thememodel.cpp
+2
-2
src/cursortheme/thememodel.h
src/cursortheme/thememodel.h
+2
-2
src/cursortheme/xcursortheme.h
src/cursortheme/xcursortheme.h
+1
-1
src/sddmkcm.h
src/sddmkcm.h
+1
-1
src/sessionmodel.cpp
src/sessionmodel.cpp
+1
-0
src/sessionmodel.h
src/sessionmodel.h
+2
-2
src/themeconfig.h
src/themeconfig.h
+1
-1
src/themesdelegate.h
src/themesdelegate.h
+1
-1
src/themesmodel.h
src/themesmodel.h
+2
-2
src/usersmodel.h
src/usersmodel.h
+2
-2
No files found.
sddmthemeinstaller.cpp
View file @
07aedf7e
...
...
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
KAuth
::
ExecuteJob
*
job
=
action
.
execute
();
bool
rc
=
job
->
exec
();
if
(
!
rc
)
{
KMessageBox
::
sorry
(
0
,
i18n
(
"Unable to install theme"
),
job
->
errorString
());
KMessageBox
::
sorry
(
nullptr
,
i18n
(
"Unable to install theme"
),
job
->
errorString
());
qWarning
()
<<
job
->
error
()
<<
job
->
errorString
();
return
-
1
;
}
...
...
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
}
if
(
parser
.
isSet
(
QLatin1String
(
"uninstall"
)))
{
KConfigGroup
cg
(
KSharedConfig
::
openConfig
(
QStringLiteral
(
"sddmthemeinstallerrc"
),
KConfig
::
SimpleConfig
),
"DownloadedThemes"
);
QStringList
installed
=
cg
.
readEntry
(
args
.
first
(),
QStringList
());
const
QStringList
installed
=
cg
.
readEntry
(
args
.
first
(),
QStringList
());
for
(
const
QString
&
installedTheme
:
installed
)
{
KAuth
::
Action
action
(
QStringLiteral
(
"org.kde.kcontrol.kcmsddm.uninstalltheme"
));
action
.
setHelperId
(
"org.kde.kcontrol.kcmsddm"
);
...
...
src/advanceconfig.h
View file @
07aedf7e
...
...
@@ -34,7 +34,7 @@ class AdvanceConfig : public QWidget
{
Q_OBJECT
public:
explicit
AdvanceConfig
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parent
=
0
);
explicit
AdvanceConfig
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parent
=
nullptr
);
~
AdvanceConfig
();
QVariantMap
save
();
...
...
src/configwidgets/selectimagebutton.cpp
View file @
07aedf7e
...
...
@@ -73,7 +73,7 @@ QString SelectImageButton::imagePath() const {
void
SelectImageButton
::
onLoadImageFromFile
()
{
QUrl
fileUrl
=
QFileDialog
::
getOpenFileUrl
(
this
,
i18nc
(
"@title:window"
,
"Select Image"
),
QUrl
(),
"image/*"
,
0
,
0
,
QStringList
()
<<
"file"
);
QUrl
fileUrl
=
QFileDialog
::
getOpenFileUrl
(
this
,
i18nc
(
"@title:window"
,
"Select Image"
),
QUrl
(),
"image/*"
,
nullptr
,
0
,
QStringList
()
<<
"file"
);
if
(
!
fileUrl
.
isEmpty
())
{
setImagePath
(
fileUrl
.
path
());
...
...
src/cursortheme/cursortheme.cpp
View file @
07aedf7e
...
...
@@ -148,6 +148,9 @@ void CursorTheme::setCursorName(qulonglong cursor, const QString &name) const
XFixesSetCursorName
(
QX11Info
::
display
(),
cursor
,
QFile
::
encodeName
(
name
));
}
#else
Q_UNUSED
(
name
);
Q_UNUSED
(
cursor
);
#endif
}
...
...
src/cursortheme/dummytheme.h
View file @
07aedf7e
...
...
@@ -23,7 +23,7 @@ class DummyTheme : public CursorTheme
{
public:
DummyTheme
();
virtual
~
DummyTheme
();
~
DummyTheme
()
Q_DECL_OVERRIDE
;
QImage
loadImage
(
const
QString
&
name
,
int
size
=
0
)
const
Q_DECL_OVERRIDE
;
qulonglong
loadCursor
(
const
QString
&
name
,
int
size
=
0
)
const
Q_DECL_OVERRIDE
;
...
...
src/cursortheme/sortproxymodel.h
View file @
07aedf7e
...
...
@@ -35,8 +35,8 @@
class
SortProxyModel
:
public
QSortFilterProxyModel
{
public:
SortProxyModel
(
QObject
*
parent
=
0
)
:
QSortFilterProxyModel
(
parent
)
{}
~
SortProxyModel
()
{}
explicit
SortProxyModel
(
QObject
*
parent
=
nullptr
)
:
QSortFilterProxyModel
(
parent
)
{}
~
SortProxyModel
()
Q_DECL_OVERRIDE
{}
inline
const
CursorTheme
*
theme
(
const
QModelIndex
&
index
)
const
;
inline
QModelIndex
findIndex
(
const
QString
&
name
)
const
;
inline
QModelIndex
defaultIndex
()
const
;
...
...
src/cursortheme/thememodel.cpp
View file @
07aedf7e
...
...
@@ -133,10 +133,10 @@ void CursorThemeModel::sort(int column, Qt::SortOrder order)
const
CursorTheme
*
CursorThemeModel
::
theme
(
const
QModelIndex
&
index
)
{
if
(
!
index
.
isValid
())
return
NULL
;
return
nullptr
;
if
(
index
.
row
()
<
0
||
index
.
row
()
>=
list
.
count
())
return
NULL
;
return
nullptr
;
return
list
.
at
(
index
.
row
());
}
...
...
src/cursortheme/thememodel.h
View file @
07aedf7e
...
...
@@ -60,8 +60,8 @@ class CursorThemeModel : public QAbstractTableModel
Q_OBJECT
public:
CursorThemeModel
(
QObject
*
parent
=
0
);
~
CursorThemeModel
();
explicit
CursorThemeModel
(
QObject
*
parent
=
nullptr
);
~
CursorThemeModel
()
Q_DECL_OVERRIDE
;
inline
int
columnCount
(
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
inline
int
rowCount
(
const
QModelIndex
&
parent
=
QModelIndex
())
const
Q_DECL_OVERRIDE
;
QVariant
headerData
(
int
section
,
Qt
::
Orientation
orientation
,
int
role
)
const
Q_DECL_OVERRIDE
;
...
...
src/cursortheme/xcursortheme.h
View file @
07aedf7e
...
...
@@ -43,7 +43,7 @@ class XCursorTheme : public CursorTheme
* index.theme file if the dir has one.
*/
XCursorTheme
(
const
QDir
&
dir
);
virtual
~
XCursorTheme
()
{}
~
XCursorTheme
()
Q_DECL_OVERRIDE
{}
const
QStringList
inherits
()
const
{
return
m_inherits
;
}
QImage
loadImage
(
const
QString
&
name
,
int
size
=
0
)
const
Q_DECL_OVERRIDE
;
...
...
src/sddmkcm.h
View file @
07aedf7e
...
...
@@ -28,7 +28,7 @@ class SddmKcm : public KCModule
Q_OBJECT
public:
explicit
SddmKcm
(
QWidget
*
parent
,
const
QVariantList
&
args
);
~
SddmKcm
();
~
SddmKcm
()
Q_DECL_OVERRIDE
;
public
slots
:
void
save
()
Q_DECL_OVERRIDE
;
...
...
src/sessionmodel.cpp
View file @
07aedf7e
...
...
@@ -117,6 +117,7 @@ QHash<int, QByteArray> SessionModel::roleNames() const {
}
int
SessionModel
::
rowCount
(
const
QModelIndex
&
parent
)
const
{
Q_UNUSED
(
parent
);
return
d
->
sessions
.
length
();
}
...
...
src/sessionmodel.h
View file @
07aedf7e
...
...
@@ -43,8 +43,8 @@ public:
CommentRole
};
SessionModel
(
QObject
*
parent
=
0
);
~
SessionModel
();
explicit
SessionModel
(
QObject
*
parent
=
nullptr
);
~
SessionModel
()
Q_DECL_OVERRIDE
;
void
loadDir
(
const
QString
&
path
,
SessionType
type
);
...
...
src/themeconfig.h
View file @
07aedf7e
...
...
@@ -31,7 +31,7 @@ class ThemeConfig : public QWidget
{
Q_OBJECT
public:
explicit
ThemeConfig
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parent
=
0
);
explicit
ThemeConfig
(
const
KSharedConfigPtr
&
config
,
QWidget
*
parent
=
nullptr
);
~
ThemeConfig
();
QVariantMap
save
();
...
...
src/themesdelegate.h
View file @
07aedf7e
...
...
@@ -23,7 +23,7 @@
class
ThemesDelegate
:
public
QAbstractItemDelegate
{
public:
explicit
ThemesDelegate
(
QObject
*
parent
=
0
);
explicit
ThemesDelegate
(
QObject
*
parent
=
nullptr
);
void
paint
(
QPainter
*
painter
,
const
QStyleOptionViewItem
&
option
,
...
...
src/themesmodel.h
View file @
07aedf7e
...
...
@@ -41,8 +41,8 @@ public:
ConfigFileRole
};
explicit
ThemesModel
(
QObject
*
parent
=
0
);
virtual
~
ThemesModel
();
explicit
ThemesModel
(
QObject
*
parent
=
nullptr
);
~
ThemesModel
()
Q_DECL_OVERRIDE
;
int
rowCount
(
const
QModelIndex
&
parent
)
const
Q_DECL_OVERRIDE
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
Q_DECL_OVERRIDE
;
...
...
src/usersmodel.h
View file @
07aedf7e
...
...
@@ -32,8 +32,8 @@ public:
IconRole
};
explicit
UsersModel
(
QObject
*
parent
=
0
);
virtual
~
UsersModel
();
explicit
UsersModel
(
QObject
*
parent
=
nullptr
);
~
UsersModel
()
Q_DECL_OVERRIDE
;
int
rowCount
(
const
QModelIndex
&
parent
)
const
Q_DECL_OVERRIDE
;
QVariant
data
(
const
QModelIndex
&
index
,
int
role
)
const
Q_DECL_OVERRIDE
;
...
...
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