- copy all scripts into /etc/sddm as %config(noreplace)epel9
Rex Dieter
9 years ago
parent
0a193ca3d9
commit
44a61e2265
@ -1,99 +0,0 @@
|
||||
/*
|
||||
* SDDM Fedora configuration
|
||||
*/
|
||||
|
||||
#ifndef SDDM_CONFIGURATION_H
|
||||
#define SDDM_CONFIGURATION_H
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QDir>
|
||||
#include <pwd.h>
|
||||
|
||||
#include "Constants.h"
|
||||
|
||||
#include "ConfigReader.h"
|
||||
|
||||
namespace SDDM {
|
||||
// Name File Sections and/or Entries (but anything else too, it's a class) - Entries in a Config are assumed to be in the General section
|
||||
Config(MainConfig, CONFIG_FILE,
|
||||
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
|
||||
|
||||
// Name Type Default value Description
|
||||
Entry(HaltCommand, QString, _S("/usr/bin/systemctl poweroff"), _S("Halt command"));
|
||||
Entry(RebootCommand, QString, _S("/usr/bin/systemctl reboot"), _S("Reboot command"));
|
||||
Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state\n"
|
||||
"Valid values: on|off|none\n"
|
||||
"If property is set to none, numlock won't be changed"));
|
||||
// Name Entries (but it's a regular class again)
|
||||
Section(Theme,
|
||||
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||||
Entry(Current, QString, _S("fedora"), _S("Current theme name"));
|
||||
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Face icon directory\n"
|
||||
"The files should be in username.face.icon format"));
|
||||
Entry(CursorTheme, QString, QString(), _S("Cursor theme"));
|
||||
);
|
||||
// TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
|
||||
Section(XDisplay,
|
||||
Entry(ServerPath, QString, _S("/usr/bin/X"), _S("X server path"));
|
||||
Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Xauth path"));
|
||||
Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Session description directory"));
|
||||
Entry(SessionCommand, QString, _S("/etc/X11/xinit/Xsession"), _S("Xsession script path\n"
|
||||
"A script to execute when starting the desktop session"));
|
||||
Entry(DisplayCommand, QString, _S("/etc/sddm/Xsetup"), _S("Xsetup script path\n"
|
||||
"A script to execute when starting the display server"));
|
||||
Entry(MinimumVT, int, 1, _S("Minimum VT\n"
|
||||
"The lowest virtual terminal number that will be used."));
|
||||
);
|
||||
Section(Users,
|
||||
Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH"));
|
||||
Entry(MinimumUid, int, 1000, _S("Minimum user id for displayed users"));
|
||||
Entry(MaximumUid, int, 65000, _S("Maximum user id for displayed users"));
|
||||
Entry(HideUsers, QStringList, QStringList(), _S("Hidden users"));
|
||||
Entry(HideShells, QStringList, QStringList(), _S("Hidden shells\n"
|
||||
"Users with these shells as their default won't be listed"));
|
||||
Entry(RememberLastUser, bool, true, _S("Remember the last successfully logged in user"));
|
||||
Entry(RememberLastSession, bool, true, _S("Remember the session of the last successfully logged in user"));
|
||||
);
|
||||
Section(Autologin,
|
||||
Entry(User, QString, QString(), _S("Autologin user"));
|
||||
Entry(Session, QString, QString(), _S("Autologin session"));
|
||||
Entry(Relogin, bool, false, _S("Autologin again on session exit"));
|
||||
);
|
||||
);
|
||||
|
||||
Config(StateConfig, []()->QString{auto tmp = getpwnam("sddm"); return tmp ? tmp->pw_dir : STATE_DIR;}().append("/state.conf"),
|
||||
Section(Last,
|
||||
Entry(Session, QString, QString(), _S("Name of the session file of the last session selected. This session will be preselected when the login screen shows up."));
|
||||
Entry(User, QString, QString(), _S("Name of the last logged-in user. This username will be preselected/shown when the login screen shows up"));
|
||||
);
|
||||
);
|
||||
|
||||
extern MainConfig mainConfig;
|
||||
extern StateConfig stateConfig;
|
||||
|
||||
inline QTextStream& operator>>(QTextStream &str, MainConfig::NumState &state) {
|
||||
QString text = str.readLine().trimmed();
|
||||
if (text.compare("on", Qt::CaseInsensitive) == 0)
|
||||
state = MainConfig::NUM_SET_ON;
|
||||
else if (text.compare("off", Qt::CaseInsensitive) == 0)
|
||||
state = MainConfig::NUM_SET_OFF;
|
||||
else
|
||||
state = MainConfig::NUM_NONE;
|
||||
return str;
|
||||
}
|
||||
|
||||
inline QTextStream& operator<<(QTextStream &str, const MainConfig::NumState &state) {
|
||||
if (state == MainConfig::NUM_SET_ON)
|
||||
str << "on";
|
||||
else if (state == MainConfig::NUM_SET_OFF)
|
||||
str << "off";
|
||||
else
|
||||
str << "none";
|
||||
return str;
|
||||
}
|
||||
}
|
||||
|
||||
#endif // SDDM_CONFIGURATION_H
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up sddm-0.11.0/src/common/Configuration.h.orig sddm-0.11.0/src/common/Configuration.h
|
||||
--- sddm-0.11.0/src/common/Configuration.h.orig 2014-11-20 09:47:24.000000000 -0600
|
||||
+++ sddm-0.11.0/src/common/Configuration.h 2015-08-06 08:51:38.203801508 -0500
|
||||
@@ -46,7 +46,7 @@ namespace SDDM {
|
||||
// Name Entries (but it's a regular class again)
|
||||
Section(Theme,
|
||||
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||||
- Entry(Current, QString, _S("maui"), _S("Current theme name"));
|
||||
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
|
||||
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Face icon directory\n"
|
||||
"The files should be in username.face.icon format"));
|
||||
Entry(CursorTheme, QString, QString(), _S("Cursor theme"));
|
||||
@ -0,0 +1,33 @@
|
||||
diff -up sddm-0.13.0/src/common/Configuration.h.orig sddm-0.13.0/src/common/Configuration.h
|
||||
--- sddm-0.13.0/src/common/Configuration.h.orig 2015-11-04 14:41:36.000000000 -0600
|
||||
+++ sddm-0.13.0/src/common/Configuration.h 2015-11-15 08:04:54.585633353 -0600
|
||||
@@ -45,7 +45,7 @@ namespace SDDM {
|
||||
// Name Entries (but it's a regular class again)
|
||||
Section(Theme,
|
||||
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
|
||||
- Entry(Current, QString, _S("maui"), _S("Current theme name"));
|
||||
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
|
||||
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Face icon directory\n"
|
||||
"The files should be in username.face.icon format"));
|
||||
Entry(CursorTheme, QString, QString(), _S("Cursor theme"));
|
||||
@@ -59,9 +59,9 @@ namespace SDDM {
|
||||
Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Session description directory"));
|
||||
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Xsession script path\n"
|
||||
"A script to execute when starting the desktop session"));
|
||||
- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Xsetup script path\n"
|
||||
+ Entry(DisplayCommand, QString, _S("/etc/sddm/Xsetup"), _S("Xsetup script path\n"
|
||||
"A script to execute when starting the display server"));
|
||||
- Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Xstop script path\n"
|
||||
+ Entry(DisplayStopCommand, QString, _S("/etc/sddm/Xstop"), _S("Xstop script path\n"
|
||||
"A script to execute when stopping the display server"));
|
||||
Entry(MinimumVT, int, MINIMUM_VT, _S("Minimum VT\n"
|
||||
"The lowest virtual terminal number that will be used."));
|
||||
@@ -72,7 +72,7 @@ namespace SDDM {
|
||||
"A script to execute when starting the desktop session"));
|
||||
);
|
||||
Section(Users,
|
||||
- Entry(DefaultPath, QString, _S("/bin:/usr/bin:/usr/local/bin"), _S("Default $PATH"));
|
||||
+ Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH"));
|
||||
Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users"));
|
||||
Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users"));
|
||||
Entry(HideUsers, QStringList, QStringList(), _S("Hidden users"));
|
||||
Loading…
Reference in new issue