From b1261152294afce5f962bff100b5c7ed29d0e9a9 Mon Sep 17 00:00:00 2001 From: Pavel Borecki Date: Thu, 3 Aug 2017 05:16:31 +0000 Subject: Translated using Weblate (Czech) Currently translated at 100.0% (390 of 390 strings) --- .../lumina-config/i18n/lumina-config_cs.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_cs.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_cs.ts index 9a43613c..0349162b 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_cs.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_cs.ts @@ -345,7 +345,7 @@ Přepsat? - Start menu alternative focusing on the user's files, directories, and favorites. + Start menu alternative focusing on the user's files, directories, and favorites. Alternativa ke spouštěcí nabídce se zaměřením na uživatelovy soubory, adresáře a oblíbené položky. @@ -1234,12 +1234,12 @@ Přepsat? - "Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key - "Mod1": Alt key -"Mod4": klávesa Windows/Mac -"Control": klávesa Ctrl + "Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key + "Mod1": Alt key +"Mod4": klávesa Windows/Mac +"Control": klávesa Ctrl @@ -1422,7 +1422,7 @@ Přepsat? Panel - + Panel @@ -1613,7 +1613,7 @@ Přepsat? Window Manager - Správce oken + Správce oken @@ -1653,7 +1653,7 @@ Přepsat? Window manager - + Správce oken -- cgit From 7bdf4e22259bdd135df29f59aaf5fecb44037b48 Mon Sep 17 00:00:00 2001 From: q5sys Date: Thu, 3 Aug 2017 09:05:28 -0400 Subject: get basic user defined sound enabled --- src-qt5/core/lumina-desktop/LSession.cpp | 8 ++++++-- src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 93318b0f..777affd1 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -191,7 +191,10 @@ void LSession::CleanupSession(){ int vol = LOS::audioVolume(); if(vol>=0){ sessionsettings->setValue("last_session_state/audio_volume", vol); } bool playaudio = sessionsettings->value("PlayLogoutAudio",true).toBool(); - if( playaudio ){ playAudioFile(LOS::LuminaShare()+"Logout.ogg"); } + if( playaudio ){ + QString sfile = sessionsettings->value("audiofiles/logout", LOS::LuminaShare()+"Logout.ogg").toString(); + playAudioFile(sfile); + } //Stop the background system tray (detaching/closing apps as necessary) stopSystemTray(!cleansession); //Now perform any other cleanup @@ -296,7 +299,8 @@ void LSession::launchStartupApps(){ //Now play the login music since we are finished if(sessionsettings->value("PlayStartupAudio",true).toBool()){ - LSession::playAudioFile(LOS::LuminaShare()+"Login.ogg"); + QString sfile = sessionsettings->value("audiofiles/login", LOS::LuminaShare()+"Login.ogg").toString(); + playAudioFile(sfile); } qDebug() << "[DESKTOP INIT FINISHED]"; } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp index 5e9d7a7f..be5b8488 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp @@ -78,8 +78,10 @@ void LBattery::updateBattery(bool force){ } if(iconplayAudioFile(LOS::LuminaShare()+"low-battery.ogg"); - } + QString sfile = LSession::handle()->sessionSettings()->value("audiofiles/batterylow", LOS::LuminaShare()+"low-battery.ogg").toString(); + LSession::handle()->playAudioFile(sfile); + } + if(icon==0){ label->setStyleSheet("QLabel{ background: red;}"); } else if(icon==14 && charge>98){ label->setStyleSheet("QLabel{ background: green;}"); } else{ label->setStyleSheet("QLabel{ background: transparent;}"); } -- cgit From 9b05c2c90e84b73837b1392d822aa02a316ff124 Mon Sep 17 00:00:00 2001 From: Zackary Welch Date: Thu, 3 Aug 2017 13:46:08 +0000 Subject: Translated using Weblate (French) Currently translated at 31.5% (123 of 390 strings) --- .../lumina-config/i18n/lumina-config_fr.ts | 96 +++++++++++----------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts index 20206190..06cbb267 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts @@ -77,7 +77,7 @@ This color scheme already exists. Overwrite it? Ce jeu de couleurs existe déjà. -Voulez-vous l'écraser ? +Voulez-vous l'écraser ? @@ -254,7 +254,7 @@ Voulez-vous l'écraser ? Invisible spacer to separate plugins. - Élément d'espacement invisible pour séparer les éléments. + Élément d'espacement invisible pour séparer les éléments. @@ -269,7 +269,7 @@ Voulez-vous l'écraser ? Keep track of your battery status. - Suivre le status de votre batterie + Suivre le status de votre batterie. @@ -279,7 +279,7 @@ Voulez-vous l'écraser ? View the current time and date. - Affiche l'heure et la date actuelle. + Affiche l'heure et la date actuelle. @@ -310,7 +310,7 @@ Voulez-vous l'écraser ? Display area for dockable system applications - Zone d'affichage pour les applications systèmes attachables + Zone d'affichage pour les applications systèmes attachables @@ -336,7 +336,7 @@ Voulez-vous l'écraser ? Application Launcher - Lanceur d'applications + Lanceur d'applications @@ -345,18 +345,18 @@ Voulez-vous l'écraser ? - Start menu alternative focusing on the user's files, directories, and favorites. - Menu de démarrage alternatif qui se concentre sur les fichiers d'utilisateurs, les répertoires d'utilisateurs, et les favoris d'utilisateurs. + Start menu alternative focusing on the user's files, directories, and favorites. + Menu de démarrage alternatif qui se concentre sur les fichiers d'utilisateurs, les répertoires d'utilisateurs, et les favoris d'utilisateurs. Application Menu - Menu de l'application + Menu de l'application Start menu alternative which focuses on launching applications. - Menu de démarrage alternatif qui se concentre sur le lancement d'applications. + Menu de démarrage alternatif qui se concentre sur le lancement d'applications. @@ -366,12 +366,12 @@ Voulez-vous l'écraser ? Simple line to provide visual separation between items. - Ligne simple indiquant la séparation des items + Ligne simple indiquant la séparation des items. Workspace Switcher - Sélecteur d'espace de travail + Sélecteur d'espace de travail @@ -391,7 +391,7 @@ Voulez-vous l'écraser ? Unified system access and application launch menu. - Accès simplifié au serveur et Menu de lancement d'application + Accès simplifié au serveur et Menu de lancement d'application. @@ -438,7 +438,7 @@ Voulez-vous l'écraser ? Keep track of system statistics such as CPU/Memory usage and CPU temperatures. - Suivre les statistiques système comme l'utilisation CPU/Mémoire et les températures CPU. + Suivre les statistiques système comme l'utilisation CPU/Mémoire et les températures CPU. @@ -561,7 +561,7 @@ Voulez-vous l'écraser ? Text color for disabled or inactive items. - Couleur de texte pour éléments inactifs ou désactivés + Couleur de texte pour éléments inactifs ou désactivés. @@ -581,7 +581,7 @@ Voulez-vous l'écraser ? Main background color for the window/dialog. - Couleur d'arrière plan principale pour les fenêtres / dialogues. + Couleur d'arrière plan principale pour les fenêtres / dialogues. @@ -591,7 +591,7 @@ Voulez-vous l'écraser ? Main background color for widgets that list or display collections of items. - Couleur principale de fond pour les widgets qui liste ou affiche les collections d'objets. + Couleur principale de fond pour les widgets qui liste ou affiche les collections d'objets. @@ -621,7 +621,7 @@ Voulez-vous l'écraser ? Alternate color for the theme. - Couleur alternative pour le thème + Couleur alternative pour le thème. @@ -636,7 +636,7 @@ Voulez-vous l'écraser ? Accent Color - Couleur d'Accent + Couleur d'Accent @@ -646,12 +646,12 @@ Voulez-vous l'écraser ? Accent Color (Disabled) - Couleur d'Accent (Désactivée) + Couleur d'Accent (Désactivée) Color used for borders or other accents (more subdued). - Couleur utilisée pour les bordures et autres accents (plus tamisé) + Couleur utilisée pour les bordures et autres accents (plus tamisé). @@ -661,7 +661,7 @@ Voulez-vous l'écraser ? Color used for highlighting an item. - Couleur utilisée pour la surbrillance d'un élément. + Couleur utilisée pour la surbrillance d'un élément. @@ -932,7 +932,7 @@ Voulez-vous l'écraser ? This theme already exists. Overwrite it? Ce thème existe déjà. - Voulez-vous l'écraser ? + Voulez-vous l'écraser ? @@ -1020,7 +1020,7 @@ Voulez-vous l'écraser ? Application Binaries (*) - Exécutables de L'Application (*) + Exécutables de L'Application (*) @@ -1030,7 +1030,7 @@ Voulez-vous l'écraser ? The selected file is not executable! - Le fichier sélectionné n'est pas exécutable ! + Le fichier sélectionné n'est pas exécutable ! @@ -1172,7 +1172,7 @@ Voulez-vous l'écraser ? The selected binary is not executable! - Le fichier sélectionné n'est pas exécutable. + Le fichier sélectionné n'est pas exécutable. @@ -1220,7 +1220,7 @@ Voulez-vous l'écraser ? Change Key Binding: - Changer l'Affectation de Touche + Changer l'Affectation de Touche @@ -1234,9 +1234,9 @@ Voulez-vous l'écraser ? - "Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key + "Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key @@ -1257,12 +1257,12 @@ Voulez-vous l'écraser ? Screen Brightness Up - Luminosité de l'écran + + Luminosité de l'écran + Screen Brightness Down - Diminuer la Luminosité de l'Écran + Diminuer la Luminosité de l'Écran @@ -1272,7 +1272,7 @@ Voulez-vous l'écraser ? Lock Screen - Verrouiller l'écran + Verrouiller l'écran @@ -1295,7 +1295,7 @@ Voulez-vous l'écraser ? Number of Workspaces - Nombre d'Espaces de Travail + Nombre d'Espaces de Travail @@ -1453,7 +1453,7 @@ Voulez-vous l'écraser ? Interface Configuration - Configuration de l'interface + Configuration de l'interface @@ -1579,12 +1579,12 @@ Voulez-vous l'écraser ? Change User Icon - Modifier l'Icône Utilisateur + Modifier l'Icône Utilisateur Time Format: - Format d'Heure: + Format d'Heure: @@ -1606,7 +1606,7 @@ Voulez-vous l'écraser ? Display Format - Format d'Affichage + Format d'Affichage @@ -1646,7 +1646,7 @@ Voulez-vous l'écraser ? Date first then Time - Date avant l'heure + Date avant l'heure @@ -1671,12 +1671,12 @@ Voulez-vous l'écraser ? Reset User Image - Réinitialiser l'image de l'utilisateur + Réinitialiser l'image de l'utilisateur Would you like to reset the user image to the system default? - Voulez-vous réinitialiser l'image de l'utilisateur aux paramètres par défaut du système ? + Voulez-vous réinitialiser l'image de l'utilisateur aux paramètres par défaut du système ? @@ -1786,7 +1786,7 @@ Voulez-vous l'écraser ? Text may be contained within single-quotes to ignore replacements - Le texte peut être inclus dans des apostrophes afin d'ignorer les substitutions + Le texte peut être inclus dans des apostrophes afin d'ignorer les substitutions @@ -1850,7 +1850,7 @@ Voulez-vous l'écraser ? Icon Pack: - Pack d'icônes: + Pack d'icônes: @@ -1914,7 +1914,7 @@ Voulez-vous l'écraser ? Rotate Background - Tourner l'arrière-plan + Tourner l'arrière-plan @@ -2026,7 +2026,7 @@ Voulez-vous l'écraser ? No Background - Pas d'arrière-plan + Pas d'arrière-plan @@ -2036,18 +2036,18 @@ Voulez-vous l'écraser ? File does not exist - Le fichier n'existe pas + Le fichier n'existe pas Find Background Image(s) - Recherche d'image(s) pour l'arrière plan + Recherche d'image(s) pour l'arrière plan Find Background Image Directory - Trouver le Répertoire d'Image des Arrière-Plans + Trouver le Répertoire d'Image des Arrière-Plans -- cgit From faf02471347cee5cb075b66479a9b2e8d1f05b4e Mon Sep 17 00:00:00 2001 From: Zackary Welch Date: Thu, 3 Aug 2017 13:42:06 +0000 Subject: Translated using Weblate (Japanese) Currently translated at 98.4% (384 of 390 strings) --- .../lumina-config/i18n/lumina-config_ja.ts | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ja.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ja.ts index bbd9f730..30cfab6e 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ja.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ja.ts @@ -317,8 +317,8 @@ Hide all open windows and show the desktop - "Home Button"の説明文 - すべての開いているウィンドウを隠してデスクトップを表示します。 + "Home Button"の説明文 + すべての開いているウィンドウを隠してデスクトップを表示します @@ -348,7 +348,7 @@ - Start menu alternative focusing on the user's files, directories, and favorites. + Start menu alternative focusing on the user's files, directories, and favorites. ユーザーのファイル・ディレクトリーやお気に入りに特化した別の種類のスタートメニューです。 @@ -369,7 +369,7 @@ Simple line to provide visual separation between items. - アイテムの間を分割する線を表示します + アイテムの間を分割する線を表示します。 @@ -384,7 +384,7 @@ View and control any running application windows (every individual window has a button) - 実行中のアプリケーションウインドウを表示し、制御します (すべてのウインドウがそれぞれひとつのボタンを持ちます)。 + 実行中のアプリケーションウインドウを表示し、制御します (すべてのウインドウがそれぞれひとつのボタンを持ちます) @@ -399,12 +399,12 @@ Pin an application shortcut directly to the panel - アプリケーションへのショートカットをデスクトップに貼り付けます。 + アプリケーションへのショートカットをデスクトップに貼り付けます Desktop button for launching an application - もう一つの"Application Launcher"の説明 + もう一つの"Application Launcher"の説明 アプリケーションを起動するデスクトップボタン @@ -1038,7 +1038,7 @@ The selected file is not executable! - 選択されたファイルは実行可能ファイルではありません。 + 選択されたファイルは実行可能ファイルではありません! @@ -1129,7 +1129,7 @@ Web Browser: - Webブラウザー + Webブラウザー: @@ -1180,7 +1180,7 @@ The selected binary is not executable! - 選択したプログラムは実行可能ではありません。 + 選択したプログラムは実行可能ではありません! @@ -1244,12 +1244,12 @@ - "Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key - "Mod1": Alt キー -"Mod4": Windows/Mac キー -"Control": Ctrl キー + "Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key + "Mod1": Alt キー +"Mod4": Windows/Mac キー +"Control": Ctrl キー @@ -1396,7 +1396,7 @@ Display Removable Media Icons - + 着脱可能なメディアアイコンを表示 @@ -1432,7 +1432,7 @@ Panel - + パネル @@ -1485,7 +1485,7 @@ System Settings - + 系統設定 @@ -1663,7 +1663,7 @@ Window manager - + ウィンドウマネージャ @@ -1798,7 +1798,7 @@ Text may be contained within single-quotes to ignore replacements - シングルクォートで囲まれた文字は日付への置き換え対象から外れます。 + シングルクォートで囲まれた文字は日付への置き換え対象から外れます -- cgit From 2fd4ce30f7ee8d7d09f2d2d2a0f4ffe906ee093c Mon Sep 17 00:00:00 2001 From: Zackary Welch Date: Thu, 3 Aug 2017 13:44:48 +0000 Subject: Translated using Weblate (Spanish) Currently translated at 95.6% (373 of 390 strings) --- .../lumina-config/i18n/lumina-config_es.ts | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts index ef899209..95d3610b 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_es.ts @@ -55,7 +55,7 @@ Sample - Ejemplo + Muestra @@ -289,7 +289,7 @@ View or change system settings (audio volume, screen brightness, battery life, virtual desktops). - Ver o cambiar las opciones del sistema (volúmen, brillo, batería, escritorios virtuales) + Ver o cambiar las opciones del sistema (volúmen, brillo, batería, escritorios virtuales). @@ -463,7 +463,7 @@ Browse the system with the default file manager. - Navegue el sisterma con el administrador de archivos predeterminado + Navegue el sisterma con el administrador de archivos predeterminado. @@ -536,12 +536,12 @@ Lock Session - + Bloquear sesión Lock the current desktop session - + Bloquear la sesión actual del desktop @@ -716,17 +716,17 @@ Wallpaper - + Fondo de pantalla Theme - + Tema Autostart - + Auto Iniciar @@ -766,17 +766,17 @@ Desktop - + Fondo Panels - + Paneles Menu - + Menú @@ -821,7 +821,7 @@ Localization - + Localización @@ -1058,7 +1058,7 @@ Sobrescribirlo? Only use compositing with GPU acceleration - + Solo use composición con aceleración de GPU @@ -1386,7 +1386,7 @@ Sobrescribirlo? Display Removable Media Icons - + Mostrar Iconos de Media Removible @@ -1422,17 +1422,17 @@ Sobrescribirlo? Panel - + Panel Profile - + Perfil Import - + Importar @@ -1475,7 +1475,7 @@ Sobrescribirlo? System Settings - + Configuraciones de Sistema @@ -1576,7 +1576,7 @@ Sobrescribirlo? Show application crash data - + Mostrar dato del fallo de la aplicación @@ -1653,7 +1653,7 @@ Sobrescribirlo? Window manager - + Gestor de ventanas @@ -1857,7 +1857,7 @@ Sobrescribirlo? Mouse Cursors: - Cursores del ratón + Cursores del ratón: @@ -1931,7 +1931,7 @@ Sobrescribirlo? Layout: - Disposición: + Disposición: -- cgit From a1c00bb4defcaa7ff683b2ad9c56d567005d7d90 Mon Sep 17 00:00:00 2001 From: q5sys Date: Thu, 3 Aug 2017 09:56:04 -0400 Subject: fix version string define --- src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h index 93a1d433..8a466ed9 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h @@ -8,7 +8,7 @@ #define LTHEMEENGINE_STRINGIFY(s) LTHEMEENGINE_TOSTRING(s) #define LTHEMEENGINE_VERSION_INT (LTHEMEENGINE_VERSION_MAJOR<<8 | LTHEMEENGINE_VERSION_MINOR) -#define LTHEMEENGINE_VERSION_STR LTHEMEENGINE_STRINGIFY(LTHEMEENGINE_VERSION_MAJOR.QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_STR LTHEMEENGINE_STRINGIFY(LTHEMEENGINE_VERSION_MAJOR.LTHEMEENGINE_VERSION_MINOR) #include #include -- cgit From 8687a43803e0d5937ff5213ab987b05866498362 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 3 Aug 2017 10:48:19 -0400 Subject: Cleanup the lumina-theme-engine subproject 1. Use the built-in OS-detect.pri for build settings 2. Remove the "DISABLE_WIDGETS" flag (desktop always needs it) 3. Clean up the multi-path search routines for qss/color files 4. Add some color files to the default install --- src-qt5/OS-detect.pri | 7 +++ src-qt5/core/lumina-theme-engine/colors/airy.conf | 4 ++ .../core/lumina-theme-engine/colors/darker.conf | 4 ++ src-qt5/core/lumina-theme-engine/colors/dusk.conf | 4 ++ src-qt5/core/lumina-theme-engine/colors/sand.conf | 4 ++ .../core/lumina-theme-engine/colors/simple.conf | 4 ++ src-qt5/core/lumina-theme-engine/colors/waves.conf | 4 ++ src-qt5/core/lumina-theme-engine/lthemeengine.pri | 29 ++++-------- src-qt5/core/lumina-theme-engine/lthemeengine.pro | 52 ++++------------------ .../lthemeengine-qtplugin.pro | 2 +- .../src/lthemeengine-style/lthemeengine-style.pro | 4 +- .../src/lthemeengine/appearancepage.cpp | 18 ++++---- .../src/lthemeengine/appearancepage.h | 2 +- .../src/lthemeengine/lthemeengine.cpp | 6 ++- .../src/lthemeengine/lthemeengine.pro | 7 ++- .../lumina-theme-engine/src/lthemeengine/main.cpp | 2 +- .../src/lthemeengine/qsspage.cpp | 24 +++++----- .../lumina-theme-engine/src/lthemeengine/qsspage.h | 2 +- 18 files changed, 84 insertions(+), 95 deletions(-) create mode 100644 src-qt5/core/lumina-theme-engine/colors/airy.conf create mode 100644 src-qt5/core/lumina-theme-engine/colors/darker.conf create mode 100644 src-qt5/core/lumina-theme-engine/colors/dusk.conf create mode 100644 src-qt5/core/lumina-theme-engine/colors/sand.conf create mode 100644 src-qt5/core/lumina-theme-engine/colors/simple.conf create mode 100644 src-qt5/core/lumina-theme-engine/colors/waves.conf diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index ac195000..76d09642 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -119,4 +119,11 @@ isEmpty(OS){ L_SESSDIR = $$DESTDIR$${L_SESSDIR} L_MANDIR = $$DESTDIR$${L_MANDIR} } + + #Some conf to redirect intermediate stuff in separate dirs + UI_DIR=$${PWD}/.build/ui/ + MOC_DIR=$${PWD}/.build/moc/ + OBJECTS_DIR=$${PWD}/.build/obj + RCC_DIR=$${PWD}/.build/rcc + QMAKE_DISTCLEAN += -r $${PWD}/.build } diff --git a/src-qt5/core/lumina-theme-engine/colors/airy.conf b/src-qt5/core/lumina-theme-engine/colors/airy.conf new file mode 100644 index 00000000..94008b7a --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/airy.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #dcdcdc, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #000000, #0a0a0a, #0a0a0a, #c8c8c8, #ffffff, #e7e4e0, #0986d3, #0a0a0a, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #050505 +disabled_colors=#ffffff, #424245, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #808080, #ffffff, #808080, #969696, #c8c8c8, #e7e4e0, #0986d3, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #ffffff +inactive_colors=#323232, #b4b4b4, #dcdcdc, #5e5c5b, #646464, #e1e1e1, #323232, #323232, #323232, #969696, #c8c8c8, #e7e4e0, #0986d3, #323232, #0986d3, #a70b06, #5c5b5a, #ffffff, #646464, #323232 diff --git a/src-qt5/core/lumina-theme-engine/colors/darker.conf b/src-qt5/core/lumina-theme-engine/colors/darker.conf new file mode 100644 index 00000000..5186ecef --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/darker.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +disabled_colors=#bebebe, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #bebebe, #ffffff, #bebebe, #7f7f7f, #7f7f7f, #b1aeab, #7f7f7f, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +inactive_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/dusk.conf b/src-qt5/core/lumina-theme-engine/colors/dusk.conf new file mode 100644 index 00000000..9c822b60 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/dusk.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +disabled_colors=#808080, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #ffffff, #808080, #3d3d3d, #222020, #e7e4e0, #12608a, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +inactive_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff diff --git a/src-qt5/core/lumina-theme-engine/colors/sand.conf b/src-qt5/core/lumina-theme-engine/colors/sand.conf new file mode 100644 index 00000000..92349195 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/sand.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #000000, #000000, #000000, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 +disabled_colors=#4a4947, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #4a4947, #4a4947, #4a4947, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 +inactive_colors=#000000, #ffffdc, #979797, #5e5c5b, #302f2e, #4a4947, #000000, #000000, #000000, #ffffdc, #ffffdc, #e7e4e0, #5f5b5d, #f9f9f9, #0986d3, #a70b06, #ffffdc, #000000, #3f3f36, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/simple.conf b/src-qt5/core/lumina-theme-engine/colors/simple.conf new file mode 100644 index 00000000..8db9d75b --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/simple.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#000000, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #000000, #ffffff, #000000, #ffffff, #efebe7, #b1aeab, #308cc6, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 +disabled_colors=#bebebe, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #bebebe, #ffffff, #bebebe, #efebe7, #efebe7, #b1aeab, #9f9d9a, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 +inactive_colors=#000000, #efebe7, #ffffff, #cbc7c4, #9f9d9a, #b8b5b2, #000000, #ffffff, #000000, #ffffff, #efebe7, #b1aeab, #308cc6, #ffffff, #0000ff, #ff0000, #f7f5f3, #000000, #ffffdc, #000000 diff --git a/src-qt5/core/lumina-theme-engine/colors/waves.conf b/src-qt5/core/lumina-theme-engine/colors/waves.conf new file mode 100644 index 00000000..7c7b4530 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/colors/waves.conf @@ -0,0 +1,4 @@ +[ColorScheme] +active_colors=#b0b0b0, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #b0b0b0, #b0b0b0, #b0b0b0, #010b2c, #010b2c, #b0b0b0, #302f2e, #b0b0b0, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff +disabled_colors=#808080, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #808080, #808080, #00071d, #00071d, #b0b0b0, #00071d, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff +inactive_colors=#b0b0b0, #010b2c, #979797, #5e5c5b, #302f2e, #4a4947, #b0b0b0, #b0b0b0, #b0b0b0, #010b2c, #010b2c, #b0b0b0, #302f2e, #b0b0b0, #0986d3, #a70b06, #5c5b5a, #ffffff, #0a0a0a, #ffffff diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri index aa8a58bb..40202045 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pri +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri @@ -1,24 +1,11 @@ -#Some conf to redirect intermediate stuff in separate dirs -UI_DIR=./.build/ui/ -MOC_DIR=./.build/moc/ -OBJECTS_DIR=./.build/obj -RCC_DIR=./.build/rcc - -QMAKE_DISTCLEAN += -r .build +QT *= core gui widgets x11extras network +!isEqual (QT_MAJOR_VERSION, 5) { + error("Use Qt 5.4.0 or higher.") +} +include(../../OS-detect.pri) -CONFIG += c++11 +CONFIG *= c++11 #Install paths -unix { - isEmpty(PREFIX) { - PREFIX = /usr/local/ - } - isEmpty(PLUGINDIR) { - PLUGINDIR = $$[QT_INSTALL_PLUGINS] - } - - BINDIR = $$PREFIX/bin - DATADIR = $$PREFIX/share - - DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\" -} + PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS] + DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\" diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro index e3cb47b1..8bad53f6 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro @@ -1,59 +1,23 @@ -QT += core gui widgets x11extras network +QT *= core gui widgets x11extras network !isEqual (QT_MAJOR_VERSION, 5) { error("Use Qt 5.4.0 or higher.") } +include(../../OS-detect.pri) -QMAKE_DISTCLEAN += -r .build - -CONFIG += c++11 +CONFIG *= c++11 desktop.files=src/lthemeengine/ltheme.desktop desktop.path=$${L_SHAREDIR}/applications/ #Install paths -unix { - isEmpty(PREFIX) { - PREFIX = /usr/local - } - isEmpty(PLUGINDIR) { - PLUGINDIR = $$[QT_INSTALL_PLUGINS] - } - - BINDIR = $$PREFIX/bin - DATADIR = $$PREFIX/share - - DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\" -} + PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS] + DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\" TEMPLATE = subdirs SUBDIRS += src/lthemeengine-qtplugin src/lthemeengine-style src/lthemeengine -unix:exists($$[QT_INSTALL_BINS]/lrelease){ -LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease -} - -unix:exists($$[QT_INSTALL_BINS]/lrelease-qt5){ -LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease-qt5 -} - - -isEmpty(LRELEASE_EXECUTABLE){ -error(Could not find lrelease executable) -} -else { -message(Found lrelease executable: $$LRELEASE_EXECUTABLE) -} - -message (PREFIX=$$PREFIX) -message (BINDIR=$$BINDIR) -message (DATADIR=$$DATADIR) -message (PLUGINDIR=$$PLUGINDIR) -equals (DISABLE_WIDGETS,1):message ("QtWidgets are disabled!") - -#Some conf to redirect intermediate stuff in separate dirs -UI_DIR=./.build/ui/ -MOC_DIR=./.build/moc/ -OBJECTS_DIR=./.build/obj -RCC_DIR=./.build/rcc +colors.files = colors/*.conf +colors.path = $${L_SHAREDIR}/lthemeengine/colors +INSTALLS += colors diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro index a186cd49..3dca4fd1 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro @@ -2,7 +2,7 @@ include(../../lthemeengine.pri) TEMPLATE = lib TARGET = lthemeengine -CONFIG += plugin +CONFIG *= plugin greaterThan(QT_MINOR_VERSION, 7) { QT += gui-private theme_support-private diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro index 0b40de64..0f68e7e4 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro @@ -2,11 +2,11 @@ include(../../lthemeengine.pri) TEMPLATE = lib TARGET = lthemeengine-style -QT += widgets +QT *= widgets # Input -CONFIG += plugin +CONFIG *= plugin target.path = $$PLUGINDIR/styles INSTALLS += target diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp index 4d585409..af130ed5 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -190,8 +190,7 @@ void AppearancePage::readSettings(){ m_ui->customPaletteButton->setChecked(settings.value("custom_palette", false).toBool()); QString colorSchemePath = settings.value("color_scheme_path").toString(); QDir("/").mkpath(lthemeengine::userColorSchemePath()); - findColorSchemes(lthemeengine::userColorSchemePath()); - findColorSchemes(lthemeengine::sharedColorSchemePath().join(", ")); + findColorSchemes( QStringList() << lthemeengine::userColorSchemePath() << lthemeengine::sharedColorSchemePath()); if(m_ui->colorSchemeComboBox->count() == 0){ m_customPalette = palette(); //load fallback palette } @@ -223,12 +222,15 @@ void AppearancePage::setPalette(QWidget *w, QPalette p){ w->setPalette(p); } -void AppearancePage::findColorSchemes(const QString &path){ - QDir dir(path); - dir.setFilter(QDir::Files); - dir.setNameFilters(QStringList() << "*.conf"); - foreach (QFileInfo info, dir.entryInfoList()){ - m_ui->colorSchemeComboBox->addItem(info.baseName(), info.filePath()); +void AppearancePage::findColorSchemes(const QStringList &paths){ + for(int i=0; icolorSchemeComboBox->addItem(info.baseName(), info.filePath()); + } } } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h index 23bab52f..21eb5a6d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.h @@ -35,7 +35,7 @@ private: void readSettings(); void setStyle(QWidget *w, QStyle *s); void setPalette(QWidget *w, QPalette p); - void findColorSchemes(const QString &path); + void findColorSchemes(const QStringList &paths); QPalette loadColorScheme(const QString &filePath); void createColorScheme(const QString &name, const QPalette &palette); Ui::AppearancePage *m_ui; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp index 36b0c2fa..fdeb8966 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -6,6 +6,7 @@ #define LTHEMEENGINE_DATADIR "/usr/local/share" #endif +#include QString lthemeengine::configPath(){ return QDir::homePath() + "/.config/lthemeengine/"; @@ -46,7 +47,8 @@ QStringList lthemeengine::sharedStyleSheetPath(){ QStringList dirs; dirs << QString(getenv("XDG_CONFIG_HOME")); dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); - for(int i=0; iQT_STYLE_OVERRIDE environment variable"); } - if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){ errorMessages << app.translate("main", "The QT_QPA_PLATFORMTHEME environment variable is not set correctly"); } + //if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine"){ errorMessages << app.translate("main", "The QT_QPA_PLATFORMTHEME environment variable is not set correctly"); } if(!QStyleFactory::keys().contains("lthemeengine-style")){ errorMessages << app.translate("main", "Unable to find liblthemeengine-style.so"); } if(!errorMessages.isEmpty()){ QMessageBox::critical(0, app.translate("main", "Error"), errorMessages.join("

")); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp index d690ef5d..414273be 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -95,8 +95,7 @@ void QSSPage::on_removeButton_clicked(){ void QSSPage::readSettings(){ //load stylesheets m_ui->qssListWidget->clear(); - findStyleSheets(lthemeengine::userStyleSheetPath()); - findStyleSheets(lthemeengine::sharedStyleSheetPath().join(", ")); + findStyleSheets(QStringList() << lthemeengine::userStyleSheetPath() << lthemeengine::sharedStyleSheetPath()); QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QStringList styleSheets = settings.value("Interface/stylesheets").toStringList(); for(int i = 0; i < m_ui->qssListWidget->count(); ++i){ @@ -106,16 +105,19 @@ void QSSPage::readSettings(){ } } -void QSSPage::findStyleSheets(const QString &path){ - QDir dir(path); - dir.setFilter(QDir::Files); - dir.setNameFilters(QStringList() << "*.qss"); - foreach (QFileInfo info, dir.entryInfoList()){ - QListWidgetItem *item = new QListWidgetItem(info.fileName(), m_ui->qssListWidget); - item->setToolTip(info.filePath()); - item->setData(QSS_FULL_PATH_ROLE, info.filePath()); - item->setData(QSS_WRITABLE_ROLE, info.isWritable()); +void QSSPage::findStyleSheets(const QStringList &paths){ + for(int i=0; iqssListWidget); + item->setToolTip(info.filePath()); + item->setData(QSS_FULL_PATH_ROLE, info.filePath()); + item->setData(QSS_WRITABLE_ROLE, info.isWritable()); } + } } void QSSPage::on_renameButton_clicked(){ diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h index 1fe0ed73..884f9a93 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.h @@ -30,7 +30,7 @@ private slots: private: void readSettings(); - void findStyleSheets(const QString &path); + void findStyleSheets(const QStringList &paths); Ui::QSSPage *m_ui; QMenu *m_menu; }; -- cgit From 9787abdd5bc1378c7252ae710dc58ad582b447df Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 3 Aug 2017 12:25:14 -0400 Subject: Fix up a bit more of the lumina-theme-engine 1. Adjust the build directories for all projects 2. Add lumina-theme-engine to the "core" meta-project 3. flip the names of the "dusk" and "darker" color schemes 4. Add a simple drop-down menu for standard colors when editing a stylesheet 5. Ensure the find colors/qss routines skip duplicate directory entries --- src-qt5/OS-detect.pri | 10 +++--- src-qt5/core/core.pro | 5 +-- .../core/lumina-theme-engine/colors/darker.conf | 6 ++-- src-qt5/core/lumina-theme-engine/colors/dusk.conf | 6 ++-- src-qt5/core/lumina-theme-engine/lthemeengine.pro | 23 ------------- .../lumina-theme-engine/lumina-theme-engine.pro | 11 ++++++ .../src/lthemeengine/appearancepage.cpp | 3 +- .../src/lthemeengine/appearancepage.h | 2 +- .../src/lthemeengine/lthemeengine.pro | 2 +- .../src/lthemeengine/qsseditordialog.cpp | 30 ++++++++++++++++ .../src/lthemeengine/qsseditordialog.h | 5 +++ .../src/lthemeengine/qsseditordialog.ui | 40 +++++++++++++++++----- .../src/lthemeengine/qsspage.cpp | 3 +- .../lumina-theme-engine/src/lthemeengine/qsspage.h | 2 +- 14 files changed, 99 insertions(+), 49 deletions(-) delete mode 100644 src-qt5/core/lumina-theme-engine/lthemeengine.pro create mode 100644 src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index 76d09642..8b7b0bc0 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -121,9 +121,9 @@ isEmpty(OS){ } #Some conf to redirect intermediate stuff in separate dirs - UI_DIR=$${PWD}/.build/ui/ - MOC_DIR=$${PWD}/.build/moc/ - OBJECTS_DIR=$${PWD}/.build/obj - RCC_DIR=$${PWD}/.build/rcc - QMAKE_DISTCLEAN += -r $${PWD}/.build + UI_DIR=./.build/ui/ + MOC_DIR=./.build/moc/ + OBJECTS_DIR=./.build/obj + RCC_DIR=./.build/rcc + QMAKE_DISTCLEAN += -r ./.build } diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro index 4878b1f3..0f635960 100644 --- a/src-qt5/core/core.pro +++ b/src-qt5/core/core.pro @@ -8,9 +8,10 @@ SUBDIRS+= lumina-desktop \ lumina-session \ lumina-open \ lumina-info \ - $${PWD}/../../icon-theme -# lumina-wm-INCOMPLETE \ + $${PWD}/../../icon-theme \ + lumina-theme-engine # lumina-checkpass +# lumina-desktop-unified #Also install any special menu scripts scripts.path = $${L_SHAREDIR}/lumina-desktop/menu-scripts diff --git a/src-qt5/core/lumina-theme-engine/colors/darker.conf b/src-qt5/core/lumina-theme-engine/colors/darker.conf index 5186ecef..9c822b60 100644 --- a/src-qt5/core/lumina-theme-engine/colors/darker.conf +++ b/src-qt5/core/lumina-theme-engine/colors/darker.conf @@ -1,4 +1,4 @@ [ColorScheme] -active_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 -disabled_colors=#bebebe, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #bebebe, #ffffff, #bebebe, #7f7f7f, #7f7f7f, #b1aeab, #7f7f7f, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 -inactive_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +active_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +disabled_colors=#808080, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #ffffff, #808080, #3d3d3d, #222020, #e7e4e0, #12608a, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +inactive_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff diff --git a/src-qt5/core/lumina-theme-engine/colors/dusk.conf b/src-qt5/core/lumina-theme-engine/colors/dusk.conf index 9c822b60..5186ecef 100644 --- a/src-qt5/core/lumina-theme-engine/colors/dusk.conf +++ b/src-qt5/core/lumina-theme-engine/colors/dusk.conf @@ -1,4 +1,4 @@ [ColorScheme] -active_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff -disabled_colors=#808080, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #808080, #ffffff, #808080, #3d3d3d, #222020, #e7e4e0, #12608a, #808080, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff -inactive_colors=#ffffff, #424245, #979797, #5e5c5b, #302f2e, #4a4947, #ffffff, #ffffff, #ffffff, #3d3d3d, #222020, #e7e4e0, #12608a, #f9f9f9, #0986d3, #a70b06, #5c5b5a, #ffffff, #3f3f36, #ffffff +active_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +disabled_colors=#bebebe, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #bebebe, #ffffff, #bebebe, #7f7f7f, #7f7f7f, #b1aeab, #7f7f7f, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 +inactive_colors=#000000, #7f7f7f, #ffffff, #cbc7c4, #7f7f7f, #b8b5b2, #000000, #ffffff, #000000, #7f7f7f, #7f7f7f, #707070, #308cc6, #ffffff, #0000ff, #ff00ff, #7f7f7f, #000000, #7f7f7f, #000000 diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro deleted file mode 100644 index 8bad53f6..00000000 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro +++ /dev/null @@ -1,23 +0,0 @@ -QT *= core gui widgets x11extras network -!isEqual (QT_MAJOR_VERSION, 5) { - error("Use Qt 5.4.0 or higher.") -} -include(../../OS-detect.pri) - -CONFIG *= c++11 - -desktop.files=src/lthemeengine/ltheme.desktop -desktop.path=$${L_SHAREDIR}/applications/ - -#Install paths - PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS] - DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\" - -TEMPLATE = subdirs - -SUBDIRS += src/lthemeengine-qtplugin src/lthemeengine-style src/lthemeengine - -colors.files = colors/*.conf -colors.path = $${L_SHAREDIR}/lthemeengine/colors - -INSTALLS += colors diff --git a/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro b/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro new file mode 100644 index 00000000..d91091d3 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro @@ -0,0 +1,11 @@ +include(../../OS-detect.pri) + +TEMPLATE = subdirs +SUBDIRS += src/lthemeengine-qtplugin \ + src/lthemeengine-style \ + src/lthemeengine + +colors.files = colors/*.conf +colors.path = $${L_SHAREDIR}/lthemeengine/colors + +INSTALLS += colors diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp index af130ed5..04ca6a0b 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -222,7 +222,8 @@ void AppearancePage::setPalette(QWidget *w, QPalette p){ w->setPalette(p); } -void AppearancePage::findColorSchemes(const QStringList &paths){ +void AppearancePage::findColorSchemes(QStringList paths){ + paths.removeDuplicates(); for(int i=0; itool_color); + for(int i=0; iaddAction( colors[i].section("::::",0,0) )->setWhatsThis(colors[i].section("::::",1,1) ); } + m_ui->tool_color->setMenu(colorMenu); + connect(colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorPicked(QAction*)) ); } QSSEditorDialog::~QSSEditorDialog(){ @@ -39,3 +63,9 @@ void QSSEditorDialog::on_buttonBox_clicked(QAbstractButton *button){ else if(id == QDialogButtonBox::Save){ save(); } else{ reject(); } } + +void QSSEditorDialog::colorPicked(QAction* act){ + QString id = act->whatsThis(); + if(id.isEmpty()){ return; } + m_ui->textEdit->insertPlainText( QString("palette(%1)").arg(id) ); +} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h index ea615e81..114611fe 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.h @@ -3,6 +3,8 @@ #include #include +#include +#include namespace Ui { class QSSEditorDialog; @@ -20,12 +22,15 @@ public: private slots: void on_buttonBox_clicked(QAbstractButton *button); + void colorPicked(QAction*); private: void save(); void hideEvent(QHideEvent *); Ui::QSSEditorDialog *m_ui; QString m_filePath; + QMenu *colorMenu; + }; #endif // QSSEDITORDIALOG_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui index 7627b4d4..f75a21c6 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.ui @@ -31,14 +31,38 @@ - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Save - - + + + + + Palette + + + + .. + + + QToolButton::InstantPopup + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Save + + + + diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp index 414273be..2cf0f221 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -105,7 +105,8 @@ void QSSPage::readSettings(){ } } -void QSSPage::findStyleSheets(const QStringList &paths){ +void QSSPage::findStyleSheets(QStringList paths){ + paths.removeDuplicates(); for(int i=0; i Date: Thu, 3 Aug 2017 13:36:21 -0400 Subject: Get the icon loading routines all switched over to the old QIcon::fromTheme() routine now that we have a theme engine available out-of-box. --- port-files/FreeBSD/x11/lumina-core/pkg-plist | 10 ++++++++++ src-qt5/core/libLumina/LIconCache.cpp | 26 ++++++++++++++++++++++++-- src-qt5/core/libLumina/LIconCache.h | 3 +++ src-qt5/core/libLumina/LuminaXDG.cpp | 18 ++++++++++++------ 4 files changed, 49 insertions(+), 8 deletions(-) diff --git a/port-files/FreeBSD/x11/lumina-core/pkg-plist b/port-files/FreeBSD/x11/lumina-core/pkg-plist index 58828828..dbb933ec 100644 --- a/port-files/FreeBSD/x11/lumina-core/pkg-plist +++ b/port-files/FreeBSD/x11/lumina-core/pkg-plist @@ -1,11 +1,15 @@ +bin/lthemeengine bin/lumina-desktop bin/lumina-info bin/lumina-open bin/start-lumina-desktop etc/luminaDesktop.conf.dist +lib/qt5/plugins/platformthemes/liblthemeengine.so +lib/qt5/plugins/styles/liblthemeengine-style.so man/man1/lumina-open.1.gz man/man8/lumina-desktop.8.gz man/man8/start-lumina-desktop.8.gz +share/application/lthemeengine.desktop share/applications/lumina-info.desktop share/applications/lumina-support.desktop share/icons/material-design-dark/LICENSE @@ -1634,6 +1638,12 @@ share/icons/material-design-light/scalable/status/weather-showers.svg share/icons/material-design-light/scalable/status/weather-snow.svg share/icons/material-design-light/scalable/status/weather-storm.svg share/icons/material-design-light/scalable/status/weather-windy.svg +share/lthemeengine/colors/airy.conf +share/lthemeengine/colors/darker.conf +share/lthemeengine/colors/dusk.conf +share/lthemeengine/colors/sand.conf +share/lthemeengine/colors/simple.conf +share/lthemeengine/colors/waves.conf share/lumina-desktop/Login.ogg share/lumina-desktop/Logout.ogg share/lumina-desktop/colors/Black.qss.colors diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index 38367cef..9d122df7 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -80,7 +80,7 @@ QString LIconCache::findFile(QString icon){ fall << getChildIconDirs(paths[i]+"hicolor"); //XDG fallback (apps add to this) } //Now load all the icon theme dependencies in order (Theme1 -> Theme2 -> Theme3 -> Fallback) - + //fall << LOS::AppPrefix()+"share/pixmaps"; //always use this as well as a final fallback QDir::setSearchPaths("icontheme", theme); QDir::setSearchPaths("default", oxy); @@ -121,6 +121,10 @@ QString LIconCache::findFile(QString icon){ void LIconCache::loadIcon(QAbstractButton *button, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + button->setIcon( iconFromTheme(icon)); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -138,6 +142,10 @@ void LIconCache::loadIcon(QAbstractButton *button, QString icon, bool noThumb){ void LIconCache::loadIcon(QAction *action, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + action->setIcon( iconFromTheme(icon)); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -155,6 +163,10 @@ void LIconCache::loadIcon(QAction *action, QString icon, bool noThumb){ void LIconCache::loadIcon(QLabel *label, QString icon, bool noThumb){ if(icon.isEmpty()){ return; } + if(isThemeIcon(icon)){ + label->setPixmap( iconFromTheme(icon).pixmap(label->sizeHint()) ); + return ; + } //See if the icon has already been loaded into the HASH bool needload = !HASH.contains(icon); if(!needload){ @@ -164,7 +176,7 @@ void LIconCache::loadIcon(QLabel *label, QString icon, bool noThumb){ //Need to load the icon icon_data idata; if(HASH.contains(icon)){ idata = HASH.value(icon); } - else { idata = createData(icon); + else { idata = createData(icon); if(idata.fullpath.isEmpty()){ return; } //nothing to do } idata.pendingLabels << QPointer(label); //save this QLabel for later @@ -183,6 +195,8 @@ void LIconCache::clearIconTheme(){ QIcon LIconCache::loadIcon(QString icon, bool noThumb){ if(icon.isEmpty()){ return QIcon(); } + if(isThemeIcon(icon)){ return iconFromTheme(icon); } + if(HASH.contains(icon)){ if(!HASH[icon].icon.isNull()){ return HASH[icon].icon; } else if(!HASH[icon].thumbnail.isNull() && !noThumb){ return HASH[icon].thumbnail; } @@ -290,6 +304,14 @@ void LIconCache::ReadFile(LIconCache *obj, QString id, QString path){ obj->emit InternalIconLoaded(id, cdt, BA); } +bool LIconCache::isThemeIcon(QString id){ + return (!id.contains("/") && !id.contains(".") ); +} + +QIcon LIconCache::iconFromTheme(QString id){ + return QIcon::fromTheme(id); +} + // === PRIVATE SLOTS === void LIconCache::IconLoaded(QString id, QDateTime sync, QByteArray *data){ //qDebug() << "Icon Loaded:" << id << HASH.contains(id); diff --git a/src-qt5/core/libLumina/LIconCache.h b/src-qt5/core/libLumina/LIconCache.h index f58a5510..428ffcab 100644 --- a/src-qt5/core/libLumina/LIconCache.h +++ b/src-qt5/core/libLumina/LIconCache.h @@ -67,6 +67,9 @@ private: void startReadFile(QString id, QString path); void ReadFile(LIconCache *obj, QString id, QString path); + bool isThemeIcon(QString id); + QIcon iconFromTheme(QString id); + private slots: void IconLoaded(QString id, QDateTime sync, QByteArray *data); diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index 8da39564..fed998a2 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -723,7 +723,7 @@ QList LXDG::sortDesktopNames(QList apps){ //Sort the list by name of the application QHash sorter; for(int i=0; iname.toLower(), apps[i]); + sorter.insert(apps[i]->name.toLower(), apps[i]); } QStringList keys = sorter.keys(); keys.sort(); @@ -746,16 +746,22 @@ void LXDG::setEnvironmentVars(){ } QIcon LXDG::findIcon(QString iconName, QString fallback){ + //With the addition of the Lumina theme engine (8/3/17), switch back to using the Qt icon from theme method for apps + QIcon tmp = QIcon::fromTheme(iconName); + if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } + return tmp; + + //NOTE: This was re-written on 11/10/15 to avoid using the QIcon::fromTheme() framework // -- Too many issues with SVG files and/or search paths with the built-in system - + //Check if the icon is an absolute path and exists bool DEBUG =false; if(DEBUG){ qDebug() << "[LXDG] Find icon for:" << iconName; } if(QFile::exists(iconName) && iconName.startsWith("/")){ return QIcon(iconName); } else if(iconName.startsWith("/")){ iconName.section("/",-1); } //Invalid absolute path, just look for the icon //Check if the icon is actually given - if(iconName.isEmpty()){ + if(iconName.isEmpty()){ if(fallback.isEmpty()){ return QIcon(); } else{ return LXDG::findIcon(fallback, ""); } } @@ -763,9 +769,9 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ if(DEBUG){ qDebug() << "[LXDG] Start search for icon"; } //Get the currently-set theme QString cTheme = QIcon::themeName(); - if(cTheme.isEmpty()){ - QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + if(cTheme.isEmpty()){ + QIcon::setThemeName("material-design-light"); + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ -- cgit From 4530400268bf9a8749513e69a7bfb574fca20f09 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 3 Aug 2017 14:03:29 -0400 Subject: Cleanup some fallback routines for loading icons from the Qt theme methods. --- src-qt5/core/libLumina/LIconCache.cpp | 13 +++++++++---- src-qt5/core/libLumina/LuminaXDG.cpp | 9 ++++++--- .../lthemeengineplatformtheme.cpp | 21 +++++++++++++++++---- .../lthemeengineplatformtheme.h | 2 +- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index 9d122df7..bb81bc47 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -55,9 +55,9 @@ QString LIconCache::findFile(QString icon){ if(icon.isEmpty()){ return ""; } //Get the currently-set theme QString cTheme = QIcon::themeName(); - if(cTheme.isEmpty()){ - QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + if(cTheme.isEmpty()){ + QIcon::setThemeName("material-design-light"); + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ @@ -309,7 +309,12 @@ bool LIconCache::isThemeIcon(QString id){ } QIcon LIconCache::iconFromTheme(QString id){ - return QIcon::fromTheme(id); + QIcon ico = QIcon::fromTheme(id); + if(ico.isNull()){ + //icon missing in theme? run the old icon-finder system + ico = QIcon(findFile(id)); + } + return ico; } // === PRIVATE SLOTS === diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index fed998a2..01b3305e 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -747,9 +747,12 @@ void LXDG::setEnvironmentVars(){ QIcon LXDG::findIcon(QString iconName, QString fallback){ //With the addition of the Lumina theme engine (8/3/17), switch back to using the Qt icon from theme method for apps - QIcon tmp = QIcon::fromTheme(iconName); - if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } - return tmp; + QIcon tmp; + if(!iconName.contains("libreoffice")){ //libreoffice is stupid - their svg icons are un-renderable with Qt + tmp = QIcon::fromTheme(iconName); + if(tmp.isNull()){ tmp = QIcon::fromTheme(fallback); } + } + if(!tmp.isNull()){ return tmp; } //found one in the theme //NOTE: This was re-written on 11/10/15 to avoid using the QIcon::fromTheme() framework diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index 9d6c9bea..453bde1d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -70,7 +70,7 @@ QPlatformSystemTrayIcon *lthemeenginePlatformTheme::createPlatformSystemTrayIcon QDBusMenuConnection conn; m_dbusTrayAvailable = conn.isStatusNotifierHostRegistered(); m_checkDBusTray = false; - qCDebug(llthemeengine) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); + //qCDebug(llthemeengine) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); } return (m_dbusTrayAvailable ? new QDBusTrayIcon() : nullptr); } @@ -177,10 +177,10 @@ void lthemeenginePlatformTheme::readSettings(){ settings.beginGroup("Appearance"); m_style = settings.value("style", "Fusion").toString(); if(settings.value("custom_palette", false).toBool()){ - QString schemePath = settings.value("color_scheme_path").toString(); + QString schemePath = settings.value("color_scheme_path","airy").toString(); m_customPalette = new QPalette(loadColorScheme(schemePath)); } - m_iconTheme = settings.value("icon_theme").toString(); + m_iconTheme = settings.value("icon_theme", "material-design-light").toString(); settings.endGroup(); settings.beginGroup("Fonts"); m_generalFont = settings.value("general", QPlatformTheme::font(QPlatformTheme::SystemFont)).value(); @@ -237,7 +237,20 @@ QString lthemeenginePlatformTheme::loadStyleSheets(const QStringList &paths){ return content; } -QPalette lthemeenginePlatformTheme::loadColorScheme(const QString &filePath){ +QPalette lthemeenginePlatformTheme::loadColorScheme(QString filePath){ + if(!filePath.contains("/") && !filePath.endsWith(".conf") && !filePath.isEmpty()){ + //relative theme name, auto-complete it + QStringList dirs; + dirs << getenv("XDG_CONFIG_HOME"); + dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":"); + dirs << QString(getenv("XDG_DATA_DIRS")).split(":"); + QString relpath = "/lthemeengine/colors/%1.conf"; + relpath = relpath.arg(filePath); + for(int i=0; i Date: Thu, 3 Aug 2017 14:09:25 -0400 Subject: Setup the Lumina 1.x desktop to use the new theme engine by default --- src-qt5/core/lumina-desktop-unified/main.cpp | 2 +- src-qt5/core/lumina-desktop/main.cpp | 4 ++-- src-qt5/core/lumina-session/session.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src-qt5/core/lumina-desktop-unified/main.cpp b/src-qt5/core/lumina-desktop-unified/main.cpp index 8e40f7eb..ef15cfcd 100644 --- a/src-qt5/core/lumina-desktop-unified/main.cpp +++ b/src-qt5/core/lumina-desktop-unified/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char ** argv) setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); setenv("QT_NO_GLIB", "1", 1); //Disable the glib event loop within Qt at runtime (performance hit + bugs) - unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... + //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //need exact-pixel measurements (no fake scaling) //Startup the session diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp index 1b0e5e4d..6017cad7 100644 --- a/src-qt5/core/lumina-desktop/main.cpp +++ b/src-qt5/core/lumina-desktop/main.cpp @@ -72,8 +72,8 @@ int main(int argc, char ** argv) LXDG::setEnvironmentVars(); setenv("DESKTOP_SESSION","Lumina",1); setenv("XDG_CURRENT_DESKTOP","Lumina",1); - unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... - //setenv("QT_QPA_PLATFORMTHEME", "lthemeengine"); + //unsetenv("QT_QPA_PLATFORMTHEME"); //causes issues with Lumina themes - not many people have this by default... + setenv("QT_QPA_PLATFORMTHEME", "lthemeengine", 1); unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //causes pixel-specific scaling issues with the desktop - turn this on after-the-fact for other apps //Startup the session LSession a(argc, argv); diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 48a25a8f..f9c8060a 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -85,6 +85,12 @@ void LSession::start(bool unified){ if(!LUtils::isValidBinary("lumina-desktop") ){ exit(1); } + setenv("DESKTOP_SESSION","Lumina",1); + setenv("XDG_CURRENT_DESKTOP","Lumina",1); + setenv("QT_QPA_PLATFORMTHEME","lthemeengine", true); + setenv("QT_NO_GLIB", "1", 1); //Disable the glib event loop within Qt at runtime (performance hit + bugs) + unsetenv("QT_AUTO_SCREEN_SCALE_FACTOR"); //need exact-pixel measurements (no fake scaling) + if(!unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); -- cgit From 0e52cc4ec5287efd7cd039aac946e2c19c485b5b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 4 Aug 2017 12:48:15 -0400 Subject: Update the browser to multi-thread *all* file loading, not just thumbnails. --- src-qt5/desktop-utils/lumina-fm/Browser.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index adfe6162..f2bdc178 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -97,13 +97,13 @@ void Browser::futureFinished(QString name, QImage icon){ QIcon ico; //LFileInfo info(name); LFileInfo *info = new LFileInfo(name); - if(!icon.isNull()){ + if(!icon.isNull() && showThumbs){ //qDebug() << " -- Data:"; QPixmap pix = QPixmap::fromImage(icon); ico.addPixmap(pix); - }else if(info->isDir()){ + //}else if(info->isDir()){ //qDebug() << " -- Folder:"; - ico = loadIcon("folder"); + //ico = loadIcon("folder"); } if(ico.isNull()){ //qDebug() << " -- MimeType:" << info.fileName() << info.mimetype(); @@ -141,12 +141,12 @@ void Browser::loadDirectory(QString dir){ QString path = directory.absoluteFilePath(files[i]); if(old.contains(path)){ old.removeAll(path); } oldFiles << path; //add to list for next time - if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){ + //if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){ QtConcurrent::run(this, &Browser::loadItem, path, this); - }else{ + /*}else{ //No special icon loading - just skip the file read step futureFinished(path, QImage()); //loadItem(path, this); - } + }*/ } watcher->addPath(directory.absolutePath()); if(!old.isEmpty()){ -- cgit From 341df0b37ae8d9422ff594eee993261e2156d859 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 4 Aug 2017 12:49:03 -0400 Subject: Update the version tag in the mkport.sh script --- mkport.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkport.sh b/mkport.sh index 85d038ab..fac09073 100755 --- a/mkport.sh +++ b/mkport.sh @@ -4,7 +4,7 @@ # Set the port dfile="lumina" -VERSION="1.3.0" +VERSION="1.3.1" massage_subdir() { cd "$1" -- cgit From 560a35578032174163cdf99bdd7ea5b7a1da137a Mon Sep 17 00:00:00 2001 From: q5sys Date: Fri, 4 Aug 2017 13:12:46 -0400 Subject: fix for clock minimum width --- src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp index bdf9b27e..db661841 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -102,7 +102,7 @@ void LClock::updateTime(bool adjustformat){ lwid = metrics.width(lines[i]); if(lwid>wid){ wid = lwid; } } - this->setMinimumWidth( wid - (4*metrics.width("O")) ); + this->setMinimumWidth(wid); this->setMaximumWidth(wid + (4*metrics.width("O"))); }else{ //vertical layout -- cgit From ee494111f41ed0c5ab7b43d30f76bdb44cadfa5e Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Fri, 4 Aug 2017 17:00:14 -0400 Subject: Added an experimental VideoSlideshow screensaver plus fixes --- .../src-screensaver/animations/BaseAnimGroup.cpp | 8 +- .../src-screensaver/animations/Grav.h | 69 +++++----- .../src-screensaver/animations/ImageSlideshow.h | 140 +++++++++++++++++++++ .../src-screensaver/animations/Text.h | 9 +- .../src-screensaver/animations/VideoSlideshow.h | 102 +++++++++++++++ .../src-screensaver/animations/animations.pri | 2 + 6 files changed, 290 insertions(+), 40 deletions(-) create mode 100644 src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h create mode 100644 src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp index aaae8b41..7fc4eb50 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp @@ -12,6 +12,8 @@ #include "Grav.h" #include "SampleAnimation.h" #include "Text.h" +#include "ImageSlideshow.h" +#include "VideoSlideshow.h" //============================== // PLUGIN LOADING/LISTING @@ -24,6 +26,10 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti return (new GravAnimation(parent, set)); }else if(type == "text") { return (new TextAnimation(parent, set)); + }else if(type == "imageSlideshow") { + return (new ImageAnimation(parent, set)); + }else if(type == "videoSlideshow") { + return (new VideoAnimation(parent, set)); }else { //Unknown screensaver, return a blank animation group return (new BaseAnimGroup(parent, set)); @@ -31,5 +37,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti } QStringList BaseAnimGroup::KnownAnimations(){ - return (QStringList() << "grav"); + return (QStringList() << "videoSlideshow" /*<< "grav" << "text" << "imageSlideshow" << "fireflies"*/); } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h index ec1de914..50d733e9 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h @@ -9,10 +9,8 @@ //PI is equal to 2*pi #define PI 6.2832 - #include "global-includes.h" #include "BaseAnimGroup.h" -#include #include #include @@ -32,44 +30,53 @@ private: radius = qSqrt( (qPow(start.x()-ref->x(),2) + qPow(start.y()-ref->y(),2) )); //Number of frames in animation. Increase for smother motion - double step = 1000.0; + double step = 300.0; //Random values that give the eliptical pattern to the orbit. Between 0.4 and 2.3 - double xrand = (qrand()%20+4)/10.0; - double yrand = (qrand()%20+4)/10.0; - - QPoint firstP = QPoint(ref->x() + xrand*start.x()*(qCos(0/step) -qSin(0/step)), ref->y() + yrand*start.y()*(qCos(0/step) -qSin(0/step))); - QPoint lastP = QPoint(ref->x() + xrand*start.x()*(qCos(PI/step) -qSin(PI/step)), ref->y() + yrand*start.y()*(qCos(PI/step) -qSin(PI/step))); - orbit->setKeyValueAt(0, firstP); - orbit->setKeyValueAt(1, lastP); + double xrand = 0.4; //(qrand()%10+4)/10.0; + double yrand = 0.4; //(qrand()%10+4)/10.0; + + double theta = 1.5707963; + //double theta = aTan((start.x() - ref->x())/(start.y() - ref->y())); + QMatrix rotation = QMatrix(qCos(theta), qSin(theta), -qSin(theta), qCos(theta), -ref->x(), -ref->y()); + qDebug() << rotation; + //qDebug() << "Starting Point" << start; + //qDebug() << "Angle" << theta; + //qDebug() << "Distance" << radius; + //qDebug() << "Center" << *ref; + + QPoint firstP = (QPoint(ref->x() + xrand*start.x()*(qCos(0/step) -qSin(0/step)), ref->y() + yrand*start.y()*(qCos(0/step) -qSin(0/step)))); + QPoint rotFP = rotation.map(firstP); + qDebug() << "First Point" << firstP; + qDebug() << "Rotation by Matrix" << rotFP; + QPoint lastP = (QPoint(ref->x() + xrand*start.x()*(qCos(PI/step) -qSin(PI/step)), ref->y() + yrand*start.y()*(qCos(PI/step) -qSin(PI/step)))); + orbit->setKeyValueAt(0, firstP); + orbit->setKeyValueAt(1, lastP); //path.push_back(firstP); //Loops through all steps and creates all the points of the orbit for(int i=1; ix() + xrand*start.x()*(qCos((PI*i)/step) -qSin((PI*i)/step)); - double newY = ref->y() + yrand*start.y()*(qSin((PI*i)/step) + qCos((PI*i)/step)); - - //Calculates the radius from the sun as the distance between the points - radius = (qSqrt( (qPow(newX-ref->x(),2) + qPow(newY-ref->y(),2) ))); + double newX = ref->x() + xrand*start.x()*(qCos((PI*i)/step) - qSin((PI*i)/step)); + double newY = ref->y() + yrand*start.y()*(qSin((PI*i)/step) + qCos((PI*i)/step)); //Creates a new point and creates a key as part of the animation - QPoint newLoc = QPoint(newX, newY); - orbit->setKeyValueAt(i/step, newLoc); + QPoint newLoc = (QPoint(newX, newY)); + orbit->setKeyValueAt(i/step, newLoc); //path.push_back(newLoc); } //Sets the time for a full orbit. Increasing makes the orbit slower. //path.push_back(lastP); } private slots: - void LoopChanged(int loop){ + /*void LoopChanged(int loop){ //Adjust the orbit animation a bit - /*if(loop >= 0) { + if(loop >= 0) { orbit->setStartValue(orbit->endValue()); //start at the previous end point orbit->setEndValue(path.at(loop%1000)); orbit->setDuration(10); - }*/ - } + } + }*/ void stopped(){ qDebug() << "Planet stopped"; planet->hide();} public: @@ -96,22 +103,18 @@ public: QRect invalid = QRect(center+QPoint(-50,-50), center+QPoint(50,50)); QPoint tmp = center; while(invalid.contains(tmp)){ - int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; - int randheight= qrand()%(range.height()- 2*planet_radius) + planet_radius; + int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; + int randheight = qrand()%(range.height()- 2*planet_radius) + planet_radius; tmp = QPoint(randwidth, randheight); } - /*double tmpDistance = qSqrt((qPow((tmp.x()-center.x()), 2) + qPow((tmp.y()-center.y()), 2))); - double theta = qAsin(qAbs(tmp.y()-center.y())/tmpDistance); - QMatrix rotation = QMatrix(qCos(theta), qSin(theta), -qSin(theta), qCos(theta), -center.x(), -center.y());*/ - //Creates all frames for the animation setupLoop(tmp, ¢er); this->addAnimation(orbit); planet->show(); //Ensures the screensaver will not stop until the user wishes to login or it times out - this->setLoopCount(5); //number of orbits + this->setLoopCount(1); //number of orbits orbit->setDuration( qrand() %1000 + 19000); //20 second orbits //orbit->setEndValue(path.at(0)); //LoopChanged(0); //load initial values @@ -138,13 +141,14 @@ private slots: for(int i=0; ianimationCount(); i++){ if(this->animationAt(i)->state()==QAbstractAnimation::Running){ running++; } } - if(running<=1){ wobble->stop(); emit wobble->finished();} + if(running<=1){ wobble->stop(); emit wobble->finished();} } public: GravAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} ~GravAnimation(){ - //this->stop(); + sun->deleteLater(); + while(planets.length()>0){ planets.takeAt(0)->deleteLater(); } } void LoadAnimations(){ @@ -152,8 +156,8 @@ public: sun = new QWidget(canvas); QPoint center = canvas->geometry().center(); QString sunstyle = QStringLiteral("background-color:qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, ") + - QStringLiteral("stop:0 rgba(0, 0, 0, 0), stop:0.38 rgba(0, 0, 0, 0), stop:0.4 rgba(82, 121, 76, 33), stop:0.5 rgba(159, 235, 148, 64), ") + - QStringLiteral("stop:0.6 rgba(255, 238, 150, 129), stop:0.7 rgba(0, 0, 0, 0));"); + QStringLiteral("stop:0 rgba(0, 0, 0, 0), stop:0.38 rgba(0, 0, 0, 0), stop:0.4 rgba(82, 121, 76, 33), stop:0.5 rgba(159, 235, 148, 64), ") + + QStringLiteral("stop:0.6 rgba(255, 238, 150, 129), stop:0.7 rgba(0, 0, 0, 0));"); sun->setStyleSheet(sunstyle); //Creates the sun's pulsing animation @@ -170,7 +174,6 @@ public: this->addAnimation(wobble); sun->show(); sun->setGeometry(initgeom); - while(planets.length()>0){ planets.takeAt(0)->deleteLater(); } //Gives the screensaver a black background canvas->setStyleSheet("background: black;"); diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h new file mode 100644 index 00000000..4abc3ae7 --- /dev/null +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h @@ -0,0 +1,140 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_IMAGESLIDESHOW_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_IMAGESLIDESHOW_ANIMATION_H + +#include "global-includes.h" +#include "BaseAnimGroup.h" + +class ImageSlideshow: public QParallelAnimationGroup{ + Q_OBJECT +private: + QLabel *image; + QPropertyAnimation *bounce, *fading; + QPixmap pixmap; + QStringList imageFiles; + QString imagePath; + QSize screenSize; + bool animate; + +private: + void setupAnimation() { + //Choose between starting from top or bottom at random + if(qrand() % 2) { + bounce->setKeyValueAt(0, QPoint(0,screenSize.height()-image->height())); + bounce->setKeyValueAt(0.25, QPoint((screenSize.width()-image->width())/2,0)); + bounce->setKeyValueAt(0.5, QPoint(screenSize.width()-image->width(),screenSize.height()-image->height())); + bounce->setKeyValueAt(0.75, QPoint((screenSize.width()-image->width())/2,0)); + bounce->setKeyValueAt(1, QPoint(0,screenSize.height()-image->height())); + }else{ + bounce->setKeyValueAt(0, QPoint(0,0)); + bounce->setKeyValueAt(0.25, QPoint((screenSize.width()-image->width())/2,screenSize.height()-image->height())); + bounce->setKeyValueAt(0.5, QPoint(screenSize.width()-image->width(),0)); + bounce->setKeyValueAt(0.75, QPoint((screenSize.width()-image->width())/2,screenSize.height()-image->height())); + bounce->setKeyValueAt(1, QPoint(0,0)); + } + } + + void chooseImage() { + QString randomFile = imagePath+imageFiles[qrand() % imageFiles.size()]; + + //Choose a new file if the chosen one is not an image + while(QImageReader::imageFormat(randomFile).isEmpty()) + randomFile = imagePath+imageFiles[qrand() % imageFiles.size()]; + pixmap.load(imagePath+imageFiles[qrand() % imageFiles.size()]); + + //If the image is larger than the screen, then shrink the image down to 3/4 it's size (so there's still some bounce) + //Scale the pixmap to keep the aspect ratio instead of resizing the label itself + if(pixmap.width() > screenSize.width() or pixmap.height() > screenSize.height()) + pixmap = pixmap.scaled(screenSize*(3.0/4.0), Qt::KeepAspectRatio); + + //Set pixmap to the image label + image->setPixmap(pixmap); + image->resize(pixmap.size()); + } + +private slots: + void LoopChanged(){ + //Load a new random image. Resize the label based on the image's size + chooseImage(); + setupAnimation(); + } + void stopped(){ qDebug() << "Image Stopped"; image->hide();} + +public: + ImageSlideshow(QWidget *parent, QString path, bool animate) : QParallelAnimationGroup(parent){ + imagePath = path; + image = new QLabel(parent); + screenSize = parent->size(); + this->animate = animate; + + //Generate the list of files in the directory + imageFiles = QDir(imagePath).entryList(QDir::Files); + if(imageFiles.empty()) + qDebug() << "Current image file path has no files."; + + //Change some default settings for the image. If scaledContents is false, the image will be cut off if resized + image->setScaledContents(true); + image->setAlignment(Qt::AlignHCenter); + + //Load a random initial image + chooseImage(); + + //Create the animation that moves the image across the screen + bounce = new QPropertyAnimation(image, "pos", parent); + + //Add the animation that fades the image in and out + QGraphicsOpacityEffect *eff = new QGraphicsOpacityEffect(parent); + image->setGraphicsEffect(eff); + fading = new QPropertyAnimation(eff,"opacity"); + fading->setKeyValueAt(0, 0); + fading->setKeyValueAt(0.20, 1); + fading->setKeyValueAt(0.80, 1); + fading->setKeyValueAt(1, 0); + this->addAnimation(fading); + + setupAnimation(); + image->show(); + //Only add the animation if set in the configuration file + if(animate) + this->addAnimation(bounce); + else + //If no animation, center the image in the middle of the screen + image->move(QPoint((parent->width()-image->width())/2,(parent->height()-image->height())/2)); + + //Loop through 30 times for a total for 4 minutes + this->setLoopCount(30); + bounce->setDuration(8000); + fading->setDuration(8000); + + connect(this, SIGNAL(currentLoopChanged(int)), this, SLOT(LoopChanged()) ); + connect(this, SIGNAL(finished()), this, SLOT(stopped()) ); + } + ~ImageSlideshow(){} + +}; + +class ImageAnimation: public BaseAnimGroup{ + Q_OBJECT +public: + ImageAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} + ~ImageAnimation(){ + this->stop(); + } + + void LoadAnimations(){ + canvas->setStyleSheet("background: black;"); + //Load the path of the images from the configuration file (default /usr/local/backgrounds/) + QString imagePath = settings->value("imageSlideshow/path","/usr/local/backgrounds/").toString(); + //Load whether to animate the image (default true) + bool animate = settings->value("imageSlideshow/animate", true).toBool(); + ImageSlideshow *tmp = new ImageSlideshow(canvas, imagePath, animate); + this->addAnimation(tmp); + } + +}; +#endif diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h index a4c49692..3ec0af82 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Text.h @@ -4,11 +4,8 @@ // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== -#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_Text_ANIMATION_H -#define _LUMINA_DESKTOP_SCREEN_SAVER_Text_ANIMATION_H - -//PI is equal to 2*pi -#define PI 6.2832 +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_TEXT_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_TEXT_ANIMATION_H #include "global-includes.h" #include "BaseAnimGroup.h" @@ -38,7 +35,7 @@ private slots: currLoc.setY(currLoc.y() + v.y()); movement->setEndValue(currLoc); } - void stopped(){ qDebug() << "text stopped"; text->hide();} + void stopped(){ qDebug() << "Text Stopped"; text->hide();} public: Text(QWidget *parent) : QParallelAnimationGroup(parent){ diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h new file mode 100644 index 00000000..fdddaf93 --- /dev/null +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h @@ -0,0 +1,102 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_DESKTOP_SCREEN_SAVER_VIDEOSLIDESHOW_ANIMATION_H +#define _LUMINA_DESKTOP_SCREEN_SAVER_VIDEOSLIDESHOW_ANIMATION_H + +#include "global-includes.h" +#include "BaseAnimGroup.h" + +class VideoSlideshow: public QPropertyAnimation{ + Q_OBJECT +public: + VideoSlideshow(QWidget *parent, QVideoWidget *videoWidget) : QPropertyAnimation(videoWidget, "pos", parent){ + this->setKeyValueAt(0,QPoint(0,0)); + this->setKeyValueAt(1,QPoint(0,0)); + } + ~VideoSlideshow(){} + +}; + +class VideoAnimation: public BaseAnimGroup{ + Q_OBJECT +private: + QString videoPath; + VideoSlideshow *tmp; + QVideoWidget *videoWidget; + QMediaPlayer *video; + QStringList videoFiles; + QMediaPlaylist *playlist; + bool multimonitor, random; + +private slots: + void startVideo() { + this->addAnimation(tmp); + tmp->setDuration(video->duration()); + qDebug() << "Status: " << video->mediaStatus(); + video->setPlaylist(playlist); + video->setVolume(100); + video->play(); + } + + void LoopChanged(){ + qDebug() << "New Video"; + if(random) + playlist->setCurrentIndex(qrand() % videoFiles.size()); + else + playlist->setCurrentIndex(playlist->currentIndex()+1); + } + + void stopped(){qDebug() << "Video Stopped"; videoWidget->hide();} + +public: + VideoAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} + + ~VideoAnimation(){ + this->stop(); + } + + void LoadAnimations(){ + canvas->setStyleSheet("background: black;"); + + //Load the path of the videos from the configuration file (default /usr/local/videos/) + videoPath = settings->value("videoSlideshow/path","/usr/local/videos/").toString(); + + //Set whether to copy videos on two monitors or play different videos + multimonitor = settings->value("videoSlideshow/multimonitor",true).toBool(); + + //Set whether to play random videos or in order + random = settings->value("videoSlideshow/random",false).toBool(); + + video = new QMediaPlayer(canvas, QMediaPlayer::VideoSurface); + videoWidget = new QVideoWidget(canvas); + + tmp = new VideoSlideshow(canvas, videoWidget); + + //Generate the list of files in the directory + videoFiles = QDir(videoPath).entryList(QDir::Files); + if(videoFiles.empty()) + qDebug() << "Current video file path has no files."; + + this->setLoopCount(videoFiles.size()); + + //Load a random initial video + playlist = new QMediaPlaylist(); + for(int i = 0; i < videoFiles.size(); i++) + playlist->addMedia(QUrl::fromLocalFile(videoFiles[i])); + if(random) + playlist->setCurrentIndex(qrand() % videoFiles.size()); + + video->setVideoOutput(videoWidget); + videoWidget->show(); + qDebug() << "VideoWidget Displayed"; + connect(video, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)), this, SLOT(startVideo())); + connect(this, SIGNAL(currentLoopChanged(int)), this, SLOT(LoopChanged()) ); + connect(this, SIGNAL(finished()), this, SLOT(stopped()) ); + } + +}; +#endif diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri index 35141a0e..fdc75717 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/animations.pri @@ -4,5 +4,7 @@ HEADERS += $$PWD/BaseAnimGroup.h \ $$PWD/SampleAnimation.h \ $${PWD}/Fireflies.h \ $${PWD}/Grav.h \ + $${PWD}/ImageSlideshow.h \ + $${PWD}/VideoSlideshow.h \ $${PWD}/Text.h #FORMS += -- cgit From f383844783c01c50b0c62f716f482fc37b925bd3 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Fri, 4 Aug 2017 17:01:00 -0400 Subject: Updated the list of includes for Lumina 2 --- src-qt5/core/lumina-desktop-unified/global-includes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h index 92f895c2..8b8cd16c 100644 --- a/src-qt5/core/lumina-desktop-unified/global-includes.h +++ b/src-qt5/core/lumina-desktop-unified/global-includes.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -47,6 +48,8 @@ #include #include #include +#include +#include // libLumina includes #include -- cgit From 4eb7d167f89c87e72da02490d073a522e7db978a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 5 Aug 2017 08:08:05 -0400 Subject: Have the X11 init display number auto-detect now (starting with 0). --- src-qt5/core/lumina-session/main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 3696ed20..f26641c8 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -21,6 +21,11 @@ #include #define DEBUG 0 +int findAvailableSession(){ + int num = 0; + while(!QFile::exists("/tmp/.X11-unix/X"+QString::number(num))){ num++; } + return num; +} int main(int argc, char ** argv) { @@ -45,7 +50,7 @@ int main(int argc, char ** argv) QString prog = QString(argv[0]).section("/",-1); LUtils::isValidBinary(prog); //will adjust the path to be absolute if(unified){ prog = prog+" --unified"; } - QStringList args; args << prog; + QStringList args; args << prog << "--" << ":"+QString::number(findAvailableSession()); //if(LUtils::isValidBinary("x11vnc")){ args << "--" << "-listen" << "tcp"; } //need to be able to VNC into this session return QProcess::execute("xinit", args); } -- cgit From 07ebc1ba9bec7fc233f1b351aee91bbf3eca26d4 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 5 Aug 2017 08:14:32 -0400 Subject: Fix a typo in the pkg-plist for x11/lumina-core --- port-files/FreeBSD/x11/lumina-core/pkg-plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/port-files/FreeBSD/x11/lumina-core/pkg-plist b/port-files/FreeBSD/x11/lumina-core/pkg-plist index dbb933ec..91380e14 100644 --- a/port-files/FreeBSD/x11/lumina-core/pkg-plist +++ b/port-files/FreeBSD/x11/lumina-core/pkg-plist @@ -9,7 +9,7 @@ lib/qt5/plugins/styles/liblthemeengine-style.so man/man1/lumina-open.1.gz man/man8/lumina-desktop.8.gz man/man8/start-lumina-desktop.8.gz -share/application/lthemeengine.desktop +share/applications/lthemeengine.desktop share/applications/lumina-info.desktop share/applications/lumina-support.desktop share/icons/material-design-dark/LICENSE -- cgit From c55d13f9f07d6f9486343b1a3aac71cb62f58c36 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 5 Aug 2017 08:23:05 -0400 Subject: Make sure the "start-lumina-desktop" routine will detect/adjust the X11 Display on demand --- src-qt5/core/lumina-session/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index f26641c8..71244a8b 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -23,7 +23,7 @@ #define DEBUG 0 int findAvailableSession(){ int num = 0; - while(!QFile::exists("/tmp/.X11-unix/X"+QString::number(num))){ num++; } + while(QFile::exists("/tmp/.X11-unix/X"+QString::number(num))){ num++; } return num; } -- cgit From 939db0106d2382e2557fbdf6ae715a11eb551b54 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Sun, 6 Aug 2017 00:01:11 +0000 Subject: Translated using Weblate (Danish) Currently translated at 100.0% (390 of 390 strings) --- .../lumina-config/i18n/lumina-config_da.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts index 3d6a3bb7..fcf40c23 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_da.ts @@ -345,7 +345,7 @@ - Start menu alternative focusing on the user's files, directories, and favorites. + Start menu alternative focusing on the user's files, directories, and favorites. Alternativ startmenu som fokuserer på brugerens filer, mapper og favoritter. @@ -1234,12 +1234,12 @@ - "Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key - "Mod1": Alt-tast -"Mod4": Windows-/Mac-tast -"Control": Ctrl-tast + "Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key + "Mod1": Alt-tast +"Mod4": Windows-/Mac-tast +"Control": Ctrl-tast @@ -1422,7 +1422,7 @@ Panel - + Panel @@ -1613,7 +1613,7 @@ Window Manager - Vindueshåndtering + Vindueshåndtering @@ -1653,7 +1653,7 @@ Window manager - + Vindueshåndtering -- cgit From 2941eeabadf4a51cc68034b63ba7bda86e34541b Mon Sep 17 00:00:00 2001 From: Ethan James Large Date: Thu, 3 Aug 2017 14:41:02 +0000 Subject: Translated using Weblate (French) Currently translated at 31.5% (123 of 390 strings) --- src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts index 06cbb267..bc18eff2 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_fr.ts @@ -55,7 +55,7 @@ Sample - Exemple + Échantillon @@ -83,7 +83,7 @@ Voulez-vous l'écraser ? Select Color - Sélection de couleur + Sélectionner une Couleur -- cgit From 95e03152a385a0dde793b3d72da5a1dbe9c3ff6f Mon Sep 17 00:00:00 2001 From: Davidmp Date: Sun, 6 Aug 2017 16:03:19 +0000 Subject: Translated using Weblate (Catalan) Currently translated at 100.0% (390 of 390 strings) --- .../lumina-config/i18n/lumina-config_ca.ts | 184 ++++++++++----------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ca.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ca.ts index 727f02c4..9b6491be 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ca.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ca.ts @@ -77,7 +77,7 @@ This color scheme already exists. Overwrite it? Aquest esquema de colors ja existeix. -Voleu sobreescriure'l? +Voleu sobreescriure'l? @@ -189,7 +189,7 @@ Voleu sobreescriure'l? Top/Left - A dalt a l'esquerra + A dalt a l'esquerra @@ -239,12 +239,12 @@ Voleu sobreescriure'l? Desktop Bar - Barra de l'escriptori + Barra de l'escriptori This provides shortcuts to everything in the desktop folder - allowing easy access to all your favorite files/applications. - Això proporciona dreceres a tot el que hi ha dins la carpeta de l'escriptori. Permet un accés fàcil a tots els vostres fitxers / aplicacions. + Això proporciona dreceres a tot el que hi ha dins la carpeta de l'escriptori. Permet un accés fàcil a tots els vostres fitxers / aplicacions. @@ -269,7 +269,7 @@ Voleu sobreescriure'l? Keep track of your battery status. - Feu un seguiment de l'estat de la bateria. + Feu un seguiment de l'estat de la bateria. @@ -279,7 +279,7 @@ Voleu sobreescriure'l? View the current time and date. - Mostra l'hora i la data actuals. + Mostra l'hora i la data actuals. @@ -289,7 +289,7 @@ Voleu sobreescriure'l? View or change system settings (audio volume, screen brightness, battery life, virtual desktops). - Vegeu o canvieu els paràmetres del sistema (volum de l'àudio, la brillantor, la vida de la bateria, els escriptoris virtuals). + Vegeu o canvieu els paràmetres del sistema (volum de l'àudio, la brillantor, la vida de la bateria, els escriptoris virtuals). @@ -310,17 +310,17 @@ Voleu sobreescriure'l? Display area for dockable system applications - Mostra l'àrea per a aplicacions de sistema acoblables + Mostra l'àrea per a aplicacions de sistema acoblables Hide all open windows and show the desktop - Amaga totes les finestres i mostra l'escriptori + Amaga totes les finestres i mostra l'escriptori Start Menu - Menú d'inici + Menú d'inici @@ -330,33 +330,33 @@ Voleu sobreescriure'l? Display a calendar on the desktop - Mostra un calendari a l'escriptori + Mostra un calendari a l'escriptori Application Launcher - Llançador d'aplicacions + Llançador d'aplicacions User Menu - Menú de l'usuari + Menú de l'usuari - Start menu alternative focusing on the user's files, directories, and favorites. - Inicia un menú alternatiu centrat en els fitxers, directoris i favorits de l'usuari. + Start menu alternative focusing on the user's files, directories, and favorites. + Inicia un menú alternatiu centrat en els fitxers, directoris i favorits de l'usuari. Application Menu - Menú d'aplicació + Menú d'aplicació Start menu alternative which focuses on launching applications. - Inicia un menú alternatiu centrat en el llançament d'aplicacions. + Inicia un menú alternatiu centrat en el llançament d'aplicacions. @@ -371,42 +371,42 @@ Voleu sobreescriure'l? Workspace Switcher - Canviador d'espais de treball + Canviador d'espais de treball View and control any running application windows (group similar windows under a single button). - Mostra i controla qualsevol finestra d'aplicació en execució (agrupa les finestres similars en un sol botó). + Mostra i controla qualsevol finestra d'aplicació en execució (agrupa les finestres similars en un sol botó). View and control any running application windows (every individual window has a button) - Mostra i controla qualsevol finestra d'aplicació en execució (cada finestra té un botó). + Mostra i controla qualsevol finestra d'aplicació en execució (cada finestra té un botó). Show Desktop - Mostra l'escriptori + Mostra l'escriptori Unified system access and application launch menu. - Menú unificat de llançador d'aplicacions i d'accés al sistema. + Menú unificat de llançador d'aplicacions i d'accés al sistema. Pin an application shortcut directly to the panel - Enganxa la drecera d'una aplicació directament al plafó + Enganxa la drecera d'una aplicació directament al plafó Desktop button for launching an application - Botó d'escriptori per iniciar una aplicació + Botó d'escriptori per iniciar una aplicació Desktop Icons View - Vista d'icones a l'escriptori + Vista d'icones a l'escriptori @@ -416,19 +416,19 @@ Voleu sobreescriure'l? Keep simple text notes on your desktop - Mantingueu notes de text senzilles a l'escriptori + Mantingueu notes de text senzilles a l'escriptori Audio Player - Reproductor d'àudio + Reproductor d'àudio Play through lists of audio files - Reprodueix llistes de fitxers d'àudio + Reprodueix llistes de fitxers d'àudio @@ -438,7 +438,7 @@ Voleu sobreescriure'l? Keep track of system statistics such as CPU/Memory usage and CPU temperatures. - Control de les estadístiques del sistema com ara l'ús de la CPU i la mèmòria i les temperatures de la CPU. + Control de les estadístiques del sistema com ara l'ús de la CPU i la mèmòria i les temperatures de la CPU. @@ -489,7 +489,7 @@ Voleu sobreescriure'l? Show the desktop settings menu. - Mostra el menú de paràmetres de l'escriptori. + Mostra el menú de paràmetres de l'escriptori. @@ -510,7 +510,7 @@ Voleu sobreescriure'l? Configurable area for automatically showing desktop icons - Àrea configurable per mostrar automàticament icones d'escriptori + Àrea configurable per mostrar automàticament icones d'escriptori @@ -525,13 +525,13 @@ Voleu sobreescriure'l? List the open, minimized, active, and urgent application windows - Llista les finestres d'aplicació obertes, minimitzades, actives i urgents. + Llista les finestres d'aplicació obertes, minimitzades, actives i urgents. Run an external script to generate a user defined menu - Executa un script extern per generar un menú definit per l'usuari. + Executa un script extern per generar un menú definit per l'usuari. @@ -541,7 +541,7 @@ Voleu sobreescriure'l? Lock the current desktop session - Bloqueja la sessió d'escriptori actual + Bloqueja la sessió d'escriptori actual @@ -591,7 +591,7 @@ Voleu sobreescriure'l? Main background color for widgets that list or display collections of items. - Color de fons principal per a ginys que llisten o mostres col·leccions d'ítems. + Color de fons principal per a ginys que llisten o mostres col·leccions d'ítems. @@ -636,7 +636,7 @@ Voleu sobreescriure'l? Accent Color - Color d'accentuació + Color d'accentuació @@ -646,7 +646,7 @@ Voleu sobreescriure'l? Accent Color (Disabled) - Color d'accentuació (inhabilitat) + Color d'accentuació (inhabilitat) @@ -706,7 +706,7 @@ Voleu sobreescriure'l? Startup Settings - Paràmetres de l'inici + Paràmetres de l'inici @@ -761,7 +761,7 @@ Voleu sobreescriure'l? Change window settings and appearances - Canvia els paràmetres i l'aparença de les finestres + Canvia els paràmetres i l'aparença de les finestres @@ -781,12 +781,12 @@ Voleu sobreescriure'l? Desktop Plugins - Connectors de l'escriptori + Connectors de l'escriptori Change what icons or tools are embedded on the desktop - Canvia les icones o les eines encastades a l'escriptori + Canvia les icones o les eines encastades a l'escriptori @@ -806,7 +806,7 @@ Voleu sobreescriure'l? Change what options are shown on the desktop context menu - Canvia les opcions que es mostren al menú contextual de l'escriptori + Canvia les opcions que es mostren al menú contextual de l'escriptori @@ -831,12 +831,12 @@ Voleu sobreescriure'l? User Settings - Paràmetres de l'usuari + Paràmetres de l'usuari Change basic user settings such as time/date formats - Canvieu els paràmetres d'usuari bàsics com ara el format de l'hora i la data + Canvieu els paràmetres d'usuari bàsics com ara el format de l'hora i la data @@ -885,7 +885,7 @@ Voleu sobreescriure'l? Select an icon file - Seleccioneu un fitxer d'icona + Seleccioneu un fitxer d'icona @@ -932,7 +932,7 @@ Voleu sobreescriure'l? This theme already exists. Overwrite it? Aquest tema ja existeix. -Voleu sobreescriure'l? +Voleu sobreescriure'l? @@ -990,7 +990,7 @@ Voleu sobreescriure'l? Add New Startup Service - Afegeix un servei nou a l'inici + Afegeix un servei nou a l'inici @@ -1010,7 +1010,7 @@ Voleu sobreescriure'l? Startup Services - Serveis de l'inici + Serveis de l'inici @@ -1020,7 +1020,7 @@ Voleu sobreescriure'l? Application Binaries (*) - Binaris d'aplicacions (*) + Binaris d'aplicacions (*) @@ -1106,7 +1106,7 @@ Voleu sobreescriure'l? Set App - Estableix l'aplicació + Estableix l'aplicació @@ -1225,7 +1225,7 @@ Voleu sobreescriure'l? Note: Current key bindings need to be cleared and saved before they can be re-used. - Nota: les associacions de tecles actuals s'han de netejar i desar abans que es puguin reutilitzar. + Nota: les associacions de tecles actuals s'han de netejar i desar abans que es puguin reutilitzar. @@ -1234,12 +1234,12 @@ Voleu sobreescriure'l? - "Mod1": Alt key -"Mod4": Windows/Mac key -"Control": Ctrl key - "Mod1": tecla Alt -"Mod4": tecla Windows/Mac -"Control": tecla Ctrl + "Mod1": Alt key +"Mod4": Windows/Mac key +"Control": Ctrl key + "Mod1": tecla Alt +"Mod4": tecla Windows/Mac +"Control": tecla Ctrl @@ -1249,12 +1249,12 @@ Voleu sobreescriure'l? Audio Volume Up - Volum de l'àudio amunt + Volum de l'àudio amunt Audio Volume Down - Volum de l'àudio avall + Volum de l'àudio avall @@ -1297,7 +1297,7 @@ Voleu sobreescriure'l? Number of Workspaces - Nombre d'espais de treball + Nombre d'espais de treball @@ -1381,7 +1381,7 @@ Voleu sobreescriure'l? Display Desktop Folder Contents - Mostra els continguts de la carpeta de l'escriptori + Mostra els continguts de la carpeta de l'escriptori @@ -1391,7 +1391,7 @@ Voleu sobreescriure'l? Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1409,7 +1409,7 @@ Voleu sobreescriure'l? Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1422,7 +1422,7 @@ Voleu sobreescriure'l? Panel - + Plafó @@ -1437,7 +1437,7 @@ Voleu sobreescriure'l? Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1465,12 +1465,12 @@ Voleu sobreescriure'l? Desktop Defaults - Valors per defecte de l'escriptori + Valors per defecte de l'escriptori User Settings - Paràmetres de l'usuari + Paràmetres de l'usuari @@ -1480,7 +1480,7 @@ Voleu sobreescriure'l? Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1533,7 +1533,7 @@ Voleu sobreescriure'l? Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1551,7 +1551,7 @@ Voleu sobreescriure'l? Enable numlock on startup - Habilita el bloqueig numèric a l'inici + Habilita el bloqueig numèric a l'inici @@ -1571,22 +1571,22 @@ Voleu sobreescriure'l? Manage desktop app links - Gestió dels enllaços de les aplicacions d'escriptori + Gestió dels enllaços de les aplicacions d'escriptori Show application crash data - Mostra les dades de la fallada d'aplicacions + Mostra les dades de la fallada d'aplicacions Change User Icon - Canvia la icona de l'usuari + Canvia la icona de l'usuari Time Format: - Format de l'hora: + Format de l'hora: @@ -1613,12 +1613,12 @@ Voleu sobreescriure'l? Window Manager - Gestor de finestres + Gestor de finestres Reset Desktop Settings - Restableix els paràmetres de l'escriptori + Restableix els paràmetres de l'escriptori @@ -1643,22 +1643,22 @@ Voleu sobreescriure'l? Time first then Date - Primer l'hora, després la data + Primer l'hora, després la data Date first then Time - Primer la data, després l'hora + Primer la data, després l'hora Window manager - + Gestor de finestres Desktop Settings - Paràmetres de l'escriptori + Paràmetres de l'escriptori @@ -1673,17 +1673,17 @@ Voleu sobreescriure'l? Reset User Image - Restableix la imatge de l'usuari + Restableix la imatge de l'usuari Would you like to reset the user image to the system default? - Voleu restablir la imatge de l'usuari a la predeterminada del sistema? + Voleu restablir la imatge de l'usuari a la predeterminada del sistema? Valid Time Codes: - Codis d'hora vàlids: + Codis d'hora vàlids: @@ -1728,12 +1728,12 @@ Voleu sobreescriure'l? Time Codes - Codis d'hora + Codis d'hora Valid Date Codes: - Codis d'hora vàlids: + Codis d'hora vàlids: @@ -1806,7 +1806,7 @@ Voleu sobreescriure'l? Desktop Theme - Tema de l'escriptori + Tema de l'escriptori @@ -1852,7 +1852,7 @@ Voleu sobreescriure'l? Icon Pack: - Paquet d'icones: + Paquet d'icones: @@ -1862,7 +1862,7 @@ Voleu sobreescriure'l? Application Themes - Temes de l'aplicació + Temes de l'aplicació @@ -1911,7 +1911,7 @@ Voleu sobreescriure'l? Single Background - Fons d'escriptori únic + Fons d'escriptori únic @@ -2008,7 +2008,7 @@ Voleu sobreescriure'l? Top Left - Dalt a l'esquerra + Dalt a l'esquerra @@ -2018,7 +2018,7 @@ Voleu sobreescriure'l? Bottom Left - A baix a l'esquerra + A baix a l'esquerra @@ -2049,7 +2049,7 @@ Voleu sobreescriure'l? Find Background Image Directory - Troba el directori d'imatges de fons + Troba el directori d'imatges de fons -- cgit