diff options
| -rw-r--r-- | raveos-calamares-module/PKGBUILD | 2 | ||||
| -rw-r--r-- | raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp | 25 | ||||
| -rw-r--r-- | raveos-calamares-theme/PKGBUILD | 2 | ||||
| -rw-r--r-- | raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss | 34 |
4 files changed, 38 insertions, 25 deletions
diff --git a/raveos-calamares-module/PKGBUILD b/raveos-calamares-module/PKGBUILD index 9316aef..2a99b9f 100644 --- a/raveos-calamares-module/PKGBUILD +++ b/raveos-calamares-module/PKGBUILD @@ -1,6 +1,6 @@ pkgname=raveos-calamares-module pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="RaveOS Calamares Wi-Fi viewmodule" arch=('x86_64') options=('!debug') diff --git a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp index 4d119eb..28d3895 100644 --- a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp +++ b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp @@ -72,34 +72,13 @@ void RaveWelcomeViewStep::buildWidget() // Bottom language bar auto* bar = new QFrame(); + bar->setObjectName("ravewelcomeBar"); bar->setFixedHeight(58); - bar->setStyleSheet("background-color: rgba(43,43,43,200); border: none;"); m_langCombo = new QComboBox(bar); + m_langCombo->setObjectName("ravewelcomeCombo"); m_langCombo->setFixedHeight(40); m_langCombo->setMinimumWidth(300); - m_langCombo->setStyleSheet( - "QComboBox {" - " background-color: rgba(43,43,43,180);" - " color: #ffffff;" - " border: none;" - " border-radius: 4px;" - " padding: 4px 12px;" - " font-size: 15px;" - "}" - "QComboBox::drop-down { border: none; width: 24px; }" - "QComboBox QAbstractItemView {" - " background-color: rgba(43,43,43,160);" - " color: #ffffff;" - " selection-background-color: rgba(61,120,57,180);" - " border: none;" - " font-size: 15px;" - "}" - "QComboBox QAbstractItemView::item {" - " padding: 4px 12px;" - " min-height: 26px;" - "}" - ); // Populate language model auto* model = new Calamares::Locale::TranslationsModel(m_localeIds, m_langCombo); diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD index b54b07f..14d5eac 100644 --- a/raveos-calamares-theme/PKGBUILD +++ b/raveos-calamares-theme/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: AlexC <alexc@alexc.hu> pkgname=raveos-calamares-theme pkgver=2.0.0 -pkgrel=22 +pkgrel=23 pkgdesc="RaveOS Calamares Theme" arch=('any') url="https://git.rp1.hu/RaveOS" diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss index 7c17798..86a6fbd 100644 --- a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss +++ b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss @@ -3,6 +3,40 @@ /* Main: #404040 | Accent: #3d7839 | Border: #7f8c8d */ /* ===================================================== */ +/* ---------------- RaveWelcome modul ---------------- */ + +#ravewelcomeBar { + background-color: rgba(43,43,43,200); + border: none; +} + +#ravewelcomeCombo { + background-color: rgba(43,43,43,180); + color: #ffffff; + border: none; + border-radius: 4px; + padding: 4px 12px; + font-size: 15px; +} + +#ravewelcomeCombo::drop-down { + border: none; + width: 24px; +} + +#ravewelcomeCombo QAbstractItemView { + background-color: rgba(43,43,43,160); + color: #ffffff; + selection-background-color: rgba(61,120,57,180); + border: none; + font-size: 15px; +} + +#ravewelcomeCombo QAbstractItemView::item { + padding: 4px 12px; + min-height: 26px; +} + /* ---------------- Language Selector ---------------- */ #languageWidget { |