From 85879cc241b5f658fc613281a49c9a76fbb741bd Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Sat, 11 Nov 2017 23:43:52 +0100 Subject: WORK IN PROGRESS! Add bwlp logo, banner support, log message window --- CMakeLists.txt | 3 ++ qt-lightdm-greeter.qrc | 2 +- resources/bwlp.svg | 36 ++++++++++++++++++ resources/rqt-2.png | Bin 61278 -> 0 bytes src/loginform.cpp | 19 ++++++---- src/loginform.ui | 7 ++-- src/main.cpp | 6 ++- src/mainwindow.cpp | 97 +++++++++++++++++++++++++++++++++++++++++-------- src/mainwindow.h | 3 ++ src/settings.cpp | 21 ----------- src/settings.h | 31 ++++------------ 11 files changed, 152 insertions(+), 73 deletions(-) create mode 100644 resources/bwlp.svg delete mode 100644 resources/rqt-2.png delete mode 100644 src/settings.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 55282d2..a3c2848 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ QT5_WRAP_UI(UI_HEADERS ${UIS}) include(FindPkgConfig) pkg_check_modules(LIGHTDM_QT liblightdm-qt5-3) +if (NOT LIGHTDM_QT_INCLUDE_DIRS) + MESSAGE( FATAL_ERROR "Cannot find liblightdm-qt" ) +endif() include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/qt-lightdm-greeter.qrc b/qt-lightdm-greeter.qrc index 4c8d327..93e3e45 100644 --- a/qt-lightdm-greeter.qrc +++ b/qt-lightdm-greeter.qrc @@ -2,6 +2,6 @@ resources/dropdown.svg resources/leaveIcon.svg - resources/rqt-2.png + resources/bwlp.svg diff --git a/resources/bwlp.svg b/resources/bwlp.svg new file mode 100644 index 0000000..f0d1a53 --- /dev/null +++ b/resources/bwlp.svg @@ -0,0 +1,36 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/resources/rqt-2.png b/resources/rqt-2.png deleted file mode 100644 index 3299d42..0000000 Binary files a/resources/rqt-2.png and /dev/null differ diff --git a/src/loginform.cpp b/src/loginform.cpp index 930c7a6..ac3eaf2 100644 --- a/src/loginform.cpp +++ b/src/loginform.cpp @@ -14,6 +14,8 @@ #include #include +#include + #include "loginform.h" #include "ui_loginform.h" #include "settings.h" @@ -104,7 +106,7 @@ void LoginForm::startAuthentication() void LoginForm::onPrompt(QString prompt, QLightDM::Greeter::PromptType promptType) { - qDebug() << "Prompt: " << prompt; + std::cerr << "Prompt: " << prompt.toStdString() << std::endl; m_Greeter.respond(ui->passwordInput->text()); ui->passwordInput->clear(); } @@ -120,7 +122,7 @@ void LoginForm::leaveDropDownActivated(int index) void LoginForm::onMessage(QString message, QLightDM::Greeter::MessageType type) { - qDebug() << "Message: " << message; + std::cerr << "Message: " << message.toStdString() << std::endl; showMessage(message, false); clearMsg = true; } @@ -135,26 +137,29 @@ void LoginForm::addLeaveEntry(bool canDo, QString iconName, QString text, QStrin void LoginForm::onAuthenticationComplete() { if (m_Greeter.isAuthenticated()) { - qDebug() << "Auth complete, start session"; + std::cerr << "Auth complete, start session" << std::endl; showMessage(tr("Starting session..."), false); QModelIndex i = sessionsModel.index(0, 0); - if (m_Greeter.startSessionSync(sessionsModel.data(i, QLightDM::SessionsModel::KeyRole).toString())) { + QString s = sessionsModel.data(i, QLightDM::SessionsModel::KeyRole).toString(); + s = "i3"; + std::cerr << s.toStdString() << std::endl; + if (m_Greeter.startSessionSync(s)) { cancelLoginTimer.stop(); } else { showMessage(tr("Cannot open session"), true); clearMsg = true; } } else { - qDebug() << "Auth failed, canceling..."; + std::cerr << "Auth failed, cancelling..." << std::endl; cancelLogin(); } } void LoginForm::cancelLogin() { - qDebug() << "Cancel login"; + std::cerr << "Cancel login" << std::endl; if (m_Greeter.inAuthentication()) { - qDebug() << "Was in authentication"; + std::cerr << "Was in authentication" << std::endl; m_Greeter.cancelAuthentication(); } cancelLoginTimer.stop(); diff --git a/src/loginform.ui b/src/loginform.ui index b4c4cd5..9dc8ed7 100644 --- a/src/loginform.ui +++ b/src/loginform.ui @@ -203,13 +203,13 @@ QComboBox::down-arrow { - 50 + 80 50 - 50 + 80 50 @@ -217,7 +217,7 @@ QComboBox::down-arrow { - :/resources/rqt-2.png + :/resources/bwlp.svg true @@ -250,7 +250,6 @@ QComboBox::down-arrow { - diff --git a/src/main.cpp b/src/main.cpp index 50a8d38..b1c7962 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,6 +14,10 @@ #include #include +#define _GNU_SOURCE /* See feature_test_macros(7) */ +#include /* Obtain O_* constant definitions */ +#include + #include #include "settings.h" @@ -32,10 +36,10 @@ static inline int size(const QRect& r) int main(int argc, char *argv[]) { + dup2(2, 1); // I have no idea why, but Qt's stock qDebug() output never makes it // to /var/log/lightdm/x-0-greeter.log, so we use std::cerr instead.. qInstallMessageHandler(messageHandler); - Cache::prepare(); QApplication a(argc, argv); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 314493c..c578c43 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -11,11 +11,16 @@ #include #include #include +#include +#include +#include #include "mainwindow.h" #include "loginform.h" #include "settings.h" +static const Settings _settings; + MainWindow::MainWindow(bool primary, int screen, const QRect &screenRect, QWidget *parent) : QWidget(parent), m_Screen(screen), @@ -28,16 +33,19 @@ MainWindow::MainWindow(bool primary, int screen, const QRect &screenRect, QWidge setBackground(); // display login dialog only in the main screen + + int spaceY = screenRect.height() / 2; if (showLoginForm()) { m_LoginForm = new LoginForm(this); + spaceY -= m_LoginForm->height() / 2; int maxX = screenRect.width() - m_LoginForm->width(); int maxY = screenRect.height() - m_LoginForm->height(); - int defaultX = 10*maxX/100; + int defaultX = 50*maxX/100; int defaultY = 50*maxY/100; - int offsetX = getOffset(Settings().offsetX(), maxX, defaultX); - int offsetY = getOffset(Settings().offsetY(), maxY, defaultY); + int offsetX = getOffset(_settings.offsetX(), maxX, defaultX); + int offsetY = getOffset(_settings.offsetY(), maxY, defaultY); m_LoginForm->move(offsetX, offsetY); m_LoginForm->show(); @@ -50,6 +58,42 @@ MainWindow::MainWindow(bool primary, int screen, const QRect &screenRect, QWidge int centerY = screenRect.height()/2 + screenRect.y(); QCursor::setPos(centerX, centerY); } + + // Message log at the bottom + m_messages = new QTextEdit(this); + int logHeight = screenRect.height() * 3 / 4; + if (logHeight > spaceY - 10) { + logHeight = spaceY - 10; + } + m_messages->move(0, screenRect.height() * 2 / 3); + m_messages->setFixedSize(screenRect.width(), screenRect.height() / 3); + QPalette p = m_messages->palette(); + p.setColor(QPalette::Base, QColor(0,0,0,0)); // r,g,b,A + QPalette::Light; + m_messages->setPalette(p); + //m_messages->setText("TODO\nLogmessages\n\nWarnings\netc."); + m_messages->setReadOnly(true); + this->setStyle(QStyleFactory::create("#m_messages, QTextEdit { border: none; }")); // TODO: Get rid of black 1px border + + // Banner + if (_settings.bannerImagePath().isEmpty()) { + QSvgWidget *banner = new QSvgWidget(_settings.bannerImagePath(), this); + if (banner->sizeHint().height() > 0) { + int bw, bh; + QSize sh = banner->sizeHint(); + if (sh.height() < spaceY) { + banner->setFixedSize(sh); + bw = sh.width(); + bh = sh.height(); + } else { + int bh = spaceY - 20; + int bw = sh.width() * bh / sh.height(); + banner->setFixedSize(bw, bh); + } + banner->move((screenRect.width() - bw) / 2, (spaceY - bh) / 2); + } + } + // TODO: UniLogo } MainWindow::~MainWindow() @@ -97,23 +141,46 @@ int MainWindow::getOffset(QString settingsOffset, int maxVal, int defaultVal) void MainWindow::setBackground() { - QSettings greeterSettings(CONFIG_FILE, QSettings::IniFormat); - - if (greeterSettings.contains(BACKGROUND_IMAGE_KEY)) { - QString pathTom_background = greeterSettings.value(BACKGROUND_IMAGE_KEY).toString(); - - m_background = QImage(pathTom_background); + Qt::AspectRatioMode arMode = Qt::KeepAspectRatioByExpanding; + QString bgPath = _settings.backgrundImagePath(); + if (bgPath.length() != 0) { + m_background = QImage(bgPath); if (m_background.isNull()) { - qWarning() << "Not able to read" << pathTom_background << "as image"; + qWarning() << "Not able to read" << bgPath << "as image"; } } + + if (m_background.isNull()) { + arMode = Qt::IgnoreAspectRatio; + QStringList cols = _settings.gradientColors(); + if (cols.length() == 4 || cols.length() == 2) { + bool ok = true; + uint a, b, c, d; + if (ok) c = a = cols.at(0).toUInt(&ok, 16) | 0xff000000; + if (ok) d = b = cols.at(1).toUInt(&ok, 16) | 0xff000000; + if (cols.length() == 4) { + if (ok) c = cols.at(2).toUInt(&ok, 16) | 0xff000000; + if (ok) d = cols.at(3).toUInt(&ok, 16) | 0xff000000; + } + if (ok) { + m_background = QImage(cols.length() / 2, 2, QImage::Format_RGB32); + m_background.setPixel(0, 0, a); + m_background.setPixel(0, 1, c); + if (cols.length() == 4) { + m_background.setPixel(1, 0, b); + m_background.setPixel(1, 1, d); + } + } + } + } if (m_background.isNull()) { - m_background = QImage(2, 2, QImage::Format_RGB32); - m_background.setPixel(0, 0, 0xffffffff); - m_background.setPixel(1, 0, 0xff888687); - m_background.setPixel(0, 1, 0xff888687); - m_background.setPixel(1, 1, 0xfff9a72b); + // Hard-coded default: Gradient + m_background = QImage(2, 2, QImage::Format_RGB32); + m_background.setPixel(0, 0, 0xffffffff); + m_background.setPixel(1, 0, 0xff888687); + m_background.setPixel(0, 1, 0xff888687); + m_background.setPixel(1, 1, 0xfff9a72b); } QPalette palette; diff --git a/src/mainwindow.h b/src/mainwindow.h index 7d20a6e..c2d7cad 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -20,6 +20,8 @@ namespace Ui { class MainWindow; } +class QTextEdit; + class MainWindow : public QWidget { Q_OBJECT @@ -42,6 +44,7 @@ private: bool m_Primary; LoginForm* m_LoginForm; QImage m_background; + QTextEdit *m_messages; }; #endif // MAINWINDOW_H diff --git a/src/settings.cpp b/src/settings.cpp deleted file mode 100644 index 0c37166..0000000 --- a/src/settings.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include "settings.h" - -#define BACKGROUND_IMAGE_KEY "greeter-background-image" -#define LOGINFORM_OFFSETX_KEY "loginform-offset-x" -#define LOGINFORM_OFFSETY_KEY "loginform-offset-y" -#define LOGFILE_PATH_KEY "logfile-path" - -const QString Cache::GREETER_DATA_DIR_PATH = "/var/lib/lightdm/qt-lightdm-greeter"; - -void Cache::prepare() -{ - QDir dir(GREETER_DATA_DIR_PATH); - if (!dir.exists()) { - if (!dir.mkpath(GREETER_DATA_DIR_PATH)) { - qWarning() << "Unable to create dir" << GREETER_DATA_DIR_PATH; - } - } -} - diff --git a/src/settings.h b/src/settings.h index 7f2b135..7ae3211 100644 --- a/src/settings.h +++ b/src/settings.h @@ -3,36 +3,19 @@ #include - - - -class Cache : public QSettings -{ -public: - static const QString GREETER_DATA_DIR_PATH; - static void prepare(); - - Cache() : QSettings(GREETER_DATA_DIR_PATH + "/state", QSettings::NativeFormat) {} - QString getLastUser() { return value("last-user").toString(); } - void setLastUser(QString userId) { setValue("last-user", userId); } - QString getLastSession(QString userId) { return value(userId + "/last-session").toString(); } - void setLastSession(QString userId, QString session) { setValue(userId + "/last-session", session); } -}; - #define CONFIG_FILE "/etc/lightdm/qt-lightdm-greeter.conf" -#define BACKGROUND_IMAGE_KEY "greeter-background-image" -#define LOGINFORM_OFFSETX_KEY "loginform-offset-x" -#define LOGINFORM_OFFSETY_KEY "loginform-offset-y" - class Settings : public QSettings { public: Settings() : QSettings(QString("/etc/lightdm/qt-lightdm-greeter.conf"), QSettings::NativeFormat) {} - QString iconThemeName() { return value("greeter-icon-theme").toString(); } - QString backgrundImagePath() { return value("greeter-background-image").toString(); } - QString offsetX() { return value("loginform-offset-x").toString(); } - QString offsetY() { return value("loginform-offset-y").toString(); } + QString iconThemeName() const { return value("greeter-icon-theme").toString(); } + QString backgrundImagePath() const { return value("greeter-background-image").toString(); } + QString offsetX() const { return value("loginform-offset-x").toString(); } + QString offsetY() const { return value("loginform-offset-y").toString(); } + QString miniIconPath() const { return value("loginform-mini-icon").toString(); } + QString bannerImagePath() const { return value("greeter-banner-image").toString(); } + QStringList gradientColors() const { return value("greeter-background-gradient").toString().split("\\s", QString::SkipEmptyParts); } }; -- cgit v1.2.3-55-g7522