Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kgreeter: load color scheme name from the file

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-03-31 21:54:35 +03:00
parent 34973c51b0
commit 3ed892b46a
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kgreeter/kcm/kgreeterconfig.cpp
View file

@ -60,10 +60,11 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args)
stylesbox->addItems(QStyleFactory::keys());
connect(stylesbox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotStyleChanged(QString)));
// TODO: load name from General/Name
const QStringList kcolorschemes = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates);
foreach (const QString &kcolorscheme, kcolorschemes) {
colorsbox->addItem(QFileInfo(kcolorscheme).baseName());
const QString kcolorschemename = QSettings(kcolorscheme, QSettings::IniFormat).value("General/Name").toString();
const QString kcolorschemebasename = QFileInfo(kcolorscheme).baseName();
colorsbox->addItem(kcolorschemename, QVariant(kcolorschemebasename));
}
connect(colorsbox, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotColorChanged(QString)));
@ -102,7 +103,7 @@ void KCMGreeter::load()
const QString kgreetercolor = kgreetersettings.value("greeter/colorscheme").toString();
if (!kgreetercolor.isEmpty()) {
for (int i = 0; i < colorsbox->count(); i++) {
if (colorsbox->itemText(i) == kgreetercolor) {
if (colorsbox->itemData(i).toString() == kgreetercolor) {
colorsbox->setCurrentIndex(i);
break;
}
@ -123,7 +124,7 @@ void KCMGreeter::save()
KAuth::Action kgreeteraction("org.kde.kcontrol.kcmkgreeter.save");
kgreeteraction.setHelperID("org.kde.kcontrol.kcmkgreeter");
kgreeteraction.addArgument("style", stylesbox->currentText());
kgreeteraction.addArgument("colorscheme", colorsbox->currentText());
kgreeteraction.addArgument("colorscheme", colorsbox->itemData(colorsbox->currentIndex()).toString());
kgreeteraction.addArgument("background", backgroundrequester->url().path());
kgreeteraction.addArgument("rectangle", rectanglerequester->url().path());
KAuth::ActionReply kgreeterreply = kgreeteraction.execute();
@ -142,9 +143,9 @@ void KCMGreeter::slotStyleChanged(const QString &style)
emit changed(true);
}
void KCMGreeter::slotColorChanged(const QString &style)
void KCMGreeter::slotColorChanged(const QString &color)
{
Q_UNUSED(style);
Q_UNUSED(color);
emit changed(true);
}

2
kgreeter/kcm/kgreeterconfig.h
View file

@ -41,7 +41,7 @@ public:
private Q_SLOTS:
void slotStyleChanged(const QString &style);
void slotColorChanged(const QString &style);
void slotColorChanged(const QString &color);
void slotURLChanged(const QString &url);
void slotURLChanged(const KUrl &url);

5
kgreeter/kgreeter.cpp
View file

@ -24,7 +24,7 @@ class KGreeter : public QMainWindow
{
Q_OBJECT
public:
explicit KGreeter(QWidget *parent = 0);
explicit KGreeter(QWidget *parent = nullptr);
QByteArray getUser() const;
QByteArray getPass() const;
@ -36,8 +36,9 @@ public:
static void authenticationCompleteCb(LightDMGreeter *ldmgreeter, gpointer ldmptr);
static void showMessageCb(LightDMGreeter *ldmgreeter, const gchar *ldmtext, LightDMMessageType ldmtype, gpointer ldmptr);
// QMainWindow reimplementations
protected:
void paintEvent(QPaintEvent *event);
void paintEvent(QPaintEvent *event) final;
private Q_SLOTS:
void slotSuspend();