From fbb0b35bf103c74a1fbdd1719d34e021a4ff57e6 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 31 Jul 2017 09:03:32 -0400 Subject: Cleanup the "fluxbox" detection for window manager settings. --- src-qt5/core/lumina-session/session.cpp | 2 +- src-qt5/core/lumina-session/session.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index de9b86ee..48a25a8f 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -89,7 +89,7 @@ void LSession::start(bool unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); //Window Manager First - if(WM=="fluxbox"){ + if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.isEmpty() ){ // FLUXBOX BUG BYPASS: if the ~/.fluxbox dir does not exist, it will ignore the given config file if( !LUtils::isValidBinary("fluxbox") ){ qDebug() << "[INCOMPLETE LUMINA INSTALLATION] fluxbox binary is missing - cannot continue"; diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index 99127c07..caa61ad6 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -19,15 +19,15 @@ private: QString id; private slots: void filechanged(QString path){ - qDebug() << "File Changed:" << path; - qDebug() << " - Program:" << this->program(); + //qDebug() << "File Changed:" << path; + //qDebug() << " - Program:" << this->program(); if(watcher==0){ return; } //just in case if(this->state()==QProcess::Running){ - if(this->program().section(" ",0,0).section("/",-1) == "fluxbox" ){ - qDebug() << "Sending Fluxbox signal to reload configs..."; + if(this->program().section(" ",0,0).section("/",-1) == "fluxbox" ){ + // qDebug() << "Sending Fluxbox signal to reload configs..."; ::kill(this->pid(), SIGUSR2); } //Fluxbox needs SIGUSR2 to reload it's configs - else if(this->program().section(" ",0,0).section("/",-1) == "compton" ){ - qDebug() << "Sending Compton signal to reload configs..."; + else if(this->program().section(" ",0,0).section("/",-1) == "compton" ){ + //qDebug() << "Sending Compton signal to reload configs..."; ::kill(this->pid(), SIGUSR1); } //Compton needs SIGUSR1 to reload it's configs } //Now make sure this file/dir was not removed from the watcher @@ -40,7 +40,7 @@ public: id=ID; watcher = 0; if(!watchfiles.isEmpty()){ - qDebug() << "Watch Files for changes:" << ID << watchfiles; + //qDebug() << "Watch Files for changes:" << ID << watchfiles; watcher = new QFileSystemWatcher(this); connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(filechanged(QString)) ); connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(filechanged(QString)) ); @@ -74,5 +74,5 @@ public: ~LSession(){ } void start(bool unified = false); - + }; -- cgit From 00e89a565877c2b862475fcd9ea23c3c87b03350 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Mon, 31 Jul 2017 09:41:25 -0400 Subject: Added Australian English translation files --- .../lumina-desktop/i18n/lumina-desktop_en_AU.ts | 1736 ++++++++++++++++++++ src-qt5/core/lumina-desktop/lumina-desktop.pro | 1 + src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts | 97 ++ src-qt5/core/lumina-info/lumina-info.pro | 1 + src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts | 212 +++ src-qt5/core/lumina-open/lumina-open.pro | 1 + 6 files changed, 2048 insertions(+) create mode 100644 src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts create mode 100644 src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts create mode 100644 src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts new file mode 100644 index 00000000..bbc321e2 --- /dev/null +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -0,0 +1,1736 @@ + + + + + AppLaunchButtonPlugin + + + Click to assign an application + Click to assign an application + + + + Launch %1 + Launch %1 + + + + Open %1 + Open %1 + + + + Select Application + Select Application + + + + Name: + Name: + + + + AppLauncherPlugin + + + + Click to Set + Click to Set + + + + Launch %1 + Starte %1 + + + + Open + Open + + + + Open With + + + + + View Properties + + + + + File Operations + + + + + Rename + + + + + Copy + Copy + + + + Cut + Cut + + + + Delete + Delete + + + + Select Application + Select Application + + + + Name: + Name: + + + + New Filename + + + + + AppMenu + + + Desktop + Desktop + + + + Manage Applications + Manage Applications + + + + Control Panel + Control Panel + + + + Multimedia + Multimedia + + + + Development + Development + + + + Education + Education + + + + Games + Games + + + + Graphics + Graphics + + + + Network + Network + + + + Office + Office + + + + Science + Science + + + + Settings + Settings + + + + System + System + + + + Utility + Utility + + + + Wine + Wine + + + + Unsorted + Unsorted + + + + Applications + Applications + + + + BootSplash + + + Form + Form + + + + Starting the Lumina Desktop... + + + + + Version %1 + + + + + This desktop is powered by coffee, coffee, and more coffee. + + + + + Keep up with desktop news! + + + + + There is a full handbook of information about the desktop available online. + + + + + Want to change the interface? Everything is customizable in the desktop configuration! + + + + + Lumina can easily reproduce the interface from most other desktop environments. + + + + + This desktop is generously sponsored by iXsystems + + + + + I have never been hurt by what I have not said + + + + + Gotta have more cowbell! + + + + + Everything has its beauty but not everyone sees it. + + + + + Before God we are all equally wise - and equally foolish. + + + + + We cannot do everything at once, but we can do something at once. + + + + + One with the law is a majority. + + + + + Don't expect to build up the weak by pulling down the strong. + + + + + You can't know too much, but you can say too much. + + + + + Duty is not collective; it is personal. + + + + + Any society that would give up a little liberty to gain a little security will deserve neither and lose both. + + + + + Never trust a computer you can’t throw out a window. + + + + + Study the past if you would define the future. + + + + + The way to get started is to quit talking and begin doing. + + + + + Ask and it will be given to you; search, and you will find; knock and the door will be opened for you. + + + + + Start where you are. Use what you have. Do what you can. + + + + + A person who never made a mistake never tried anything new. + + + + + It does not matter how slowly you go as long as you do not stop. + + + + + Do what you can, where you are, with what you have. + + + + + Remember no one can make you feel inferior without your consent. + + + + + It’s not the years in your life that count. It’s the life in your years. + + + + + Either write something worth reading or do something worth writing. + + + + + The only way to do great work is to love what you do. + + + + + Political correctness is tyranny with manners. + + + + + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + + + + + I find that the harder I work, the more luck I seem to have. + + + + + Do, or do not. There is no 'try'. + + + + + A mathematician is a device for turning coffee into theorems. + + + + + Good people do not need laws to tell them to act responsibly, while bad people will find a way around the laws. + + + + + Black holes are where God divided by zero. + + + + + It's kind of fun to do the impossible. + + + + + Knowledge speaks, but wisdom listens. + + + + + A witty saying proves nothing. + + + + + Success usually comes to those who are too busy to be looking for it. + + + + + Well-timed silence hath more eloquence than speech. + + + + + I have never let my schooling interfere with my education. + + + + + The best way to predict the future is to invent it. + + + + + Well done is better than well said. + + + + + Sometimes it is not enough that we do our best; we must do what is required. + + + + + The truth is more important than the facts. + + + + + Better to remain silent and be thought a fool than to speak out and remove all doubt. + + + + + Initializing Session … + Initialising Session … + + + + Loading System Settings … + Loading System Settings … + + + + Loading User Preferences … + Loading User Preferences … + + + + Preparing System Tray … + Preparing System Tray … + + + + Starting Window Manager … + Starting Window Manager ... + + + + Detecting Applications … + Detecting Applications ... + + + + Preparing Menus … + Preparing Menus ... + + + + Preparing Workspace … + Preparing Workspace ... + + + + Finalizing … + Finalising ... + + + + Starting App: %1 + Starting App: %1 + + + + DesktopViewPlugin + + + Open + Open + + + + Cut + Cut + + + + Copy + Copy + + + + Increase Icons + Increase Icons + + + + Decrease Icons + Decrease Icons + + + + Delete + Delete + + + + Properties + Properties + + + + ItemWidget + + + Go Back + Go Back + + + + Pin to Desktop + Pin to Desktop + + + + Remove from Favorites + Remove from Favourites + + + + Add to Favorites + Add to Favourites + + + + Remove from Quicklaunch + Remove from Quicklaunch + + + + Add to Quicklaunch + Add to Quicklaunch + + + + JsonMenu + + + Error parsing script output: %1 + Error parsing script output: %1 + + + + LAppMenuPlugin + + + Quickly launch applications or open files + Quickly launch applications or open files + + + + Applications + Applications + + + + Browse Files + Browse Files + + + + Install Applications + Install Applications + + + + Control Panel + Control Panel + + + + Multimedia + Multimedia + + + + Development + Development + + + + Education + Education + + + + Games + Games + + + + Graphics + Graphics + + + + Network + Network + + + + Office + Office + + + + Science + Science + + + + Settings + Settings + + + + System + System + + + + Utility + Utility + + + + Wine + Wine + + + + Unsorted + Unsorted + + + + Leave + Leave + + + + LBattery + + + %1 % (Charging) + %1 % (Charging) + + + + %1 % (%2 Remaining) + %1 % (%2 Remaining) + + + + LClock + + + Time Zone (%1) + Time Zone (%1) + + + + Use System Time + Use System Time + + + + LDPlugin + + + Modify Item + + + + + Start Moving Item + Start Moving Item + + + + Start Resizing Item + Start Resizing Item + + + + Increase Item Sizes + Increase Item Sizes + + + + Decrease Item Sizes + Decrease Item Sizes + + + + Remove Item + Remove Item + + + + LDeskBarPlugin + + + Favorite Applications + Favourite Applications + + + + Favorite Folders + Favourite Folders + + + + Audio + Audio + + + + Video + Video + + + + Pictures + Pictures + + + + Other Files + Other Files + + + + Documents + Documents + + + + Favorite Files + Favourite Files + + + + LDesktop + + + Window List + Window List + + + + Desktop Actions + + + + + + New Folder + + + + + + New File + + + + + Paste + + + + + Lumina Desktop + Lumina Desktop + + + + Workspace %1 + Workspace %1 + + + + Terminal + Terminal + + + + Lock Session + + + + + Browse Files + Browse Files + + + + Leave + Leave + + + + + + Desktop + Desktop + + + + LDesktopSwitcher + + + + Workspace %1 + Workspace %1 + + + + LQuickLaunchButton + + + Remove from Quicklaunch + Remove from Quicklaunch + + + + LSession + + + + Desktop + Desktop + + + + LSysDashboard + + + System Dashboard + System Dashboard + + + + LSysMenuQuick + + + Form + Form + + + + Volume + + + + + Launch Audio Mixer + Launch Audio Mixer + + + + Screen Brightness + Screen Brightness + + + + Battery Status + Battery Status + + + + Workspace + Workspace + + + + Locale + Locale + + + + Log Out + Log Out + + + + connected + connected + + + + + + %1 of %2 + %1 of %2 + + + + LTaskButton + + + Activate Window + Activate Window + + + + Minimize Window + Minimise Window + + + + Restore Window + Restore Window + + + + Maximize Window + Maximise Window + + + + Close Window + Close Window + + + + Show All Windows + Show All Windows + + + + Minimize All Windows + Minimise All Windows + + + + Close All Windows + Close All Windows + + + + LUserButtonPlugin + + + Quickly launch applications or open files + Quickly launch applications or open files + + + + MonitorWidget + + + Form + Form + + + + Summary + Summary + + + + CPU Temp: + CPU Temp: + + + + CPU Usage: + CPU Usage: + + + + Mem Usage: + Mem Usage: + + + + Disk I/O + Disk I/O + + + + NotePadPlugin + + + Note Files (*.note) + Note Files (*.note) + + + + Text Files (*) + Text Files (*) + + + + Open a note file + Open a note file + + + + Name: + Name: + + + + Invalid Note Name: Try Again + Invalid Note Name: Try Again + + + + Select a Note Name + Select a Note Name + + + + Open Text File + Open Text File + + + + Create a Note + Create a Note + + + + Rename Note + Rename Note + + + + Delete Note + Delete Note + + + + PPlayerWidget + + + Form + Form + + + + Clear Playlist + Clear Playlist + + + + Shuffle Playlist + Shuffle Playlist + + + + Add Files + Add Files + + + + Add Directory + Add Directory + + + + Add URL + Add URL + + + + Multimedia Files + Multimedia Files + + + + Select Multimedia Files + Select Multimedia Files + + + + Select Multimedia Directory + Select Multimedia Directory + + + + Enter a valid URL for a multimedia file or stream: + Enter a valid URL for a multimedia file or stream: + + + + Multimedia URL + Multimedia URL + + + + PlayerWidget + + + Form + Form + + + + Clear Playlist + Clear Playlist + + + + Shuffle Playlist + Shuffle Playlist + + + + Add Files + Add Files + + + + Add Directory + Add Directory + + + + Add URL + Add URL + + + + Multimedia Files + Multimedia Files + + + + Select Multimedia Files + Select Multimedia Files + + + + Select Multimedia Directory + Select Multimedia Directory + + + + Enter a valid URL for a multimedia file or stream: + Enter a valid URL for a multimedia file or stream: + + + + Multimedia URL + Multimedia URL + + + + RSSFeedPlugin + + + Form + Form + + + + View Options + View Options + + + + Open Website + Open Website + + + + More + More + + + + + + Back to Feeds + Back to Feeds + + + + Feed Information + Feed Information + + + + Remove Feed + Remove Feed + + + + New Feed Subscription + New Feed Subscription + + + + RSS URL + RSS URL + + + + Load a preset RSS Feed + Load a preset RSS Feed + + + + Add to Feeds + Add to Feeds + + + + Feed Reader Settings + Feed Reader Settings + + + + Manual Sync Only + Manual Sync Only + + + + Some RSS feeds may request custom update intervals instead of using this setting + Some RSS feeds may request custom update intervals instead of using this setting + + + + Default Sync Interval + Default Sync Interval + + + + + Hour(s) + Hour(s) + + + + Minutes + Minutes + + + + Save Settings + Save Settings + + + + Add RSS Feed + Add RSS Feed + + + + View Feed Details + View Feed Details + + + + Settings + Settings + + + + Update Feeds Now + Update Feeds Now + + + + Lumina Desktop RSS + Lumina Desktop RSS + + + + Feed URL: %1 + Feed URL: %1 + + + + Title: %1 + Title: %1 + + + + Description: %1 + Description: %1 + + + + Website: %1 + Website: %1 + + + + Last Build Date: %1 + Last Build Date: %1 + + + + Last Sync: %1 + Last Sync: %1 + + + + Next Sync: %1 + Next Sync: %1 + + + + SettingsMenu + + + Screensaver + Screensaver + + + + Preferences + Preferences + + + + Wallpaper + + + + + Display + Display + + + + All Desktop Settings + + + + + Control Panel + Control Panel + + + + About Lumina + About Lumina + + + + StartMenu + + + Form + Form + + + + Type to search + Type to search + + + + Browse Files + Browse Files + + + + Browse Applications + Browse Applications + + + + Control Panel + Control Panel + + + + Leave + Leave + + + + Manage Applications + Manage Applications + + + + Show Categories + Show Categories + + + + Configure Desktop + Configure Desktop + + + + Suspend + Suspend + + + + Restart + Restart + + + + Power Off + + + + + Log Out + Log Out + + + + Preferences + Preferences + + + + (System Performing Updates) + (System Performing Updates) + + + + Back + Back + + + + Apply Updates? + Apply Updates? + + + + You have system updates waiting to be applied! Do you wish to install them now? + You have system updates waiting to be applied! Do you wish to install them now? + + + + %1% (Plugged In) + %1% (Plugged In) + + + + %1% (%2 Estimated) + %1% (%2 Estimated) + + + + %1% Remaining + %1% Remaining + + + + + + Workspace %1/%2 + Workspace %1/%2 + + + + SystemWindow + + + System Options + System Options + + + + Log Out + Log Out + + + + Restart + Restart + + + + Power Off + + + + + Cancel + Cancel + + + + Lock + Lock + + + + Suspend + Suspend + + + + Apply Updates? + Apply Updates? + + + + You have system updates waiting to be applied! Do you wish to install them now? + You have system updates waiting to be applied! Do you wish to install them now? + + + + UserItemWidget + + + Go Back + Go Back + + + + Remove Shortcut + Remove Shortcut + + + + Delete File + Delete File + + + + Create Shortcut + Create Shortcut + + + + UserWidget + + + UserWidget + UserWidget + + + + + Favorites + Favourites + + + + Favorite Applications + Favourite Applications + + + + + Applications + Applications + + + + Favorite Directories + Favourite Dirictories + + + + Places + Places + + + + Favorite FIles + Favourite Files + + + + Files + Files + + + + Apps + Apps + + + + + Home + Home + + + + Home Directory + Home Directory + + + + Search this Directory + Search this Directory + + + + Go back to home directory + Go back to home directory + + + + Open Directory + Open Directory + + + + Config + Config + + + + Desktop Preferences + Desktop Preferences + + + + Control Panel + Control Panel + + + + Desktop Appearance/Plugins + Desktop Appearance/Plugins + + + + Screen Configuration + Screen Configuration + + + + Screensaver Settings + Screensaver Settings + + + + About the Lumina Desktop + About the Lumina Desktop + + + + All + All + + + + Multimedia + Multimedia + + + + Development + Development + + + + Education + Education + + + + Games + Games + + + + Graphics + Graphics + + + + Network + Network + + + + Office + Office + + + + Science + Science + + + + Settings + Settings + + + + System + System + + + + Utilities + Utilities + + + + Wine + Wine + + + + Unsorted + Unsorted + + + diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 4d0a78ec..d4e57c5c 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -128,6 +128,7 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \ i18n/lumina-desktop_da.ts \ i18n/lumina-desktop_de.ts \ i18n/lumina-desktop_el.ts \ + i18n/lumina-desktop_en_AU.ts \ i18n/lumina-desktop_en_GB.ts \ i18n/lumina-desktop_en_ZA.ts \ i18n/lumina-desktop_es.ts \ diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts b/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts new file mode 100644 index 00000000..d747c640 --- /dev/null +++ b/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts @@ -0,0 +1,97 @@ + + + + + MainUI + + + Lumina Desktop Information + Lumina Desktop Information + + + + General + General + + + + Source Repository + Source Repository + + + + Lumina Website + Lumina Website + + + + Bug Reports + Bug Reports + + + + Desktop Version: + Desktop Version: + + + + OS Build: + OS Build: + + + + Qt Version: + Qt Version: + + + + Ask the Community + Ask the Community + + + + View Information + View Information + + + + License + Licence + + + + Acknowledgements + Acknowledgements + + + + Project Lead: + Project Lead: + + + + <a href="https://github.com/beanpole135">Ken Moore</a> + <a href="https://github.com/beanpole135">Ken Moore</a> + + + + Contributors: + Contributors: + + + + Sponsors: + Sponsors: + + + + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> + + + + Close + Close + + + diff --git a/src-qt5/core/lumina-info/lumina-info.pro b/src-qt5/core/lumina-info/lumina-info.pro index 3ba1f527..ec36e9af 100644 --- a/src-qt5/core/lumina-info/lumina-info.pro +++ b/src-qt5/core/lumina-info/lumina-info.pro @@ -41,6 +41,7 @@ TRANSLATIONS = i18n/lumina-info_af.ts \ i18n/lumina-info_el.ts \ i18n/lumina-info_en_GB.ts \ i18n/lumina-info_en_ZA.ts \ + i18n/lumina-info_en_AU.ts \ i18n/lumina-info_es.ts \ i18n/lumina-info_et.ts \ i18n/lumina-info_eu.ts \ diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts b/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts new file mode 100644 index 00000000..91d418fa --- /dev/null +++ b/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts @@ -0,0 +1,212 @@ + + + + + LFileDialog + + + Open With... + Open With... + + + + Preferred + Preferred + + + + Available + Available + + + + Custom + Custom + + + + Binary Location + Binary Location + + + + Find + Find + + + + Set this application as the default + Set this application as the default + + + + OK + OK + + + + Cancel + Cancel + + + + (Email Link) + (Email Link) + + + + (Internet URL - %1) + (Internet URL - %1) + + + + Audio + Audio + + + + Video + Video + + + + Multimedia + Multimedia + + + + Development + Development + + + + Education + Education + + + + Game + Game + + + + Graphics + Graphics + + + + Network + Network + + + + Office + Office + + + + Science + Science + + + + Settings + Settings + + + + System + System + + + + Utilities + Utilities + + + + Other + Other + + + + [default] + + + + + Find Application Binary + Find Application Binary + + + + QObject + + + File Error + File Error + + + + + Audio Volume %1% + Audio Volume %1% + + + + + Screen Brightness %1% + Screen Brightness %1% + + + + Invalid file or URL: %1 + Invalid file or URL: %1 + + + + Application entry is invalid: %1 + + + + + Application shortcut is missing the launching information (malformed shortcut): %1 + Application shortcut is missing the launch information (malformed shortcut): %1 + + + + URL shortcut is missing the URL: %1 + URL shortcut is missing the URL: %1 + + + + Directory shortcut is missing the path to the directory: %1 + Directory shortcut is missing the path to the directory: %1 + + + + Unknown type of shortcut : %1 + Unknown type of shortcut: %1 + + + + Binary Missing + Binary Missing + + + + Could not find "%1". Please ensure it is installed first. + Could not find "%1". Please ensure it is installed first. + + + + Application Error + Application Error + + + + The following application experienced an error and needed to close: + The following application experienced an error and needed to close: + + + diff --git a/src-qt5/core/lumina-open/lumina-open.pro b/src-qt5/core/lumina-open/lumina-open.pro index 1110a2fa..b31c7a0e 100644 --- a/src-qt5/core/lumina-open/lumina-open.pro +++ b/src-qt5/core/lumina-open/lumina-open.pro @@ -36,6 +36,7 @@ TRANSLATIONS = i18n/lumina-open_af.ts \ i18n/lumina-open_el.ts \ i18n/lumina-open_en_GB.ts \ i18n/lumina-open_en_ZA.ts \ + i18n/lumina-open_en_AU.ts \ i18n/lumina-open_es.ts \ i18n/lumina-open_et.ts \ i18n/lumina-open_eu.ts \ -- cgit From ea6f15b08ce9d4218c3fdda33a11c4b1869f6a50 Mon Sep 17 00:00:00 2001 From: q5sys Date: Mon, 31 Jul 2017 10:46:20 -0400 Subject: bring bracket sanity to a wasteland of if statements --- .../lthemeengineplatformtheme.cpp | 79 ++++----- .../src/lthemeengine-qtplugin/main.cpp | 7 +- .../lthemeengine-style/lthemeengineproxystyle.cpp | 12 +- .../src/lthemeengine-style/plugin.cpp | 14 +- .../src/lthemeengine/appearancepage.cpp | 191 ++++++++++----------- .../src/lthemeengine/iconthemepage.cpp | 103 +++++------ .../src/lthemeengine/interfacepage.cpp | 63 +++---- .../src/lthemeengine/lthemeengine.cpp | 46 ++--- .../lumina-theme-engine/src/lthemeengine/main.cpp | 12 +- .../src/lthemeengine/mainwindow.cpp | 5 +- .../src/lthemeengine/paletteeditdialog.cpp | 15 +- .../src/lthemeengine/qsseditordialog.cpp | 8 +- .../src/lthemeengine/qsspage.cpp | 94 +++++----- 13 files changed, 272 insertions(+), 377 deletions(-) (limited to 'src-qt5/core') 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 dcede34c..9d6c9bea 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 @@ -82,8 +82,7 @@ const QPalette *lthemeenginePlatformTheme::palette(QPlatformTheme::Palette type) } const QFont *lthemeenginePlatformTheme::font(QPlatformTheme::Font type) const{ - if(type == QPlatformTheme::FixedFont) - return &m_fixedFont; + if(type == QPlatformTheme::FixedFont){ return &m_fixedFont; } return &m_generalFont; } @@ -105,16 +104,15 @@ QVariant lthemeenginePlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) co } void lthemeenginePlatformTheme::applySettings(){ - if(!QGuiApplication::desktopSettingsAware()) - return; + if(!QGuiApplication::desktopSettingsAware()){ return; } #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) - if(!m_update){ - //do not override application palette - if(QCoreApplication::testAttribute(Qt::AA_SetPalette)){ - m_usePalette = false; - qCDebug(llthemeengine) << "palette support is disabled"; - } - } + if(!m_update){ + //do not override application palette + if(QCoreApplication::testAttribute(Qt::AA_SetPalette)){ + m_usePalette = false; + qCDebug(llthemeengine) << "palette support is disabled"; + } + } #endif #ifdef QT_WIDGETS_LIB if(hasWidgets()){ @@ -127,36 +125,29 @@ void lthemeenginePlatformTheme::applySettings(){ #else qApp->setWheelScrollLines(m_wheelScrollLines); #endif - if(m_update && qApp->style()->objectName() == "lthemeengine-style") //ignore application style - qApp->setStyle("lthemeengine-style"); //recreate style object - if(m_update && m_usePalette){ - if(m_customPalette) - qApp->setPalette(*m_customPalette); - else - qApp->setPalette(qApp->style()->standardPalette()); - } + if(m_update && qApp->style()->objectName() == "lthemeengine-style") /* ignore application style */ { qApp->setStyle("lthemeengine-style"); } //recreate style object + if(m_update && m_usePalette){ + if(m_customPalette){ qApp->setPalette(*m_customPalette); } + else{ qApp->setPalette(qApp->style()->standardPalette()); } + } //do not override application style - if(m_prevStyleSheet == qApp->styleSheet()) - qApp->setStyleSheet(m_userStyleSheet); - else - qCDebug(llthemeengine) << "custom style sheet is disabled"; - m_prevStyleSheet = m_userStyleSheet; + if(m_prevStyleSheet == qApp->styleSheet()){ qApp->setStyleSheet(m_userStyleSheet); } + else{ qCDebug(llthemeengine) << "custom style sheet is disabled";} + m_prevStyleSheet = m_userStyleSheet; } #endif QGuiApplication::setFont(m_generalFont); //apply font QIcon::setThemeName(m_iconTheme); //apply icons - if(m_customPalette && m_usePalette) - QGuiApplication::setPalette(*m_customPalette); //apply palette + if(m_customPalette && m_usePalette){ QGuiApplication::setPalette(*m_customPalette); } //apply palette #ifdef QT_WIDGETS_LIB - if(hasWidgets()){ - foreach (QWidget *w, qApp->allWidgets()){ + if(hasWidgets()){ + foreach (QWidget *w, qApp->allWidgets()){ QEvent e(QEvent::ThemeChange); QApplication::sendEvent(w, &e); } } #endif - if(!m_update) - m_update = true; + if(!m_update){ m_update = true; } } #ifdef QT_WIDGETS_LIB @@ -210,20 +201,13 @@ void lthemeenginePlatformTheme::readSettings(){ if(settings.childKeys().contains("gui_effects")){ QStringList effectList = settings.value("gui_effects").toStringList(); m_uiEffects = 0; - if(effectList.contains("General")) - m_uiEffects |= QPlatformTheme::GeneralUiEffect; - if(effectList.contains("AnimateMenu")) - m_uiEffects |= QPlatformTheme::AnimateMenuUiEffect; - if(effectList.contains("FadeMenu")) - m_uiEffects |= QPlatformTheme::FadeMenuUiEffect; - if(effectList.contains("AnimateCombo")) - m_uiEffects |= QPlatformTheme::AnimateComboUiEffect; - if(effectList.contains("AnimateTooltip")) - m_uiEffects |= QPlatformTheme::AnimateTooltipUiEffect; - if(effectList.contains("FadeTooltip")) - m_uiEffects |= QPlatformTheme::FadeTooltipUiEffect; - if(effectList.contains("AnimateToolBox")) - m_uiEffects |= QPlatformTheme::AnimateToolBoxUiEffect; + if(effectList.contains("General")){ m_uiEffects |= QPlatformTheme::GeneralUiEffect; } + if(effectList.contains("AnimateMenu")){ m_uiEffects |= QPlatformTheme::AnimateMenuUiEffect; } + if(effectList.contains("FadeMenu")){ m_uiEffects |= QPlatformTheme::FadeMenuUiEffect; } + if(effectList.contains("AnimateCombo")){ m_uiEffects |= QPlatformTheme::AnimateComboUiEffect; } + if(effectList.contains("AnimateTooltip")){ m_uiEffects |= QPlatformTheme::AnimateTooltipUiEffect; } + if(effectList.contains("FadeTooltip")){ m_uiEffects |= QPlatformTheme::FadeTooltipUiEffect; } + if(effectList.contains("AnimateToolBox")){ m_uiEffects |= QPlatformTheme::AnimateToolBoxUiEffect; } } //load style sheets #ifdef QT_WIDGETS_LIB @@ -242,8 +226,7 @@ bool lthemeenginePlatformTheme::hasWidgets(){ QString lthemeenginePlatformTheme::loadStyleSheets(const QStringList &paths){ QString content; foreach (QString path, paths){ - if(!QFile::exists(path)) - continue; + if(!QFile::exists(path)){ continue; } QFile file(path); file.open(QIODevice::ReadOnly); content.append(file.readAll()); @@ -270,8 +253,6 @@ QPalette lthemeenginePlatformTheme::loadColorScheme(const QString &filePath){ customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i))); } } - else{ - customPalette = *QPlatformTheme::palette(SystemPalette); //load fallback palette - } + else{ customPalette = *QPlatformTheme::palette(SystemPalette); } //load fallback palette return customPalette; } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp index 12e4a581..28898890 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp @@ -11,10 +11,9 @@ public: }; QPlatformTheme *lthemeenginePlatformThemePlugin::create(const QString &key, const QStringList ¶ms){ - Q_UNUSED(params); - if (key.toLower() == "lthemeengine") - return new lthemeenginePlatformTheme(); - return NULL; + Q_UNUSED(params); + if (key.toLower() == "lthemeengine") { return new lthemeenginePlatformTheme(); } + return NULL; } QT_END_NAMESPACE diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp index 2c66144f..a560a36a 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp @@ -14,16 +14,12 @@ lthemeengineProxyStyle::~lthemeengineProxyStyle(){ int lthemeengineProxyStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const{ if(hint == QStyle::SH_DialogButtonBox_ButtonsHaveIcons){ - if(m_dialogButtonsHaveIcons == Qt::Unchecked) - return 0; - else if(m_dialogButtonsHaveIcons == Qt::Checked) - return 1; + if(m_dialogButtonsHaveIcons == Qt::Unchecked){ return 0; } + else if(m_dialogButtonsHaveIcons == Qt::Checked){ return 1; } } else if(hint == QStyle::QStyle::SH_ItemView_ActivateItemOnSingleClick){ - if(m_activateItemOnSingleClick == Qt::Unchecked) - return 0; - else if(m_activateItemOnSingleClick == Qt::Checked) - return 1; + if(m_activateItemOnSingleClick == Qt::Unchecked){ return 0; } + else if(m_activateItemOnSingleClick == Qt::Checked){ return 1; } } return QProxyStyle::styleHint(hint, option, widget, returnData); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp index fb9e5fb2..31c59a0c 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp @@ -13,15 +13,13 @@ public: }; QStyle *lthemeengineStylePlugin::create(const QString &key){ - if (key == "lthemeengine-style") - { - QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); - QString style = settings.value("Appearance/style", "Fusion").toString(); - if(key == style || !QStyleFactory::keys().contains(style)) - style = "Fusion"; - return new lthemeengineProxyStyle(style); + if (key == "lthemeengine-style"){ + QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); + QString style = settings.value("Appearance/style", "Fusion").toString(); + if(key == style || !QStyleFactory::keys().contains(style)){ style = "Fusion"; } + return new lthemeengineProxyStyle(style); } - return 0; + return 0; } #include "plugin.moc" 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 95f2c9b7..4d585409 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -42,8 +42,7 @@ AppearancePage::AppearancePage(QWidget *parent) : TabPage(parent), m_ui(new Ui:: } AppearancePage::~AppearancePage(){ - if(m_selectedStyle) - delete m_selectedStyle; + if(m_selectedStyle){ delete m_selectedStyle; } delete m_ui; delete m_previewUi; } @@ -59,13 +58,11 @@ void AppearancePage::writeSettings(){ void AppearancePage::on_styleComboBox_activated(const QString &text){ QStyle *style = QStyleFactory::create(text); - if(!style) - return; - setStyle(m_previewWidget, style); - if(m_selectedStyle) - delete m_selectedStyle; - m_selectedStyle = style; - updatePalette(); + if(!style){ return; } + setStyle(m_previewWidget, style); + if(m_selectedStyle){ delete m_selectedStyle; } + m_selectedStyle = style; + updatePalette(); } void AppearancePage::on_colorSchemeComboBox_activated(int){ @@ -75,94 +72,84 @@ void AppearancePage::on_colorSchemeComboBox_activated(int){ void AppearancePage::createColorScheme(){ QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:")); - if(name.isEmpty()) + if(name.isEmpty()){ return; } + if(!name.endsWith(".conf", Qt::CaseInsensitive)){ name.append(".conf"); } + if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ + QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); return; - if(!name.endsWith(".conf", Qt::CaseInsensitive)) - name.append(".conf"); - if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ - QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); - return; - } - QString schemePath = lthemeengine::userColorSchemePath() + "/" + name; - createColorScheme(schemePath, palette()); - m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath); + } + QString schemePath = lthemeengine::userColorSchemePath() + "/" + name; + createColorScheme(schemePath, palette()); + m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), schemePath); } void AppearancePage::changeColorScheme(){ - if(m_ui->colorSchemeComboBox->currentIndex() < 0) + if(m_ui->colorSchemeComboBox->currentIndex() < 0){ return; } + if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ + QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); return; - if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ - QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); - return; } - PaletteEditDialog d(m_customPalette, m_selectedStyle, this); - connect(&d, SIGNAL(paletteChanged(QPalette)), SLOT(setPreviewPalette(QPalette))); - if(d.exec() == QDialog::Accepted){ - m_customPalette = d.selectedPalette(); - createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette); + PaletteEditDialog d(m_customPalette, m_selectedStyle, this); + connect(&d, SIGNAL(paletteChanged(QPalette)), SLOT(setPreviewPalette(QPalette))); + if(d.exec() == QDialog::Accepted){ + m_customPalette = d.selectedPalette(); + createColorScheme(m_ui->colorSchemeComboBox->currentData().toString(), m_customPalette); } - updatePalette(); + updatePalette(); } void AppearancePage::removeColorScheme(){ int index = m_ui->colorSchemeComboBox->currentIndex(); - if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1) + if(index < 0 || m_ui->colorSchemeComboBox->count() <= 1){ return; } + if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ + QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); return; - if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ - QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); - return; } - int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove color scheme \"%1\"?").arg(m_ui->colorSchemeComboBox->currentText()), QMessageBox::Yes | QMessageBox::No); - if(button != QMessageBox::Yes) - return; - if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString())){ - m_ui->colorSchemeComboBox->removeItem(index); - on_colorSchemeComboBox_activated(0); - } + int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove color scheme \"%1\"?").arg(m_ui->colorSchemeComboBox->currentText()), QMessageBox::Yes | QMessageBox::No); + if(button != QMessageBox::Yes){ return; } + if(QFile::remove(m_ui->colorSchemeComboBox->currentData().toString())){ + m_ui->colorSchemeComboBox->removeItem(index); + on_colorSchemeComboBox_activated(0); + } } void AppearancePage::copyColorScheme(){ - if(m_ui->colorSchemeComboBox->currentIndex() < 0) + if(m_ui->colorSchemeComboBox->currentIndex() < 0) { return; } + QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),QLineEdit::Normal, tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText())); + if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()){ return; } + if(!name.endsWith(".conf", Qt::CaseInsensitive)) { name.append(".conf"); } + if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ + QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); return; - QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"),QLineEdit::Normal, tr("%1 (copy)").arg(m_ui->colorSchemeComboBox->currentText())); - if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()) - return; - if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf"); - if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ - QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); - return; - } - QString newPath = lthemeengine::userColorSchemePath() + "/" + name; - QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath); - m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath); + } + QString newPath = lthemeengine::userColorSchemePath() + "/" + name; + QFile::copy(m_ui->colorSchemeComboBox->currentData().toString(), newPath); + m_ui->colorSchemeComboBox->addItem(name.section('.',0,0), newPath); } void AppearancePage::renameColorScheme(){ int index = m_ui->colorSchemeComboBox->currentIndex(); - if(index < 0) - return; - if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ - QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); - return; - } - QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"), QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText()); - if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()) - return; - if(!name.endsWith(".conf", Qt::CaseInsensitive))name.append(".conf"); - if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ - QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); - return; - } - QString newPath = lthemeengine::userColorSchemePath() + "/" + name; - QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath); - m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0)); - m_ui->colorSchemeComboBox->setItemData(index, newPath); + if(index < 0){ return; } + if(!QFileInfo(m_ui->colorSchemeComboBox->currentData().toString()).isWritable()){ + QMessageBox::information(this, tr("Warning"), tr("The color scheme \"%1\" is read only").arg(m_ui->colorSchemeComboBox->currentText())); + return; + } + QString name = QInputDialog::getText(this, tr("Enter Color Scheme Name"), tr("File name:"), QLineEdit::Normal, m_ui->colorSchemeComboBox->currentText()); + if(name.isEmpty() || name == m_ui->colorSchemeComboBox->currentText()){ return; } + if(!name.endsWith(".conf", Qt::CaseInsensitive)){ name.append(".conf"); } + if(m_ui->colorSchemeComboBox->findText(name.section('.',0,0)) != -1){ + QMessageBox::warning(this, tr("Error"), tr("The color scheme \"%1\" already exists").arg(name.section('.',0,0))); + return; + } + QString newPath = lthemeengine::userColorSchemePath() + "/" + name; + QFile::rename(m_ui->colorSchemeComboBox->currentData().toString(), newPath); + m_ui->colorSchemeComboBox->setItemText(index, name.section('.',0,0)); + m_ui->colorSchemeComboBox->setItemData(index, newPath); } void AppearancePage::updatePalette(){ - if(!m_selectedStyle) - return; - setPreviewPalette(m_ui->customPaletteButton->isChecked() ? m_customPalette : m_selectedStyle->standardPalette()); + if(!m_selectedStyle){ return; } + setPreviewPalette(m_ui->customPaletteButton->isChecked() ? m_customPalette : m_selectedStyle->standardPalette()); } void AppearancePage::setPreviewPalette(const QPalette &p){ @@ -171,15 +158,15 @@ void AppearancePage::setPreviewPalette(const QPalette &p){ if(m_ui->paletteComboBox->currentIndex() == 0){ colorGroup = QPalette::Active; } - else if(m_ui->paletteComboBox->currentIndex() == 1){ - colorGroup = QPalette::Inactive; - } - for (int i = 0; i < QPalette::NColorRoles; i++){ - QPalette::ColorRole role = QPalette::ColorRole(i); - previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role)); - previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role)); - } - setPalette(m_ui->mdiArea, previewPalette); + else if(m_ui->paletteComboBox->currentIndex() == 1){ + colorGroup = QPalette::Inactive; + } + for (int i = 0; i < QPalette::NColorRoles; i++){ + QPalette::ColorRole role = QPalette::ColorRole(i); + previewPalette.setColor(QPalette::Active, role, p.color(colorGroup, role)); + previewPalette.setColor(QPalette::Inactive, role, p.color(colorGroup, role)); + } + setPalette(m_ui->mdiArea, previewPalette); } void AppearancePage::updateActions(){ @@ -188,11 +175,11 @@ void AppearancePage::updateActions(){ m_renameColorSchemeAction->setVisible(false); m_removeColorSchemeAction->setVisible(false); } - else{ - m_changeColorSchemeAction->setVisible(true); - m_renameColorSchemeAction->setVisible(true); - m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1); - } + else{ + m_changeColorSchemeAction->setVisible(true); + m_renameColorSchemeAction->setVisible(true); + m_removeColorSchemeAction->setVisible(m_ui->colorSchemeComboBox->count() > 1); + } } void AppearancePage::readSettings(){ @@ -208,22 +195,22 @@ void AppearancePage::readSettings(){ if(m_ui->colorSchemeComboBox->count() == 0){ m_customPalette = palette(); //load fallback palette } - else{ - int index = m_ui->colorSchemeComboBox->findData(colorSchemePath); - if(index >= 0) - m_ui->colorSchemeComboBox->setCurrentIndex(index); - m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString()); - } - on_styleComboBox_activated(m_ui->styleComboBox->currentText()); - settings.endGroup(); + else{ + int index = m_ui->colorSchemeComboBox->findData(colorSchemePath); + if(index >= 0) + m_ui->colorSchemeComboBox->setCurrentIndex(index); + m_customPalette = loadColorScheme(m_ui->colorSchemeComboBox->currentData().toString()); + } + on_styleComboBox_activated(m_ui->styleComboBox->currentText()); + settings.endGroup(); } void AppearancePage::setStyle(QWidget *w, QStyle *s){ foreach (QObject *o, w->children()){ - if(o->isWidgetType()){ - setStyle(qobject_cast(o), s); + if(o->isWidgetType()){ + setStyle(qobject_cast(o), s); + } } - } w->setStyle(s); } @@ -261,10 +248,10 @@ QPalette AppearancePage::loadColorScheme(const QString &filePath){ customPalette.setColor(QPalette::Disabled, role, QColor(disabledColors.at(i))); } } - else{ - customPalette = palette(); //load fallback palette - } - return customPalette; + else{ + customPalette = palette(); //load fallback palette + } + return customPalette; } void AppearancePage::createColorScheme(const QString &name, const QPalette &palette){ diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp index cfe002aa..1a09ac0d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp @@ -22,22 +22,20 @@ IconThemePage::~IconThemePage(){ void IconThemePage::writeSettings(){ QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QTreeWidgetItem *item = m_ui->treeWidget->currentItem(); - if(item) - settings.setValue("Appearance/icon_theme", item->data(3, Qt::UserRole)); + if(item){ settings.setValue("Appearance/icon_theme", item->data(3, Qt::UserRole)); } } void IconThemePage::readSettings(){ QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); QString name = settings.value("Appearance/icon_theme").toString(); - if(name.isEmpty()) - return; - for(int i = 0; i < m_ui->treeWidget->topLevelItemCount(); ++i){ - QTreeWidgetItem *item = m_ui->treeWidget->topLevelItem(i); - if(item->data(3, Qt::UserRole).toString() == name){ - m_ui->treeWidget->setCurrentItem(item); - break; - } + if(name.isEmpty()){ return; } + for(int i = 0; i < m_ui->treeWidget->topLevelItemCount(); ++i){ + QTreeWidgetItem *item = m_ui->treeWidget->topLevelItem(i); + if(item->data(3, Qt::UserRole).toString() == name){ + m_ui->treeWidget->setCurrentItem(item); + break; } + } } void IconThemePage::loadThemes(){ @@ -61,39 +59,33 @@ void IconThemePage::loadTheme(const QString &path){ config.setIniCodec("UTF-8"); config.beginGroup("Icon Theme"); QStringList dirs = config.value("Directories").toStringList(); - if(dirs.isEmpty() || config.value("Hidden", false).toBool()) - return; - QString name, comment; - QString lang = QLocale::system().name(); - name = config.value(QString("Name[%1]").arg(lang)).toString(); - comment = config.value(QString("Comment[%1]").arg(lang)).toString(); - if(lang.contains("_")) - lang = lang.split("_").first(); - if(name.isEmpty()) - name = config.value(QString("Name[%1]").arg(lang)).toString(); - if(comment.isEmpty()) - comment = config.value(QString("Comment[%1]").arg(lang)).toString(); - if(name.isEmpty()) - name = config.value("Name").toString(); - if(comment.isEmpty()) - comment = config.value("Comment").toString(); - config.endGroup(); - QIcon icon1 = findIcon(path, 24, "document-save"); - QIcon icon2 = findIcon(path, 24, "document-print"); - QIcon icon3 = findIcon(path, 24, "media-playback-stop"); - QTreeWidgetItem *item = new QTreeWidgetItem(); - item->setIcon(0, icon1); - item->setIcon(1, icon2); - item->setIcon(2, icon3); - item->setText(3, name); - item->setData(3, Qt::UserRole, QFileInfo(path).path().section("/", -1)); - item->setToolTip(3, comment); - item->setSizeHint(0, QSize(24,24)); - m_ui->treeWidget->addTopLevelItem(item); - m_ui->treeWidget->resizeColumnToContents(0); - m_ui->treeWidget->resizeColumnToContents(1); - m_ui->treeWidget->resizeColumnToContents(2); - m_ui->treeWidget->resizeColumnToContents(3); + if(dirs.isEmpty() || config.value("Hidden", false).toBool()){ return; } + QString name, comment; + QString lang = QLocale::system().name(); + name = config.value(QString("Name[%1]").arg(lang)).toString(); + comment = config.value(QString("Comment[%1]").arg(lang)).toString(); + if(lang.contains("_")){ lang = lang.split("_").first(); } + if(name.isEmpty()){ name = config.value(QString("Name[%1]").arg(lang)).toString(); } + if(comment.isEmpty()){ comment = config.value(QString("Comment[%1]").arg(lang)).toString(); } + if(name.isEmpty()){ name = config.value("Name").toString(); } + if(comment.isEmpty()){ comment = config.value("Comment").toString(); } + config.endGroup(); + QIcon icon1 = findIcon(path, 24, "document-save"); + QIcon icon2 = findIcon(path, 24, "document-print"); + QIcon icon3 = findIcon(path, 24, "media-playback-stop"); + QTreeWidgetItem *item = new QTreeWidgetItem(); + item->setIcon(0, icon1); + item->setIcon(1, icon2); + item->setIcon(2, icon3); + item->setText(3, name); + item->setData(3, Qt::UserRole, QFileInfo(path).path().section("/", -1)); + item->setToolTip(3, comment); + item->setSizeHint(0, QSize(24,24)); + m_ui->treeWidget->addTopLevelItem(item); + m_ui->treeWidget->resizeColumnToContents(0); + m_ui->treeWidget->resizeColumnToContents(1); + m_ui->treeWidget->resizeColumnToContents(2); + m_ui->treeWidget->resizeColumnToContents(3); } QIcon IconThemePage::findIcon(const QString &themePath, int size, const QString &name){ @@ -127,18 +119,15 @@ QIcon IconThemePage::findIcon(const QString &themePath, int size, const QString } config.endGroup(); } - if (!haveInherits) - return QIcon(); - parents.append("hicolor"); //add fallback themes - parents.append("gnome"); - parents.removeDuplicates(); - foreach (QString parent, parents){ - QString parentThemePath = QDir(QFileInfo(themePath).path() + "/../" + parent).canonicalPath() + "/index.theme"; - if(!QFile::exists(parentThemePath) || parentThemePath == themePath) - continue; - QIcon icon = findIcon(parentThemePath, size, name); - if(!icon.isNull()) - return icon; - } - return QIcon(); + if (!haveInherits){ return QIcon(); } + parents.append("hicolor"); //add fallback themes + parents.append("gnome"); + parents.removeDuplicates(); + foreach (QString parent, parents){ + QString parentThemePath = QDir(QFileInfo(themePath).path() + "/../" + parent).canonicalPath() + "/index.theme"; + if(!QFile::exists(parentThemePath) || parentThemePath == themePath){ continue; } + QIcon icon = findIcon(parentThemePath, size, name); + if(!icon.isNull()){ return icon; } + } + return QIcon(); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp index a44e75e4..38f6ef8f 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp @@ -36,22 +36,15 @@ void InterfacePage::writeSettings(){ settings.setValue("toolbutton_style", m_ui->toolButtonStyleComboBox->currentData()); settings.setValue("wheel_scroll_lines", m_ui->wheelScrollLinesSpinBox->value()); QStringList effects; - if(m_ui->guiEffectsCheckBox->isChecked()) - effects << "General"; - if(m_ui->menuEffectComboBox->currentIndex() == 1) - effects << "AnimateMenu"; - else if(m_ui->menuEffectComboBox->currentIndex() == 2) - effects << "FadeMenu"; - if(m_ui->comboBoxEffectComboBox->currentIndex() == 1) - effects << "AnimateCombo"; - if(m_ui->toolTipEffectComboBox->currentIndex() == 1) - effects << "AnimateTooltip"; - else if(m_ui->toolTipEffectComboBox->currentIndex() == 2) - effects << "FadeTooltip"; - if(m_ui->toolBoxEffectComboBox->currentIndex() == 1) - effects << "AnimateToolBox"; - settings.setValue("gui_effects", effects); - settings.endGroup(); + if(m_ui->guiEffectsCheckBox->isChecked()){ effects << "General";} + if(m_ui->menuEffectComboBox->currentIndex() == 1){ effects << "AnimateMenu"; } + else if(m_ui->menuEffectComboBox->currentIndex() == 2){ effects << "FadeMenu"; } + if(m_ui->comboBoxEffectComboBox->currentIndex() == 1){ effects << "AnimateCombo"; } + if(m_ui->toolTipEffectComboBox->currentIndex() == 1){ effects << "AnimateTooltip"; } + else if(m_ui->toolTipEffectComboBox->currentIndex() == 2){ effects << "FadeTooltip"; } + if(m_ui->toolBoxEffectComboBox->currentIndex() == 1){ effects << "AnimateToolBox"; } + settings.setValue("gui_effects", effects); + settings.endGroup(); } void InterfacePage::readSettings(){ @@ -62,27 +55,19 @@ void InterfacePage::readSettings(){ m_ui->guiEffectsCheckBox->setChecked(qApp->isEffectEnabled(Qt::UI_General)); int layout = settings.value("buttonbox_layout", style()->styleHint(QStyle::SH_DialogButtonLayout)).toInt(); int index = m_ui->buttonLayoutComboBox->findData(layout); - if(index >= 0) - m_ui->buttonLayoutComboBox->setCurrentIndex(index); - if(qApp->isEffectEnabled(Qt::UI_AnimateMenu)) - m_ui->menuEffectComboBox->setCurrentIndex(1); - else if(qApp->isEffectEnabled(Qt::UI_FadeMenu)) - m_ui->menuEffectComboBox->setCurrentIndex(2); - if(qApp->isEffectEnabled(Qt::UI_AnimateCombo)) - m_ui->comboBoxEffectComboBox->setCurrentIndex(1); - if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip)) - m_ui->toolTipEffectComboBox->setCurrentIndex(1); - else if(qApp->isEffectEnabled(Qt::UI_FadeTooltip)) - m_ui->toolTipEffectComboBox->setCurrentIndex(2); - if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox)) - m_ui->toolBoxEffectComboBox->setCurrentIndex(1); - m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt()); - m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt()); - m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus)); - int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt(); - index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle); - if(index >= 0) - m_ui->toolButtonStyleComboBox->setCurrentIndex(index); - m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt()); - settings.endGroup(); + if(index >= 0){ m_ui->buttonLayoutComboBox->setCurrentIndex(index); } + if(qApp->isEffectEnabled(Qt::UI_AnimateMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(1); } + else if(qApp->isEffectEnabled(Qt::UI_FadeMenu)){ m_ui->menuEffectComboBox->setCurrentIndex(2); } + if(qApp->isEffectEnabled(Qt::UI_AnimateCombo)){ m_ui->comboBoxEffectComboBox->setCurrentIndex(1); } + if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip)){ m_ui->toolTipEffectComboBox->setCurrentIndex(1); } + else if(qApp->isEffectEnabled(Qt::UI_FadeTooltip)){ m_ui->toolTipEffectComboBox->setCurrentIndex(2); } + if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox)){ m_ui->toolBoxEffectComboBox->setCurrentIndex(1); } + m_ui->singleClickCheckBox->setCheckState((Qt::CheckState)settings.value("activate_item_on_single_click", Qt::PartiallyChecked).toInt()); + m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons", Qt::PartiallyChecked).toInt()); + m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus)); + int toolbarStyle = settings.value("toolbutton_style", Qt::ToolButtonFollowStyle).toInt(); + index = m_ui->toolButtonStyleComboBox->findData(toolbarStyle); + if(index >= 0){ m_ui->toolButtonStyleComboBox->setCurrentIndex(index); } + m_ui->wheelScrollLinesSpinBox->setValue(settings.value("wheel_scroll_lines", 3).toInt()); + settings.endGroup(); } 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 979c8c43..36b0c2fa 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp @@ -25,19 +25,16 @@ QStringList lthemeengine::iconPaths(){ paths << "/usr/local/share/icons"; } else{ - foreach (QString p, xdgDataDirs.split(":")) - paths << QDir(p + "/icons/").absolutePath(); + foreach (QString p, xdgDataDirs.split(":")){ paths << QDir(p + "/icons/").absolutePath(); } + } + if(xdgDataHome.isEmpty()){ xdgDataHome = QDir::homePath() + "/.local/share"; } + paths << "/usr/share/pixmaps"; + paths << xdgDataHome + "/icons"; + paths.removeDuplicates(); + //remove invalid + foreach (QString p, paths){ + if(!QDir(p).exists()){ paths.removeAll(p); } } - if(xdgDataHome.isEmpty()) - xdgDataHome = QDir::homePath() + "/.local/share"; - paths << "/usr/share/pixmaps"; - paths << xdgDataHome + "/icons"; - paths.removeDuplicates(); - //remove invalid - foreach (QString p, paths){ - if(!QDir(p).exists()) - paths.removeAll(p); - } return paths; } @@ -49,12 +46,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(!QStyleFactory::keys().contains("lthemeengine-style")){ - errorMessages << app.translate("main", "Unable to find liblthemeengine-style.so"); - } + if(env.contains("QT_STYLE_OVERRIDE")){ errorMessages << app.translate("main", "Please remove the QT_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(!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("

")); return 0; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp index c93b1052..719a0f49 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp @@ -38,9 +38,8 @@ void MainWindow::on_buttonBox_clicked(QAbstractButton *button){ if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Apply){ for(int i = 0; i < m_ui->tabWidget->count(); ++i){ TabPage *p = qobject_cast(m_ui->tabWidget->widget(i)); - if(p) - p->writeSettings(); - } + if(p) { p->writeSettings(); } + } } if(id == QDialogButtonBox::Ok || id == QDialogButtonBox::Cancel){ close(); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp index 8a8e86d0..9cce5a6e 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp @@ -37,15 +37,12 @@ QPalette PaletteEditDialog::selectedPalette() const{ void PaletteEditDialog::setPalette(const QPalette &palette){ for(int i = 0; i < QPalette::NColorRoles; i++){ - if(!m_ui->tableWidget->item(i,0)) - m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem()); - if(!m_ui->tableWidget->item(i,1)) - m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem()); - if(!m_ui->tableWidget->item(i,2)) - m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem()); - m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i))); - m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i))); - m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i))); + if(!m_ui->tableWidget->item(i,0)){ m_ui->tableWidget->setItem(i, 0, new QTableWidgetItem()); } + if(!m_ui->tableWidget->item(i,1)){ m_ui->tableWidget->setItem(i, 1, new QTableWidgetItem()); } + if(!m_ui->tableWidget->item(i,2)){ m_ui->tableWidget->setItem(i, 2, new QTableWidgetItem()); } + m_ui->tableWidget->item(i,0)->setBackgroundColor(palette.color(QPalette::Active, QPalette::ColorRole(i))); + m_ui->tableWidget->item(i,1)->setBackgroundColor(palette.color(QPalette::Inactive, QPalette::ColorRole(i))); + m_ui->tableWidget->item(i,2)->setBackgroundColor(palette.color(QPalette::Disabled, QPalette::ColorRole(i))); } QStringList labels; labels << tr("Window text") << tr("Button background") << tr("Bright") << tr("Less bright") << tr("Dark") << tr("Less dark") << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow") << tr("Highlight") << tr("Highlighted text") << tr("Link") << tr("Visited link") << tr("Alternate background") << tr("Default") << tr("Tooltip background") << tr("Tooltip text"); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp index aa4bb810..97d4ea1a 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp @@ -36,10 +36,6 @@ void QSSEditorDialog::on_buttonBox_clicked(QAbstractButton *button){ save(); accept(); } - else if(id == QDialogButtonBox::Save){ - save(); - } - else{ - reject(); - } + else if(id == QDialogButtonBox::Save){ save(); } + else{ reject(); } } 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 c9bfc14a..d690ef5d 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -36,10 +36,9 @@ void QSSPage::writeSettings(){ QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); for(int i = 0; i < m_ui->qssListWidget->count(); ++i){ QListWidgetItem *item = m_ui->qssListWidget->item(i); - if(item->checkState() == Qt::Checked) - styleSheets << item->data(QSS_FULL_PATH_ROLE).toString(); - } + if(item->checkState() == Qt::Checked){ styleSheets << item->data(QSS_FULL_PATH_ROLE).toString(); } settings.setValue("Interface/stylesheets", styleSheets); + } } void QSSPage::on_qssListWidget_currentItemChanged(QListWidgetItem *current, QListWidgetItem *){ @@ -57,26 +56,24 @@ void QSSPage::on_qssListWidget_currentItemChanged(QListWidgetItem *current, QLis void QSSPage::on_createButton_clicked(){ QString name = QInputDialog::getText(this, tr("Enter Style Sheet Name"), tr("File name:")); - if(name.isEmpty()) + if(name.isEmpty()){ return; } + if(!name.endsWith(".qss", Qt::CaseInsensitive)){ name.append(".qss"); } + QString filePath = lthemeengine::userStyleSheetPath() + name; + if(QFile::exists(filePath)){ + QMessageBox::warning(this, tr("Error"), tr("The file \"%1\" already exists").arg(filePath)); return; - if(!name.endsWith(".qss", Qt::CaseInsensitive)) - name.append(".qss"); - QString filePath = lthemeengine::userStyleSheetPath() + name; - if(QFile::exists(filePath)){ - QMessageBox::warning(this, tr("Error"), tr("The file \"%1\" already exists").arg(filePath)); - return; - } - //creating empty file - QFile file(filePath); - file.open(QIODevice::WriteOnly); - file.close(); - //creating item - QFileInfo info(filePath); - 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()); - item->setCheckState(Qt::Unchecked); + } + //creating empty file + QFile file(filePath); + file.open(QIODevice::WriteOnly); + file.close(); + //creating item + QFileInfo info(filePath); + 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()); + item->setCheckState(Qt::Unchecked); } void QSSPage::on_editButton_clicked(){ @@ -89,13 +86,10 @@ void QSSPage::on_editButton_clicked(){ void QSSPage::on_removeButton_clicked(){ QListWidgetItem *item = m_ui->qssListWidget->currentItem(); - if(!item) - return; - int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove style sheet \"%1\"?").arg(item->text()), QMessageBox::Yes | QMessageBox::No); - if(button == QMessageBox::Yes){ - QFile::remove(item->data(QSS_FULL_PATH_ROLE).toString()); - delete item; - } + if(!item){ return; } + int button = QMessageBox::question(this, tr("Confirm Remove"),tr("Are you sure you want to remove style sheet \"%1\"?").arg(item->text()), QMessageBox::Yes | QMessageBox::No); + if(button == QMessageBox::Yes){ QFile::remove(item->data(QSS_FULL_PATH_ROLE).toString()); } + delete item; } void QSSPage::readSettings(){ @@ -107,10 +101,8 @@ void QSSPage::readSettings(){ QStringList styleSheets = settings.value("Interface/stylesheets").toStringList(); for(int i = 0; i < m_ui->qssListWidget->count(); ++i){ QListWidgetItem *item = m_ui->qssListWidget->item(i); - if(styleSheets.contains(item->data(QSS_FULL_PATH_ROLE).toString())) - item->setCheckState(Qt::Checked); - else - item->setCheckState(Qt::Unchecked); + if(styleSheets.contains(item->data(QSS_FULL_PATH_ROLE).toString())){ item->setCheckState(Qt::Checked); } + else { item->setCheckState(Qt::Unchecked); } } } @@ -128,29 +120,25 @@ void QSSPage::findStyleSheets(const QString &path){ void QSSPage::on_renameButton_clicked(){ QListWidgetItem *item = m_ui->qssListWidget->currentItem(); - if(!item) + if(!item){ return; } + QString name = QInputDialog::getText(this, tr("Rename Style Sheet"), tr("Style sheet name:"), QLineEdit::Normal, item->text(), 0); + if(name.isEmpty()){ return; } + if(!m_ui->qssListWidget->findItems(name, Qt::MatchExactly).isEmpty()){ + QMessageBox::warning(this, tr("Error"), tr("The style sheet \"%1\" already exists").arg(name)); return; - QString name = QInputDialog::getText(this, tr("Rename Style Sheet"), tr("Style sheet name:"), QLineEdit::Normal, item->text(), 0); - if(name.isEmpty()) - return; - if(!m_ui->qssListWidget->findItems(name, Qt::MatchExactly).isEmpty()){ - QMessageBox::warning(this, tr("Error"), tr("The style sheet \"%1\" already exists").arg(name)); - return; - } - if(!name.endsWith(".qss", Qt::CaseInsensitive)) name.append(".qss"); - QString newPath = lthemeengine::userStyleSheetPath() + name; - if(!QFile::rename(item->data(QSS_FULL_PATH_ROLE).toString(), newPath)){ - QMessageBox::warning(this, tr("Error"), tr("Unable to rename file")); - return; - } - item->setText(name); - item->setData(QSS_FULL_PATH_ROLE, newPath); - item->setToolTip(newPath); + } + if(!name.endsWith(".qss", Qt::CaseInsensitive)){ name.append(".qss"); } + QString newPath = lthemeengine::userStyleSheetPath() + name; + if(!QFile::rename(item->data(QSS_FULL_PATH_ROLE).toString(), newPath)){ + QMessageBox::warning(this, tr("Error"), tr("Unable to rename file")); + return; + } + item->setText(name); + item->setData(QSS_FULL_PATH_ROLE, newPath); + item->setToolTip(newPath); } void QSSPage::on_qssListWidget_customContextMenuRequested(const QPoint &pos){ QListWidgetItem *item = m_ui->qssListWidget->currentItem(); - if(item && item->data(QSS_WRITABLE_ROLE).toBool()){ - m_menu->exec(m_ui->qssListWidget->viewport()->mapToGlobal(pos)); - } + if(item && item->data(QSS_WRITABLE_ROLE).toBool()){ m_menu->exec(m_ui->qssListWidget->viewport()->mapToGlobal(pos)); } } -- cgit From 92e179ef3773df050662400e70cc4b0e8ccc3bae Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Mon, 31 Jul 2017 10:56:22 -0400 Subject: Resynced Translation Files --- src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts | 10 +++++----- src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts | 10 +++++----- src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts | 10 +++++----- src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts | 10 +++++----- src-qt5/core/lumina-info/i18n/lumina-info_cs.ts | 8 ++++---- src-qt5/core/lumina-open/i18n/lumina-open_cs.ts | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts index d700dbbc..b22b1309 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts @@ -265,12 +265,12 @@ - Don't expect to build up the weak by pulling down the strong. + Don't expect to build up the weak by pulling down the strong. Neočekávejte že povzbudíte slabé tím že stáhnete dolů silné. - You can't know too much, but you can say too much. + You can't know too much, but you can say too much. Nemůžete vědět příliš mnoho, ale můžete toho říct přespříliš. @@ -350,7 +350,7 @@ - Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. Jen dvě věci jsou nekonečné – vesmír a lidská hloupost. Tím prvním si vlastně nejsem tak úplně jistý. @@ -360,7 +360,7 @@ - Do, or do not. There is no 'try'. + Do, or do not. There is no 'try'. Udělejte to, nebo to nedělejte vůbec. Nejde o to to jen zkoušet. @@ -380,7 +380,7 @@ - It's kind of fun to do the impossible. + It's kind of fun to do the impossible. Dělat nemožné je zábava. diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts index bbc321e2..b89fb14b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -265,12 +265,12 @@ - Don't expect to build up the weak by pulling down the strong. + Don't expect to build up the weak by pulling down the strong. - You can't know too much, but you can say too much. + You can't know too much, but you can say too much. @@ -350,7 +350,7 @@ - Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. @@ -360,7 +360,7 @@ - Do, or do not. There is no 'try'. + Do, or do not. There is no 'try'. @@ -380,7 +380,7 @@ - It's kind of fun to do the impossible. + It's kind of fun to do the impossible. diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts index bbc321e2..b89fb14b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts @@ -265,12 +265,12 @@ - Don't expect to build up the weak by pulling down the strong. + Don't expect to build up the weak by pulling down the strong. - You can't know too much, but you can say too much. + You can't know too much, but you can say too much. @@ -350,7 +350,7 @@ - Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. @@ -360,7 +360,7 @@ - Do, or do not. There is no 'try'. + Do, or do not. There is no 'try'. @@ -380,7 +380,7 @@ - It's kind of fun to do the impossible. + It's kind of fun to do the impossible. diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts index ad5bcdff..d1289b1b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts @@ -265,12 +265,12 @@ - Don't expect to build up the weak by pulling down the strong. + Don't expect to build up the weak by pulling down the strong. - You can't know too much, but you can say too much. + You can't know too much, but you can say too much. No puedes saber demasiado, pero puedes decir demasiado. @@ -350,7 +350,7 @@ - Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. @@ -360,7 +360,7 @@ - Do, or do not. There is no 'try'. + Do, or do not. There is no 'try'. @@ -380,7 +380,7 @@ - It's kind of fun to do the impossible. + It's kind of fun to do the impossible. diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_cs.ts b/src-qt5/core/lumina-info/i18n/lumina-info_cs.ts index 923e27a1..071addb4 100644 --- a/src-qt5/core/lumina-info/i18n/lumina-info_cs.ts +++ b/src-qt5/core/lumina-info/i18n/lumina-info_cs.ts @@ -70,8 +70,8 @@ - <a href="https://github.com/beanpole135">Ken Moore</a> - <a href="https://github.com/beanpole135">Ken Moore</a> + <a href="https://github.com/beanpole135">Ken Moore</a> + <a href="https://github.com/beanpole135">Ken Moore</a> @@ -85,8 +85,8 @@ - <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> - <a href="https://github.com/pcbsd/lumina/graphs/contributors">Otevřít v prohlížeči<a> + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Otevřít v prohlížeči<a> diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts b/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts index 6a32e742..3123825f 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts @@ -195,7 +195,7 @@ - Could not find "%1". Please ensure it is installed first. + Could not find "%1". Please ensure it is installed first. Nepodařilo se najít „%1“. Nejprve zajistěte, aby bylo nainstalované. -- cgit From ff6c6a59c8f8aea4a7c0e2d5647f66d51a4c7a58 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 31 Jul 2017 12:50:09 -0400 Subject: Fix up the grav screensaver a bit so it does not crash on close any more. --- .../src-screensaver/SSBaseWidget.cpp | 2 +- .../lumina-desktop-unified/src-screensaver/SSBaseWidget.h | 8 ++++---- .../src-screensaver/animations/Grav.h | 15 ++++++++------- 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp index b31ef793..ed224695 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp @@ -78,7 +78,7 @@ void SSBaseWidget::stopPainting(){ if(ANIM!=0){ ANIM->stop(); ANIM->clear(); - delete ANIM; + ANIM->deleteLater(); ANIM = 0; } } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h index bdcefa24..9d987178 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h @@ -14,10 +14,10 @@ class SSBaseWidget : public QWidget{ Q_OBJECT -public: +public: SSBaseWidget(QWidget *parent, QSettings *set); ~SSBaseWidget(); - + void setPlugin(QString); public slots: @@ -30,7 +30,7 @@ private: QSettings *settings; private slots: - + signals: void InputDetected(); //just in case no event handling setup at the WM level @@ -49,7 +49,7 @@ protected: QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } - + }; #endif 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 ad1b1122..d62fe980 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 @@ -93,13 +93,16 @@ public: orbit->setTargetObject(planet); //Creates the random position of the planet, making sure it isn't too close to the sun - int randwidth = qrand()%(range.width()/2); - if(randwidth < range.width() + 100 and randwidth > range.width() - 100) randwidth = 100; - int randheight= qrand()%(range.height()/2); - if(randheight < range.height() + 100 and randheight > range.height() - 100) randheight = 100; + QRect invalid = QRect(center+QPoint(-50,-50), center+QPoint(50,50)); + QPoint tmp = center; + while(invalid.contains(center)){ + int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; + int randheight= qrand()%(range.height()- 2*planet_radius) + planet_radius; + tmp = QPoint(randwidth, randheight); + } //Creates all frames for the animation - setupLoop(QPoint(randwidth, randheight), ¢er); + setupLoop(tmp, ¢er); this->addAnimation(orbit); planet->show(); @@ -172,13 +175,11 @@ public: //Loops through all planets and sets up the animations, then adds them to the base group and vector, which for(int i=0; inumber){ continue; } Grav *tmp = new Grav(canvas); this->addAnimation(tmp); connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished())); planets << tmp; } - while(planets.length()>number){planets.takeAt(number)->deleteLater(); } } }; -- cgit From 9b2a9129d27e5666c188a4c3488da87cf7bc3a7d Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 31 Jul 2017 13:05:40 -0400 Subject: A few updates for lumina-screenshot: When selecting a window/area, make the window transparent. Ensure the single-instance system works for this apps (was not closing new process). --- src-qt5/core/libLumina/LuminaSingleApplication.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.cpp b/src-qt5/core/libLumina/LuminaSingleApplication.cpp index a97753c5..86248666 100644 --- a/src-qt5/core/libLumina/LuminaSingleApplication.cpp +++ b/src-qt5/core/libLumina/LuminaSingleApplication.cpp @@ -35,12 +35,12 @@ LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname) }else{ if(!path.startsWith("/") && !path.startsWith("-") ){ path.prepend(QDir::currentPath()+"/"); } } - inputlist << path; + inputlist << path; } isActive = isBypass = false; lserver = 0; //Now check for the manual CLI flag to bypass single-instance forwarding (if necessary) - if(inputlist.contains("-new-instance")){ + if(inputlist.contains("-new-instance")){ isBypass = true; inputlist.removeAll("-new-instance"); } @@ -48,16 +48,16 @@ LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname) } LSingleApplication::~LSingleApplication(){ - if(lserver != 0 && lockfile->isLocked() ){ + if(lserver != 0 && lockfile->isLocked() ){ //currently locked instance: remove the lock now lserver->close(); QLocalServer::removeServer(cfile); - lockfile->unlock(); + lockfile->unlock(); } } bool LSingleApplication::isPrimaryProcess(){ - return (isActive || isBypass); + return (isActive || isBypass); } void LSingleApplication::PerformLockChecks(){ @@ -99,7 +99,7 @@ void LSingleApplication::PerformLockChecks(){ lockfile->unlock(); isActive = true; } - + }else if(!isBypass){ //forward the current inputs to the locked process for processing and exit //Check the connection to the local server first -- cgit From 9d8c6f677e861e7bf9142ff025702e86fb87eac0 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 31 Jul 2017 13:28:59 -0400 Subject: Add some commented-out code for changing theme engines --- src-qt5/core/lumina-desktop/main.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp index 5eb58aa9..1b0e5e4d 100644 --- a/src-qt5/core/lumina-desktop/main.cpp +++ b/src-qt5/core/lumina-desktop/main.cpp @@ -73,6 +73,7 @@ int main(int argc, char ** argv) 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_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); -- cgit From c7511227aa60d92ecc44d5fd41d2874f508910bb Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 1 Aug 2017 11:39:41 -0400 Subject: Fixed language attribute in Australian XML files --- src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts | 2 +- src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts | 2 +- src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts index b89fb14b..2b611add 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -1,6 +1,6 @@ - + AppLaunchButtonPlugin diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts b/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts index d747c640..4f3f0706 100644 --- a/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts +++ b/src-qt5/core/lumina-info/i18n/lumina-info_en_AU.ts @@ -1,6 +1,6 @@ - + MainUI diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts b/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts index 91d418fa..535b6209 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_en_AU.ts @@ -1,6 +1,6 @@ - + LFileDialog -- cgit From 6205f2aea8c5a7e881193e2e5b38377f9de9a35d Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 1 Aug 2017 14:11:47 -0400 Subject: fix default prefix path --- src-qt5/core/lumina-theme-engine/lthemeengine.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro index d8ba709e..805bab7b 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro @@ -11,7 +11,7 @@ desktop.path=$${L_SHAREDIR}/applications/ #Install paths unix { isEmpty(PREFIX) { - PREFIX = /usr + PREFIX = /usr/local } isEmpty(PLUGINDIR) { PLUGINDIR = $$[QT_INSTALL_PLUGINS] -- cgit From b5705ea266fb63c94d01360b7e2b00ec46f9c3d7 Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 1 Aug 2017 14:34:41 -0400 Subject: minor housekeeping to pro files --- src-qt5/core/lumina-theme-engine/lthemeengine.pri | 10 +--------- src-qt5/core/lumina-theme-engine/lthemeengine.pro | 6 ++++-- .../src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro | 4 ---- 3 files changed, 5 insertions(+), 15 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri index be67734b..aa8a58bb 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pri +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri @@ -8,18 +8,10 @@ QMAKE_DISTCLEAN += -r .build CONFIG += c++11 -!isEqual (QT_MAJOR_VERSION, 5) { - error("Use Qt 5.4.0 or higher.") -} - -!greaterThan(QT_MINOR_VERSION, 3) { - error("Use Qt 5.4.0 or higher.") -} - #Install paths unix { isEmpty(PREFIX) { - PREFIX = /usr + PREFIX = /usr/local/ } isEmpty(PLUGINDIR) { PLUGINDIR = $$[QT_INSTALL_PLUGINS] diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro index 805bab7b..e3cb47b1 100644 --- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro @@ -1,5 +1,7 @@ -QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network +QT += core gui widgets x11extras network +!isEqual (QT_MAJOR_VERSION, 5) { + error("Use Qt 5.4.0 or higher.") +} QMAKE_DISTCLEAN += -r .build 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 064c7642..a186cd49 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 @@ -19,10 +19,6 @@ SOURCES += \ lthemeengineplatformtheme.cpp \ ../lthemeengine/lthemeengine.cpp -!equals (DISABLE_WIDGETS,1) { - QT += widgets -} - OTHER_FILES += lthemeengine.json INCLUDEPATH += ../ -- cgit From 2458ca5221c850389f2def844061a529042fe794 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 1 Aug 2017 15:00:12 -0400 Subject: Fixed Grav loop and disabled screensaver brightness --- .../src-screensaver/LScreenSaver.cpp | 6 +++--- .../src-screensaver/animations/BaseAnimGroup.cpp | 2 +- .../src-screensaver/animations/Grav.h | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp index bfcfa54d..f9682c79 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -102,8 +102,8 @@ void LScreenSaver::ShowScreenSaver(){ //Now go through and create/show all the various widgets QList SCREENS = QApplication::screens(); QRect bounds; - cBright = LOS::ScreenBrightness(); - if(cBright>0){ LOS::setScreenBrightness(cBright/2); } //cut to half while the screensaver is active + //cBright = LOS::ScreenBrightness(); + //if(cBright>0){ LOS::setScreenBrightness(cBright/2); } //cut to half while the screensaver is active for(int i=0; igeometry()); if(DEBUG){ qDebug() << " - New SS Base:" << i; } @@ -144,7 +144,7 @@ void LScreenSaver::HideScreenSaver(){ //QApplication::restoreOverrideCursor(); if(DEBUG){ qDebug() << "Hiding Screen Saver:" << QDateTime::currentDateTime().toString(); } SSRunning = false; - if(cBright>0){ LOS::setScreenBrightness(cBright); } //return to current brightness + //if(cBright>0){ LOS::setScreenBrightness(cBright); } //return to current brightness if(!SSLocked){ this->hide(); emit ClosingScreenSaver(); 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 017eaf9f..aaae8b41 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 @@ -31,5 +31,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti } QStringList BaseAnimGroup::KnownAnimations(){ - return (QStringList() << "fireflies" << "grav" << "text"); + return (QStringList() << "grav"); } 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 d62fe980..a4ea5ed8 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 @@ -14,6 +14,7 @@ #include "BaseAnimGroup.h" #include #include +#include class Grav: public QParallelAnimationGroup{ Q_OBJECT @@ -56,7 +57,7 @@ private: 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); @@ -94,13 +95,17 @@ public: //Creates the random position of the planet, making sure it isn't too close to the sun QRect invalid = QRect(center+QPoint(-50,-50), center+QPoint(50,50)); - QPoint tmp = center; - while(invalid.contains(center)){ - int randwidth = qrand()%(range.width() - 2*planet_radius) + planet_radius; - int randheight= qrand()%(range.height()- 2*planet_radius) + planet_radius; + QPoint tmp = center; + while(invalid.contains(tmp)){ + int randwidth = qrand()%(int)(range.width() - 2*planet_radius) + planet_radius; + int randheight= qrand()%(int)(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); @@ -174,10 +179,11 @@ public: int number = settings->value("planets/number",10).toInt(); //Loops through all planets and sets up the animations, then adds them to the base group and vector, which + qDebug() << "Starting planets"; for(int i=0; iaddAnimation(tmp); - connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished())); + connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished())); planets << tmp; } } -- cgit From dfbc5f67f3069fb7d64b49f9b860f62835abb66a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 1 Aug 2017 15:35:40 -0400 Subject: Fix up the screensaver animation crashes *again*. --- .../src-screensaver/LScreenSaver.cpp | 5 +-- .../src-screensaver/SSBaseWidget.cpp | 3 +- .../src-screensaver/animations/Grav.h | 38 +++++++++++----------- 3 files changed, 24 insertions(+), 22 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp index f9682c79..0ac8aaeb 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -8,7 +8,7 @@ #include #include -#define DEBUG 0 +#define DEBUG 1 LScreenSaver::LScreenSaver() : QWidget(0,Qt::BypassWindowManagerHint | Qt::WindowStaysOnTopHint){ starttimer = new QTimer(this); @@ -151,8 +151,9 @@ void LScreenSaver::HideScreenSaver(){ emit LockStatusChanged(false); } for(int i=0; ihide(); + qDebug() << "Stop ScreenSaver:" << i; BASES[i]->stopPainting(); + BASES[i]->hide(); } UpdateTimers(); } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp index ed224695..9ef0c491 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp @@ -76,8 +76,9 @@ void SSBaseWidget::startPainting(){ void SSBaseWidget::stopPainting(){ if(ANIM!=0){ + qDebug() << "Stopping Animation!!"; ANIM->stop(); - ANIM->clear(); + //ANIM->clear(); ANIM->deleteLater(); ANIM = 0; } 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 a4ea5ed8..ec1de914 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 @@ -22,11 +22,11 @@ private: QWidget *planet; QPropertyAnimation *orbit; QSize range; - QList path; + //QList path; double radius; void setupLoop(QPoint start, QPoint *ref){ - orbit->setStartValue(start); + //orbit->setStartValue(start); //Used to find overall speed. Distance from the planet to the sun radius = qSqrt( (qPow(start.x()-ref->x(),2) + qPow(start.y()-ref->y(),2) )); @@ -40,9 +40,9 @@ private: 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); - path.push_back(firstP); + 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; isetKeyValueAt(i/step, newLoc); - path.push_back(newLoc); + 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); + //path.push_back(lastP); } private slots: 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();} @@ -80,7 +79,7 @@ public: QPoint center = parent->geometry().center(); //Creates a random planet size. Between 12 and 45 pixels - double planet_radius = 1.75* ((qrand()%20)+7); + int planet_radius = qRound(1.75* ((qrand()%20)+7) ); //Creates a random color in RGB, then creates a circular gradient QString color = "rgba(" + QString::number(qrand() % 256) + ", " + QString::number(qrand() % 256) + ", " + QString::number(qrand() % 256); @@ -97,28 +96,29 @@ public: QRect invalid = QRect(center+QPoint(-50,-50), center+QPoint(50,50)); QPoint tmp = center; while(invalid.contains(tmp)){ - int randwidth = qrand()%(int)(range.width() - 2*planet_radius) + planet_radius; - int randheight= qrand()%(int)(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(2000); //number of orbits - orbit->setEndValue(path.at(0)); - LoopChanged(0); //load initial values + this->setLoopCount(5); //number of orbits + orbit->setDuration( qrand() %1000 + 19000); //20 second orbits + //orbit->setEndValue(path.at(0)); + //LoopChanged(0); //load initial values //Sets the initial size and location of the planet planet->setGeometry(QRect(orbit->startValue().toPoint(), QSize(planet_radius, planet_radius))); - connect(this, SIGNAL(currentLoopChanged(int)), this, SLOT(LoopChanged(int)) ); + //connect(this, SIGNAL(currentLoopChanged(int)), this, SLOT(LoopChanged(int)) ); connect(this, SIGNAL(finished()), this, SLOT(stopped()) ); } ~Grav(){} -- cgit From f03f72324ff70af5285c50632df4148a6881fa46 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 2 Aug 2017 11:30:36 -0400 Subject: Adjust the screensaver restart routine a bit. --- src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp | 1 + src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp index 0ac8aaeb..2c36af80 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -109,6 +109,7 @@ void LScreenSaver::ShowScreenSaver(){ if(DEBUG){ qDebug() << " - New SS Base:" << i; } BASES << new SSBaseWidget(this, settings); connect(BASES[i], SIGNAL(InputDetected()), this, SLOT(newInputEvent()) ); + //Setup the geometry of the base to match the screen BASES[i]->setGeometry(SCREENS[i]->geometry()); //match this screen geometry BASES[i]->setPlugin(settings->value("screenplugin"+QString::number(i+1), settings->value("defaultscreenplugin","random").toString() ).toString() ); diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp index 9ef0c491..7854b597 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp @@ -39,8 +39,7 @@ void SSBaseWidget::startPainting(){ cplug = plugType; //free up any old animation instance if(ANIM!=0){ - ANIM->stop(); ANIM->clear(); - delete ANIM; ANIM = 0; + stopPainting(); } //If a random plugin - grab one of the known plugins if(cplug=="random"){ -- 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(-) (limited to 'src-qt5/core') 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 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(-) (limited to 'src-qt5/core') 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/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 +- 17 files changed, 77 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 (limited to 'src-qt5/core') 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/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 +- 13 files changed, 94 insertions(+), 44 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 (limited to 'src-qt5/core') 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. --- src-qt5/core/libLumina/LIconCache.cpp | 26 ++++++++++++++++++++++++-- src-qt5/core/libLumina/LIconCache.h | 3 +++ src-qt5/core/libLumina/LuminaXDG.cpp | 18 ++++++++++++------ 3 files changed, 39 insertions(+), 8 deletions(-) (limited to 'src-qt5/core') 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(-) (limited to 'src-qt5/core') 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(-) (limited to 'src-qt5/core') 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 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(-) (limited to 'src-qt5/core') 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 (limited to 'src-qt5/core') 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(+) (limited to 'src-qt5/core') 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(-) (limited to 'src-qt5/core') 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 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(-) (limited to 'src-qt5/core') 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 1a84ce27bfbe526a799cfacdf68597cc5cb85937 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 11 Aug 2017 13:57:43 -0400 Subject: Tag version 1.3.2 in source. This will help identify if people are at the point where lumina-pdf and lumina-theme-engine are integrated or not. --- src-qt5/core/libLumina/LDesktopUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 4454d29b..b79f777d 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -16,7 +16,7 @@ static QStringList fav; QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.3.1"; + QString ver = "1.3.2"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif -- cgit From 35b2806ce1df4745627214dbead72f3508f1235a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 09:11:41 -0400 Subject: Couple trivial changes to some files. --- src-qt5/core/lumina-desktop-unified/lumina-desktop.pro | 2 +- src-qt5/core/lumina-session/session.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro index 79f2ba6f..04d5b602 100644 --- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro @@ -1,7 +1,7 @@ include($${PWD}/../../OS-detect.pri) QT += core gui network -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia multimediawidgets concurrent svg diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index f9c8060a..9aebec49 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -95,7 +95,7 @@ void LSession::start(bool unified){ QSettings sessionsettings("lumina-desktop","sessionsettings"); QString WM = sessionsettings.value("WindowManager", "fluxbox").toString(); //Window Manager First - if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.isEmpty() ){ + if(WM=="fluxbox" || WM.endsWith("/fluxbox") || WM.simplified().isEmpty() ){ // FLUXBOX BUG BYPASS: if the ~/.fluxbox dir does not exist, it will ignore the given config file if( !LUtils::isValidBinary("fluxbox") ){ qDebug() << "[INCOMPLETE LUMINA INSTALLATION] fluxbox binary is missing - cannot continue"; -- cgit From 99fa7c8ab6198db465feca916dd9ea92e602f973 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 11:54:05 -0400 Subject: Add a wm failure counter to start-lumina-desktop, and restart the process up to 3 times maximum. --- src-qt5/core/lumina-session/session.cpp | 1 + src-qt5/core/lumina-session/session.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 9aebec49..fb9c6cd1 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -39,6 +39,7 @@ void LSession::procFinished(){ if(!stopping){ //See if this process is the main desktop binary if(PROCS[i]->objectName()=="runtime"){ stopall(); } + else if(PROCS[i]->objectName()=="wm" && wmfails<3){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); } //restart the WM //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything //else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process //break; diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index caa61ad6..36d67782 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -59,6 +59,7 @@ class LSession : public QObject{ private: QList PROCS; bool stopping; + int wmfails; private slots: void stopall(); @@ -69,7 +70,7 @@ private slots: public: LSession(){ - stopping = false; + stopping = false; wmfails = 0; } ~LSession(){ } -- cgit From 0302f69edae597b872fa75d364272b74f500c58b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 12:19:47 -0400 Subject: Some work on Lumina 2.x Disable compositing for now with a simple define - can re-enable later when more time to fix Start work on the client message detection/handling --- src-qt5/core/libLumina/NativeEmbedWidget.cpp | 41 +++++++++++++++------------ src-qt5/core/libLumina/NativeEventFilter.cpp | 8 +++++- src-qt5/core/libLumina/NativeWindowSystem.cpp | 4 +-- src-qt5/core/libLumina/RootSubWindow.cpp | 4 +++ src-qt5/core/libLumina/RootSubWindow.h | 1 + src-qt5/core/libLumina/RootWindow-mgmt.cpp | 27 ++++++++++++++---- src-qt5/core/libLumina/RootWindow.cpp | 13 +++++++-- src-qt5/core/libLumina/RootWindow.h | 5 ++-- 8 files changed, 72 insertions(+), 31 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/NativeEmbedWidget.cpp b/src-qt5/core/libLumina/NativeEmbedWidget.cpp index ed0fd89c..7d2dec0d 100644 --- a/src-qt5/core/libLumina/NativeEmbedWidget.cpp +++ b/src-qt5/core/libLumina/NativeEmbedWidget.cpp @@ -16,6 +16,8 @@ #include #include +#define DISABLE_COMPOSITING true + #define NORMAL_WIN_EVENT_MASK (XCB_EVENT_MASK_BUTTON_PRESS | \ XCB_EVENT_MASK_BUTTON_RELEASE | \ XCB_EVENT_MASK_POINTER_MOTION | \ @@ -27,6 +29,7 @@ XCB_EVENT_MASK_ENTER_WINDOW| \ XCB_EVENT_MASK_PROPERTY_CHANGE) + inline void registerClientEvents(WId id){ uint32_t value_list[1] = {NORMAL_WIN_EVENT_MASK}; xcb_change_window_attributes(QX11Info::connection(), id, XCB_CW_EVENT_MASK, value_list); @@ -62,15 +65,14 @@ void NativeEmbedWidget::showWindow(){ } QImage NativeEmbedWidget::windowImage(QRect geom){ - //if(paused){ return QImage(); } //Pull the XCB pixmap out of the compositing layer xcb_pixmap_t pix = xcb_generate_id(QX11Info::connection()); xcb_composite_name_window_pixmap(QX11Info::connection(), WIN->id(), pix); - if(pix==0){ return QImage(); } + if(pix==0){ qDebug() << "Got blank pixmap!"; return QImage(); } //Convert this pixmap into a QImage xcb_image_t *ximg = xcb_image_get(QX11Info::connection(), pix, geom.x(), geom.y(), geom.width(), geom.height(), ~0, XCB_IMAGE_FORMAT_Z_PIXMAP); - if(ximg == 0){ return QImage(); } + if(ximg == 0){ qDebug() << "Got blank image!"; return QImage(); } QImage img(ximg->data, ximg->width, ximg->height, ximg->stride, QImage::Format_ARGB32_Premultiplied); img = img.copy(); //detach this image from the XCB data structures xcb_image_destroy(ximg); @@ -111,18 +113,20 @@ bool NativeEmbedWidget::embedWindow(NativeWindow *window){ xcb_send_event(QX11Info::connection(), 0, WIN->id(), XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (const char *) &event); */ //Now setup any redirects and return - xcb_composite_redirect_window(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); - xcb_composite_redirect_subwindows(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); - - //Now create/register the damage handler - // -- XCB (Note: The XCB damage registration is completely broken at the moment - 9/15/15, Ken Moore) - // -- Retested 6/29/17 (no change) Ken Moore - //xcb_damage_damage_t dmgID = xcb_generate_id(QX11Info::connection()); //This is a typedef for a 32-bit unsigned integer - //xcb_damage_create(QX11Info::connection(), dmgID, WIN->id(), XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES); - // -- XLib (Note: This is only used because the XCB routine above does not work - needs to be fixed upstream in XCB itself). - Damage dmgID = XDamageCreate(QX11Info::display(), WIN->id(), XDamageReportRawRectangles); - - WIN->addDamageID( (uint) dmgID); //save this for later + if(!DISABLE_COMPOSITING){ + xcb_composite_redirect_window(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); + xcb_composite_redirect_subwindows(QX11Info::connection(), WIN->id(), XCB_COMPOSITE_REDIRECT_MANUAL); //XCB_COMPOSITE_REDIRECT_[MANUAL/AUTOMATIC]); + + //Now create/register the damage handler + // -- XCB (Note: The XCB damage registration is completely broken at the moment - 9/15/15, Ken Moore) + // -- Retested 6/29/17 (no change) Ken Moore + //xcb_damage_damage_t dmgID = xcb_generate_id(QX11Info::connection()); //This is a typedef for a 32-bit unsigned integer + //xcb_damage_create(QX11Info::connection(), dmgID, WIN->id(), XCB_DAMAGE_REPORT_LEVEL_RAW_RECTANGLES); + // -- XLib (Note: This is only used because the XCB routine above does not work - needs to be fixed upstream in XCB itself). + Damage dmgID = XDamageCreate(QX11Info::display(), WIN->id(), XDamageReportRawRectangles); + + WIN->addDamageID( (uint) dmgID); //save this for later + } WIN->addFrameWinID(this->winId()); connect(WIN, SIGNAL(VisualChanged()), this, SLOT(repaintWindow()) ); //make sure we repaint the widget on visual change @@ -185,16 +189,17 @@ void NativeEmbedWidget::resyncWindow(){ xcb_configure_window(QX11Info::connection(), WIN->id(), mask, valList); xcb_flush(QX11Info::connection()); syncWinSize(); - QTimer::singleShot(0, this, SLOT(repaintWindow()) ); + QTimer::singleShot(10, this, SLOT(repaintWindow()) ); } void NativeEmbedWidget::repaintWindow(){ + if(DISABLE_COMPOSITING){ return; } //qDebug() << "Update Window Image:" << !paused; if(paused){ return; } QImage tmp = windowImage( QRect(QPoint(0,0), this->size()) ); if(!tmp.isNull()){ winImage = tmp; - }//else{ qDebug() << "Got Null Image!!"; } + }else{ qDebug() << "Got Null Image!!"; } this->parentWidget()->update(); } // ============== @@ -218,7 +223,7 @@ void NativeEmbedWidget::hideEvent(QHideEvent *ev){ } void NativeEmbedWidget::paintEvent(QPaintEvent *ev){ - if(WIN==0){ QWidget::paintEvent(ev); return; } + if(WIN==0 || DISABLE_COMPOSITING){ QWidget::paintEvent(ev); return; } else if( winImage.isNull() ){ /*QTimer::singleShot(0, this, SLOT(repaintWindow()) );*/ return; } else if(paused){ return; } //else if(this->size()!=winSize){ QTimer::singleShot(0,this, SLOT(syncWinSize())); return; } //do not paint here - waiting to re-sync the sizes diff --git a/src-qt5/core/libLumina/NativeEventFilter.cpp b/src-qt5/core/libLumina/NativeEventFilter.cpp index d6c2da50..a6b2f3b5 100644 --- a/src-qt5/core/libLumina/NativeEventFilter.cpp +++ b/src-qt5/core/libLumina/NativeEventFilter.cpp @@ -83,6 +83,10 @@ inline void ParsePropertyEvent(xcb_property_notify_event_t *ev, NativeEventFilte } } +inline void ParseClientMessageEvent(xcb_client_message_event *ev, NativeEventFilter *obj){ + +} + //Constructor for the Event Filter wrapper NativeEventFilter::NativeEventFilter() : QObject(){ @@ -222,7 +226,9 @@ bool EventFilter::nativeEventFilter(const QByteArray &eventType, void *message, //addTrayApp( ((xcb_client_message_event_t*)ev)->data.data32[2] ); } //Ignore the System Tray messages at the moment - } + }else if(((xcb_client_message_event_t*)ev)->window == QX11Info::appRootWindow()){ + ParseClientMessageEvent((xcb_client_message_event_t*)ev, obj); + } break; //============================== case XCB_CONFIGURE_NOTIFY: diff --git a/src-qt5/core/libLumina/NativeWindowSystem.cpp b/src-qt5/core/libLumina/NativeWindowSystem.cpp index e0f3fe91..74eef2b9 100644 --- a/src-qt5/core/libLumina/NativeWindowSystem.cpp +++ b/src-qt5/core/libLumina/NativeWindowSystem.cpp @@ -707,13 +707,13 @@ void NativeWindowSystem::NewTrayWindowDetected(WId id){ void NativeWindowSystem::WindowCloseDetected(WId id){ NativeWindow *win = findWindow(id, false); - qDebug() << "Got Window Closed" << id << win; + //qDebug() << "Got Window Closed" << id << win; //qDebug() << "Old Window List:" << NWindows.length(); if(win!=0){ NWindows.removeAll(win); //RequestReparent(id, QX11Info::appRootWindow(), QPoint(0,0)); win->emit WindowClosed(id); - qDebug() << "Visible Window Closed!!!"; + //qDebug() << "Visible Window Closed!!!"; //win->deleteLater(); }else{ win = findTrayWindow(id); diff --git a/src-qt5/core/libLumina/RootSubWindow.cpp b/src-qt5/core/libLumina/RootSubWindow.cpp index 322e524f..6341f923 100644 --- a/src-qt5/core/libLumina/RootSubWindow.cpp +++ b/src-qt5/core/libLumina/RootSubWindow.cpp @@ -41,6 +41,10 @@ WId RootSubWindow::id(){ return WIN->id(); } +NativeWindow* RootSubWindow::nativeWindow(){ + return WIN; +} + // === PRIVATE === RootSubWindow::ModState RootSubWindow::getStateAtPoint(QPoint pt, bool setoffset){ //Note: pt should be in widget-relative coordinates, not global diff --git a/src-qt5/core/libLumina/RootSubWindow.h b/src-qt5/core/libLumina/RootSubWindow.h index 079a6201..0af77009 100644 --- a/src-qt5/core/libLumina/RootSubWindow.h +++ b/src-qt5/core/libLumina/RootSubWindow.h @@ -29,6 +29,7 @@ public: ~RootSubWindow(); WId id(); + NativeWindow* nativeWindow(); private: //Window status diff --git a/src-qt5/core/libLumina/RootWindow-mgmt.cpp b/src-qt5/core/libLumina/RootWindow-mgmt.cpp index e00ce9ce..00b3e336 100644 --- a/src-qt5/core/libLumina/RootWindow-mgmt.cpp +++ b/src-qt5/core/libLumina/RootWindow-mgmt.cpp @@ -19,16 +19,31 @@ void RootWindow::arrangeWindows(RootSubWindow *primary, QString type){ // ================ // Public slots for starting the arrangement routine(s) above // ================ -void RootWindow::ArrangeWindows(WId *primary, QString type){ - +void RootWindow::ArrangeWindows(WId primary, QString type){ + RootSubWindow* win = windowForId(primary); + if(type.isEmpty()){ type = ""; } //grab the default arrangement format + arrangeWindows(win, type); } -void RootWindow::TileWindows(WId *primary, QString type){ - +void RootWindow::TileWindows(WId primary, QString type){ + RootSubWindow* win = windowForId(primary); + if(type.isEmpty()){ type = ""; } //grab the default arrangement format for tiling + arrangeWindows(win, type); } -void RootWindow::CheckWindowPosition(WId, bool newwindow){ +void RootWindow::CheckWindowPosition(WId id, bool newwindow){ //used after a "drop" to validate/snap/re-arrange window(s) as needed // if "newwindow" is true, then this is the first-placement routine for a window before it initially appears - + RootSubWindow* win = windowForId(id); + if(win==0){ return; } //invalid window + QRect geom = win->nativeWindow()->geometry(); + bool changed = false; + //Make sure it is on the screen (quick check) + if(geom.x() < 0){ changed = true; geom.moveLeft(0); } + if(geom.y() < 0){ changed = true; geom.moveTop(0); } + if(geom.width() < 20){ changed = true; geom.setWidth(100); } + if(geom.height() < 20){ changed = true; geom.setHeight(100); } + if(changed){ win->setGeometry(geom); } + //Now run it through the window arrangement routine + ArrangeWindows(id); } diff --git a/src-qt5/core/libLumina/RootWindow.cpp b/src-qt5/core/libLumina/RootWindow.cpp index 596755df..48c37c86 100644 --- a/src-qt5/core/libLumina/RootWindow.cpp +++ b/src-qt5/core/libLumina/RootWindow.cpp @@ -100,6 +100,14 @@ void RootWindow::updateScreenPixmap(screeninfo *info){ info->wallpaper = pix; } +RootSubWindow* RootWindow::windowForId(WId id){ + RootSubWindow *tmp = 0; + for(int i=0; iid() == id){ tmp = WINDOWS[i]; } + } + return tmp; +} + // === PUBLIC SLOTS === void RootWindow::ResizeRoot(){ if(DEBUG){ qDebug() << "Resize Root..."; } @@ -202,6 +210,7 @@ void RootWindow::CloseWindow(WId win){ // === PROTECTED === void RootWindow::paintEvent(QPaintEvent *ev){ //qDebug() << "RootWindow: PaintEvent:" << ev->rect(); //<< QDateTime::currentDateTime()->toString(QDateTime::ShortDate); + QWidget::paintEvent(ev); bool found = false; QPainter painter(this); QRect geom = ev->rect(); @@ -214,7 +223,7 @@ void RootWindow::paintEvent(QPaintEvent *ev){ } } painter.end(); - if(!found){ + /*if(!found){ QWidget::paintEvent(ev); - } + }*/ } diff --git a/src-qt5/core/libLumina/RootWindow.h b/src-qt5/core/libLumina/RootWindow.h index 2fd76cea..9b1334dc 100644 --- a/src-qt5/core/libLumina/RootWindow.h +++ b/src-qt5/core/libLumina/RootWindow.h @@ -50,6 +50,7 @@ private: //Window Management QList WINDOWS; + RootSubWindow* windowForId(WId id); void arrangeWindows(RootSubWindow *primary = 0, QString type = ""); public slots: @@ -61,8 +62,8 @@ public slots: void CloseWindow(WId); //automatically connected for any new native window //Window arrangement functions - defined in "RootWindow-mgmt.cpp" - void ArrangeWindows(WId *primary = 0, QString type = ""); - void TileWindows(WId *primary = 0, QString type = ""); + void ArrangeWindows(WId primary = 0, QString type = ""); + void TileWindows(WId primary = 0, QString type = ""); void CheckWindowPosition(WId, bool newwindow = false); //used after a "drop" to validate/snap/re-arrange window(s) as needed private slots: -- cgit From 2095ffee98a4376e16036f395d173ba674570626 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 16:47:22 -0400 Subject: Fix the clock width detection/setting. Had a typo in the delimiter.... --- .../core/lumina-desktop/panel-plugins/clock/LClock.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src-qt5/core') 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 db661841..2972ea86 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -25,14 +25,14 @@ LClock::LClock(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, calAct->setDefaultWidget(calendar); TZMenu = new QMenu(this); connect(TZMenu, SIGNAL(triggered(QAction*)), this, SLOT(ChangeTZ(QAction*)) ); - + //Now assemble the menu button->menu()->addAction(calAct); button->menu()->addMenu(TZMenu); - + this->layout()->setContentsMargins(0,0,0,0); //reserve some space on left/right this->layout()->addWidget(button); - + //Setup the timer timer = new QTimer(); //Load all the initial settings @@ -71,10 +71,11 @@ void LClock::updateTime(bool adjustformat){ }else if(datetimeorder == "datetime"){ label = datelabel + "\n" + timelabel; button->setToolTip(""); - }else{ + }else{ label = timelabel; button->setToolTip(datelabel); } + QStringList lines = label.split("\n"); if( this->layout()->direction() == QBoxLayout::TopToBottom ){ //different routine for vertical text (need newlines instead of spaces) for(int i=0; isize().height() < 2*this->fontMetrics().height() ){ + }else if( this->size().height() < lines.length()*this->fontMetrics().height() ){ label.replace("\n",", "); } if(adjustformat){ @@ -92,16 +93,17 @@ void LClock::updateTime(bool adjustformat){ font.setBold(true); button->setFont(font); //Check the font/spacing for the display and adjust as necessary - QStringList lines = label.split("/n"); + QStringList lines = label.split("\n"); QFontMetrics metrics(font); if(this->layout()->direction()==QBoxLayout::LeftToRight){ //horizontal layout int wid = 0; - int lwid; + int lwid = 0; for(int i=0; iwid){ wid = lwid; } } + qDebug() << "Verify Clock width:" << lines.length() << wid << lines; this->setMinimumWidth(wid); this->setMaximumWidth(wid + (4*metrics.width("O"))); }else{ -- cgit From 53c43df14029e207007771da008949be33c23abe Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 16:58:59 -0400 Subject: Fix a --- .../desktop-plugins/applauncher/AppLauncherPlugin.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp index 55f05fe9..0258d561 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -151,6 +151,7 @@ void AppLauncherPlugin::loadButton(){ tmp = this->contextMenu()->addAction( tr("Delete"), this, SLOT(fileDelete()) ); ICONS->loadIcon(tmp, "document-close"); } + iconLoaded(iconID); //make sure the emblem is layered on top //If the file is a symlink, put the overlay on the icon /*if(info.isSymLink()){ QImage img = button->icon().pixmap(QSize(icosize,icosize)).toImage(); @@ -171,7 +172,7 @@ void AppLauncherPlugin::loadButton(){ if(txt.contains("\n")){ //need to check each line QStringList txtL = txt.split("\n"); - for(int i=0; ifontMetrics().width(txtL[i]) < button->width()/2) ){ txtL[i] = txtL[i]+" "+txtL[i+1]; txtL.removeAt(i+1); @@ -179,11 +180,11 @@ void AppLauncherPlugin::loadButton(){ } txt = txtL.join("\n").section("\n",0,2); } - + if(txt.contains("\n")){ //need to check each line QStringList txtL = txt.split("\n"); - for(int i=0; i1){ txtL.removeAt(i); i--; } //Only take the first two lines else{ txtL[i] = button->fontMetrics().elidedText(txtL[i], Qt::ElideRight, (button->width()-OUTMARGIN) ); } } @@ -200,7 +201,7 @@ void AppLauncherPlugin::loadButton(){ QTimer::singleShot(100, this, SLOT(update()) ); //Make sure to re-draw the image in a moment } - + void AppLauncherPlugin::buttonClicked(bool openwith){ QString path = button->whatsThis(); if(path.isEmpty() || !QFile::exists(path) ){ @@ -218,7 +219,7 @@ void AppLauncherPlugin::buttonClicked(bool openwith){ }else{ LSession::LaunchApplication("lumina-open \""+path+"\""); } - + } void AppLauncherPlugin::iconLoaded(QString ico){ -- cgit From 0048a03080ab12570c4c2b049d762f35e03e5f6c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 14 Aug 2017 16:59:07 -0400 Subject: A bit more random work: 1) Icon overlay fixes for desktop icons 2) Some more Lumina 2.x debugging/work --- src-qt5/core/libLumina/LIconCache.cpp | 6 ++--- src-qt5/core/libLumina/NativeEmbedWidget.cpp | 1 + src-qt5/core/libLumina/NativeEventFilter.cpp | 27 ++++++++++++++++++---- src-qt5/core/libLumina/NativeWindow.h | 32 +++++++++++++-------------- src-qt5/core/libLumina/NativeWindowSystem.cpp | 7 +++--- 5 files changed, 47 insertions(+), 26 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index bb81bc47..70c360fb 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -57,7 +57,7 @@ QString LIconCache::findFile(QString icon){ QString cTheme = QIcon::themeName(); if(cTheme.isEmpty()){ QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ @@ -231,7 +231,7 @@ QStringList LIconCache::getChildIconDirs(QString path){ QDir D(path); QStringList out; QStringList dirs = D.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ + if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ //Need to sort these directories by image size //qDebug() << " - Parent:" << parent << "Dirs:" << dirs; for(int i=0; iid()); registerClientEvents(this->winId()); + qDebug() << "Events Registered:" << WIN->id() << this->winId(); return true; } diff --git a/src-qt5/core/libLumina/NativeEventFilter.cpp b/src-qt5/core/libLumina/NativeEventFilter.cpp index a6b2f3b5..354dbe76 100644 --- a/src-qt5/core/libLumina/NativeEventFilter.cpp +++ b/src-qt5/core/libLumina/NativeEventFilter.cpp @@ -65,7 +65,7 @@ static xcb_ewmh_connection_t EWMH; static xcb_atom_t _NET_SYSTEM_TRAY_OPCODE = 0; inline void ParsePropertyEvent(xcb_property_notify_event_t *ev, NativeEventFilter *obj){ - //qDebug() << "Got Property Event:" << ev->window << ev->atom; + qDebug() << "Got Property Event:" << ev->window << ev->atom; NativeWindow::Property prop = NativeWindow::None; //Now determine which properties are getting changed, and update the native window as appropriate if(ev->atom == EWMH._NET_WM_NAME){ prop = NativeWindow::Title; } @@ -76,14 +76,33 @@ inline void ParsePropertyEvent(xcb_property_notify_event_t *ev, NativeEventFilte else if( ev->atom == EWMH._NET_WM_STATE){ prop = NativeWindow::States; } //Send out the signal if necessary if(prop!=NativeWindow::None){ - if(DEBUG){ qDebug() << "Detected Property Change:" << ev->window << prop; } + //if(DEBUG){ + qDebug() << "Detected Property Change:" << ev->window << prop; + //} obj->emit WindowPropertyChanged(ev->window, prop); }else{ //qDebug() << "Unknown Property Change:" << ev->window << ev->atom; } } -inline void ParseClientMessageEvent(xcb_client_message_event *ev, NativeEventFilter *obj){ +inline void ParseClientMessageEvent(xcb_client_message_event_t *ev, NativeEventFilter *obj){ + NativeWindow::Property prop = NativeWindow::None; + QVariant val; + if(ev->type==EWMH._NET_WM_NAME){ prop = NativeWindow::Title; } + else if(ev->type==EWMH._NET_WM_ICON){ prop = NativeWindow::Icon; } + else if(ev->type==EWMH._NET_WM_ICON_NAME){ prop = NativeWindow::ShortTitle; } + else if(ev->type==EWMH._NET_WM_DESKTOP){ + prop = NativeWindow::Workspace; + val = QVariant( (int) ev->data.data32[0] ); + }else if(ev->type==EWMH._NET_WM_WINDOW_TYPE){ prop = NativeWindow::WinTypes; } + else if(ev->type==EWMH._NET_WM_STATE){ prop = NativeWindow::States; } + + if(prop!=NativeWindow::None){ + //if(DEBUG){ + qDebug() << "Detected Property Change Request:" << ev->window << prop; //} + if(val.isNull()){ obj->emit WindowPropertyChanged(ev->window, prop); } + else{ obj->emit RequestWindowPropertyChange(ev->window, prop, val); } + } } @@ -226,7 +245,7 @@ bool EventFilter::nativeEventFilter(const QByteArray &eventType, void *message, //addTrayApp( ((xcb_client_message_event_t*)ev)->data.data32[2] ); } //Ignore the System Tray messages at the moment - }else if(((xcb_client_message_event_t*)ev)->window == QX11Info::appRootWindow()){ + }else if(((xcb_client_message_event_t*)ev)->window != QX11Info::appRootWindow()){ ParseClientMessageEvent((xcb_client_message_event_t*)ev, obj); } break; diff --git a/src-qt5/core/libLumina/NativeWindow.h b/src-qt5/core/libLumina/NativeWindow.h index 47359b7d..d04815ce 100644 --- a/src-qt5/core/libLumina/NativeWindow.h +++ b/src-qt5/core/libLumina/NativeWindow.h @@ -30,22 +30,22 @@ public: enum Property{ /*QVariant Type*/ None=0, /*null*/ - MinSize, /*QSize*/ - MaxSize, /*QSize*/ - Size, /*QSize*/ - GlobalPos, /*QPoint*/ - Title, /*QString*/ - ShortTitle, /*QString*/ - Icon, /*QIcon*/ - Name, /*QString*/ - Workspace, /*int*/ - States, /*QList : Current state of the window */ - WinTypes, /*QList : Current type of window (typically does not change)*/ - WinActions, /*QList : Current actions that the window allows (Managed/set by the WM)*/ - FrameExtents, /*QList : [Left, Right, Top, Bottom] in pixels */ - RelatedWindows, /* QList - better to use the "isRelatedTo(WId)" function instead of reading this directly*/ - Active, /*bool*/ - Visible /*bool*/ + MinSize=1, /*QSize*/ + MaxSize=2, /*QSize*/ + Size=3, /*QSize*/ + GlobalPos=4, /*QPoint*/ + Title=5, /*QString*/ + ShortTitle=6, /*QString*/ + Icon=7, /*QIcon*/ + Name=8, /*QString*/ + Workspace=9, /*int*/ + States=10, /*QList : Current state of the window */ + WinTypes=11, /*QList : Current type of window (typically does not change)*/ + WinActions=12, /*QList : Current actions that the window allows (Managed/set by the WM)*/ + FrameExtents=13, /*QList : [Left, Right, Top, Bottom] in pixels */ + RelatedWindows=14, /* QList - better to use the "isRelatedTo(WId)" function instead of reading this directly*/ + Active=15, /*bool*/ + Visible=16 /*bool*/ }; static QList allProperties(){ diff --git a/src-qt5/core/libLumina/NativeWindowSystem.cpp b/src-qt5/core/libLumina/NativeWindowSystem.cpp index 74eef2b9..71e95a0e 100644 --- a/src-qt5/core/libLumina/NativeWindowSystem.cpp +++ b/src-qt5/core/libLumina/NativeWindowSystem.cpp @@ -254,7 +254,8 @@ void NativeWindowSystem::stop(){ NativeWindow* NativeWindowSystem::findWindow(WId id, bool checkRelated){ //qDebug() << "Find Window:" << id; for(int i=0; iid() || id==NWindows[i]->frameId() ){ return NWindows[i]; } + if(id==NWindows[i]->id() ){ return NWindows[i]; } + else if(id==NWindows[i]->frameId() ){ qDebug() << "Matched Frame:" << id; return NWindows[i]; } //if(checkRelated && NWindows[i]->isRelatedTo(id)){ return NWindows[i]; } //else if(!checkRelated && id==NWindows[i]->id()){ return NWindows[i]; } } @@ -496,7 +497,7 @@ void NativeWindowSystem::ChangeWindowProperties(NativeWindow* win, QList< Native valList.y = win->property(NativeWindow::GlobalPos).toPoint().y(); }*/ uint16_t mask = 0; - mask = mask | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; + mask = mask | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;// | XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y; qDebug() << "Configure window Geometry:" << sz; xcb_configure_window_aux(QX11Info::connection(), win->id(), mask, &valList); } @@ -667,7 +668,7 @@ void NativeWindowSystem::NewWindowDetected(WId id){ registerClientEvents(win->id()); NWindows << win; UpdateWindowProperties(win, NativeWindow::allProperties()); - qDebug() << "New Window [& associated ID's]:" << win->id() << win->property(NativeWindow::RelatedWindows); + qDebug() << "New Window [& associated ID's]:" << win->id() << win->frameId() << win->property(NativeWindow::RelatedWindows); //Now setup the connections with this window connect(win, SIGNAL(RequestClose(WId)), this, SLOT(RequestClose(WId)) ); connect(win, SIGNAL(RequestKill(WId)), this, SLOT(RequestKill(WId)) ); -- cgit From 0079e45a9bd78c2ebbef5abe641e268571ade45b Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 15 Aug 2017 09:30:58 -0400 Subject: Added fixes for the experimental video screensaver --- .../src-screensaver/LScreenSaver.cpp | 4 +- .../src-screensaver/animations/BaseAnimGroup.cpp | 2 +- .../src-screensaver/animations/ImageSlideshow.h | 25 ++++++-- .../src-screensaver/animations/VideoSlideshow.h | 68 +++++++++++----------- 4 files changed, 59 insertions(+), 40 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp index 2c36af80..39a7b596 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp @@ -151,10 +151,12 @@ void LScreenSaver::HideScreenSaver(){ emit ClosingScreenSaver(); emit LockStatusChanged(false); } + qDebug() << "Stop ScreenSavers"; for(int i=0; istopPainting(); BASES[i]->hide(); + BASES.takeAt(i)->deleteLater(); + i--; } UpdateTimers(); } 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 7fc4eb50..c8a248c0 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 @@ -37,5 +37,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti } QStringList BaseAnimGroup::KnownAnimations(){ - return (QStringList() << "videoSlideshow" /*<< "grav" << "text" << "imageSlideshow" << "fireflies"*/); + return (QStringList() << "imageSlideshow" /*<< "grav" << "text" << "imageSlideshow" << "fireflies"*/); } 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 index 4abc3ae7..a64144ac 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/ImageSlideshow.h @@ -17,9 +17,9 @@ private: QPropertyAnimation *bounce, *fading; QPixmap pixmap; QStringList imageFiles; - QString imagePath; + QString imagePath, scriptPath; QSize screenSize; - bool animate; + bool animate, scriptLoad; private: void setupAnimation() { @@ -45,7 +45,16 @@ private: //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(scriptLoad){ + QProcess process; + process.start("/home/zwelch/test.sh"); + process.waitForFinished(1000); + QByteArray output = process.readAllStandardOutput(); + qDebug() << output; + pixmap.load(imagePath+imageFiles[qrand() % imageFiles.size()]); + }else{ + 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 @@ -66,11 +75,13 @@ private slots: void stopped(){ qDebug() << "Image Stopped"; image->hide();} public: - ImageSlideshow(QWidget *parent, QString path, bool animate) : QParallelAnimationGroup(parent){ + ImageSlideshow(QWidget *parent, QString path, bool animate, bool scriptLoad, QString scriptPath) : QParallelAnimationGroup(parent){ imagePath = path; image = new QLabel(parent); screenSize = parent->size(); this->animate = animate; + this->scriptLoad = scriptLoad; + this->scriptPath = scriptPath; //Generate the list of files in the directory imageFiles = QDir(imagePath).entryList(QDir::Files); @@ -132,7 +143,11 @@ public: 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); + bool scriptLoad = settings->value("imageSlideshow/scriptLoad", true).toBool(); + QString scriptPath; + if(scriptLoad) + scriptPath = settings->value("imageSlideshow/scriptPath", "/usr/local/backgrounds/script.sh").toString(); + ImageSlideshow *tmp = new ImageSlideshow(canvas, imagePath, animate, scriptLoad, scriptPath); this->addAnimation(tmp); } 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 index fdddaf93..cc3c1b83 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/VideoSlideshow.h @@ -16,6 +16,8 @@ public: VideoSlideshow(QWidget *parent, QVideoWidget *videoWidget) : QPropertyAnimation(videoWidget, "pos", parent){ this->setKeyValueAt(0,QPoint(0,0)); this->setKeyValueAt(1,QPoint(0,0)); + this->setDuration(1000000); + this->setLoopCount(-1); } ~VideoSlideshow(){} @@ -29,29 +31,32 @@ private: QVideoWidget *videoWidget; QMediaPlayer *video; QStringList videoFiles; - QMediaPlaylist *playlist; - bool multimonitor, random; + bool multimonitor; private slots: - void startVideo() { - this->addAnimation(tmp); - tmp->setDuration(video->duration()); - qDebug() << "Status: " << video->mediaStatus(); - video->setPlaylist(playlist); - video->setVolume(100); - video->play(); + void startVideo(QAbstractAnimation::State state) { + qDebug() << "Status: " << video->mediaStatus() << "New Animation State:" << state; + if(state==QAbstractAnimation::Running){ + video->setVolume(100); + video->play(); + } + if(state==QAbstractAnimation::Stopped && video->state()!=QMediaPlayer::StoppedState){ + video->stop(); + } } - void LoopChanged(){ - qDebug() << "New Video"; - if(random) - playlist->setCurrentIndex(qrand() % videoFiles.size()); - else - playlist->setCurrentIndex(playlist->currentIndex()+1); + void stopVideo() { + if(video->state() == QMediaPlayer::StoppedState) { + qDebug() << "Stopping Animation"; + //this->deleteLater(); + videoWidget->hide(); + tmp->stop(); + //tmp->deleteLater(); + videoWidget->deleteLater(); + video->deleteLater(); + } } - void stopped(){qDebug() << "Video Stopped"; videoWidget->hide();} - public: VideoAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){} @@ -63,39 +68,36 @@ public: 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(); + videoPath = settings->value("videoSlideshow/path","/usr/local/videos").toString(); + if(!videoPath.endsWith("/")){ videoPath.append("/"); } //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); + videoWidget->setGeometry(QRect(QPoint(0,0), canvas->size())); tmp = new VideoSlideshow(canvas, videoWidget); - + this->addAnimation(tmp); + //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()); + this->setLoopCount(1); + QUrl url = QUrl::fromLocalFile(videoPath+videoFiles[qrand() % videoFiles.size()]); + video->setMedia(url); + qDebug() << url; 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()) ); + connect(tmp, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)), this, SLOT(startVideo(QAbstractAnimation::State)) ); + //connect(video, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)), this, SLOT(startVideo()) ); + connect(video, SIGNAL(stateChanged(QMediaPlayer::State)), this, SLOT(stopVideo()) ); } }; -- cgit From 85ad3904f27ddfc131d5d30b3aea230cbbaa9fbc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Aug 2017 11:43:57 -0400 Subject: Setup the WM restart routine to make it more flexible: 1) The WM will be restarted a maximum of twice with crashes less than 5 seconds apart. 2) This makes it more flexible with regards to opeartions which require that fluxbox be restarted (such as changing the screen around). --- src-qt5/core/lumina-session/session.cpp | 2 +- src-qt5/core/lumina-session/session.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index fb9c6cd1..3fdf9e66 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -39,7 +39,7 @@ void LSession::procFinished(){ if(!stopping){ //See if this process is the main desktop binary if(PROCS[i]->objectName()=="runtime"){ stopall(); } - else if(PROCS[i]->objectName()=="wm" && wmfails<3){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); } //restart the WM + else if(PROCS[i]->objectName()=="wm" && wmfails<2){ wmfails++; PROCS[i]->start(QIODevice::ReadOnly); wmTimer->start(); } //restart the WM //if(PROCS[i]->program().section("/",-1) == "lumina-desktop"){ stopall(); } //start closing down everything //else{ PROCS[i]->start(QIODevice::ReadOnly); } //restart the process //break; diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index 36d67782..bee244ee 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -60,6 +61,7 @@ private: QList PROCS; bool stopping; int wmfails; + QTimer *wmTimer; private slots: void stopall(); @@ -68,9 +70,14 @@ private slots: void startProcess(QString ID, QString command, QStringList watchfiles = QStringList()); + void resetWMCounter(){ wmfails = 0; } public: LSession(){ stopping = false; wmfails = 0; + wmTimer = new QTimer(this); + wmTimer->setSingleShot(true); + wmTimer->setInterval(5000); //5 second timeout + connect(wmTimer, SIGNAL(timeout()), this, SLOT(resetWMCounter()) ); } ~LSession(){ } -- cgit From b914f028fe1156ce737b1986b4d2136208aa2b30 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Aug 2017 11:47:29 -0400 Subject: Make the wm crash-reset timer 2 seconds between crashes. --- src-qt5/core/lumina-session/session.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index bee244ee..5cf1ccfa 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -76,7 +76,7 @@ public: stopping = false; wmfails = 0; wmTimer = new QTimer(this); wmTimer->setSingleShot(true); - wmTimer->setInterval(5000); //5 second timeout + wmTimer->setInterval(2000); //2 second timeout connect(wmTimer, SIGNAL(timeout()), this, SLOT(resetWMCounter()) ); } ~LSession(){ } -- cgit From 9e9d68f1f5889f44d620fb044b1c9cec43b095e1 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 15 Aug 2017 13:16:59 -0400 Subject: Resynced translation files and fixed translations of the boot splash UI --- src-qt5/core/lumina-desktop/LSession.cpp | 2 +- src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts | 18 +++++++++--------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_en_AU.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_en_GB.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts | 16 ++++++++-------- .../core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts | 16 ++++++++-------- src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts | 16 ++++++++-------- 64 files changed, 506 insertions(+), 506 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 777affd1..aa37fa8c 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -91,6 +91,7 @@ void LSession::setupSession(){ //Seed random number generator (if needed) qsrand( QTime::currentTime().msec() ); + currTranslator = LUtils::LoadTranslation(this, "lumina-desktop"); BootSplash splash; splash.showScreen("init"); qDebug() << "Initializing Session"; @@ -114,7 +115,6 @@ void LSession::setupSession(){ sessionsettings->value("InitLocale/LC_COLLATE","").toString(), \ sessionsettings->value("InitLocale/LC_CTYPE","").toString() ); } - currTranslator = LUtils::LoadTranslation(this, "lumina-desktop"); //use the system settings //Setup the user's lumina settings directory as necessary splash.showScreen("user"); diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts index 2496641f..bc8ebeca 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts @@ -83,17 +83,17 @@ Изтриване - + Select Application Избор на програма - + Name: Име: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (зарежда се) - + %1 % (%2 Remaining) %1 % (%2 оставащи) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Часова зона (%1) - + Use System Time Използване на системното време @@ -851,7 +851,7 @@ LSession - + Desktop Работен плот diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts index 20bf3c1b..03cc11a0 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts @@ -83,17 +83,17 @@ Suprimeix - + Select Application Seleccioneu l'aplicació - + Name: Nom: - + New Filename Nom de fitxer nou @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Carregant) - + %1 % (%2 Remaining) %1 % (resten %2) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Zona horària (%1) - + Use System Time Usa l'hora del sistema @@ -851,7 +851,7 @@ LSession - + Desktop Escriptori diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts index b22b1309..e40b53de 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts @@ -83,17 +83,17 @@ Vymazat - + Select Application Vybrat aplikaci - + Name: Název: - + New Filename Nový název souboru @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Nabíjení) - + %1 % (%2 Remaining) %1 % (%2 Zbývá) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Časové pásmo (%1) - + Use System Time Použít systémový čas @@ -851,7 +851,7 @@ LSession - + Desktop Plocha diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index a9522431..6d961601 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -83,17 +83,17 @@ Slet - + Select Application Vælg program - + Name: Navn: - + New Filename Nyt filnavn @@ -196,7 +196,7 @@ Starting the Lumina Desktop... - Starter Lumina-skrivebordet ... + Starter Lumina-skrivebordet... @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (lader) - + %1 % (%2 Remaining) %1 % (%2 tilbage) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Tidszone (%1) - + Use System Time Brug systemtid @@ -851,7 +851,7 @@ LSession - + Desktop Skrivebord diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts index 644524e1..9cb26ec5 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts @@ -83,17 +83,17 @@ Löschen - + Select Application Anwendung auswählen - + Name: Name: - + New Filename Neuer Dateiname @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Aufladen) - + %1 % (%2 Remaining) %1 % (%2 verbleibend) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Zeitzone (%1) - + Use System Time Systemzeit verwenden @@ -851,7 +851,7 @@ LSession - + Desktop Arbeitsfläche diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts index 257c2f1d..e3863914 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts @@ -83,17 +83,17 @@ - + Select Application Επιλογή εφαρμογής - + Name: Όνομα: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts index 2b611add..cef0eaa8 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -83,17 +83,17 @@ Delete - + Select Application Select Application - + Name: Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Charging) - + %1 % (%2 Remaining) %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Time Zone (%1) - + Use System Time Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts index b89fb14b..2aa1b8c3 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts @@ -83,17 +83,17 @@ Delete - + Select Application Select Application - + Name: Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Charging) - + %1 % (%2 Remaining) %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Time Zone (%1) - + Use System Time Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts index d1289b1b..b596e01f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts @@ -83,17 +83,17 @@ Borrar - + Select Application Seleccionar Aplicación - + Name: Nombre: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Cargando) - + %1 % (%2 Remaining) %1 % (%2 Restante) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Zona Horaria (%1) - + Use System Time Usar Hora del Sistema @@ -851,7 +851,7 @@ LSession - + Desktop Escritorio diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts index 5bf00b5f..993663f8 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts @@ -83,17 +83,17 @@ Kustuta - + Select Application Vali rakendus - + Name: Nimi: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1% (laeb) - + %1 % (%2 Remaining) %1% (%2 jäänud) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop Töölaud diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts index 800eb234..fe52adc4 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts @@ -83,17 +83,17 @@ Ezabatu - + Select Application Aplikazioa hautatu - + Name: Izena: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Kargatzen) - + %1 % (%2 Remaining) %1 % (%2 Faltan) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts index d6469c56..4d9ca09a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts @@ -83,17 +83,17 @@ - + Select Application کاربست برگزین - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts index 62634130..e0c620fd 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts @@ -83,17 +83,17 @@ Poista - + Select Application Valitse sovellus - + Name: Nimi: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (lataa) - + %1 % (%2 Remaining) %1 % (%2 jäljellä) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Aikavyöhyke (%1) - + Use System Time Käytä järjestelmän aikaa @@ -851,7 +851,7 @@ LSession - + Desktop Työpöytä diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts index 53f00a69..4e97fc73 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts @@ -83,17 +83,17 @@ Supprimer - + Select Application Sélectionner un Programme - + Name: Nom : - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Chargement) - + %1 % (%2 Remaining) %1 % (%2 Restant) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Fuseau Horaire (%1) - + Use System Time Utiliser l'Heure du Système @@ -851,7 +851,7 @@ LSession - + Desktop Bureau diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts index 9ff16d1d..f323f9bd 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop שולחן עבודה diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts index f1ed8825..2a026368 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts @@ -83,17 +83,17 @@ नष्ट करें - + Select Application एप्लीकेशन चुनें - + Name: नाम - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 %(चार्ज हो रहा है) - + %1 % (%2 Remaining) %1 %(%2 बचा है) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) समय क्षेत्र(%1) - + Use System Time उपकरण समय का उपयोग करें @@ -851,7 +851,7 @@ LSession - + Desktop डेस्कटॉप diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts index abdfc7b4..7ae3bfa7 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts @@ -83,17 +83,17 @@ Törlés - + Select Application Alkalmazás kiválasztása - + Name: Név: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Töltés) - + %1 % (%2 Remaining) %1 % (%2 hátralévő) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Időzóna (%1) - + Use System Time Rendszeridő használata @@ -851,7 +851,7 @@ LSession - + Desktop Asztal diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts index 13bba7d0..64266b63 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts @@ -83,17 +83,17 @@ Hapus - + Select Application Pilih Aplikasi - + Name: Nama: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (pengisian baterai) - + %1 % (%2 Remaining) %1 % (%2 sisa) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Zona waktu (%1) - + Use System Time Gunakan Tema Waktu (%1) @@ -851,7 +851,7 @@ LSession - + Desktop Layar Kerja Utama diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts index ed420545..bf898955 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts @@ -83,17 +83,17 @@ Cancella - + Select Application Seleziona Applicazione - + Name: Nome: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (In Carica) - + %1 % (%2 Remaining) %1 % (%2 Rimanente) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Fuso Orario (%1) - + Use System Time Usa Orario Sistema @@ -851,7 +851,7 @@ LSession - + Desktop Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts index 55ab6645..70b9304f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts @@ -86,17 +86,17 @@ 削除 - + Select Application アプリケーションを選択してください - + Name: 名前: - + New Filename @@ -668,12 +668,12 @@ LBattery - + %1 % (Charging) %1 % (充電中) - + %1 % (%2 Remaining) %1 % (残り %2 %) @@ -681,12 +681,12 @@ LClock - + Time Zone (%1) タイムゾーン (%1) - + Use System Time システムの時刻を使用する @@ -856,7 +856,7 @@ LSession - + Desktop これ、ファイルパスなので、「デスクトップ」と訳したらまずい Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts index c47d7279..6e458cda 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts @@ -83,17 +83,17 @@ 삭제 - + Select Application 프로그램 선택 - + Name: 이름: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (충전중) - + %1 % (%2 Remaining) %1 % (%2 남음) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) 시간대 (%1) - + Use System Time 시스템 시간 사용 @@ -851,7 +851,7 @@ LSession - + Desktop 바탕 화면 diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts index 34b0a5e6..ecb0a1ed 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts @@ -83,17 +83,17 @@ Ištrinti - + Select Application Pasirinkti programą - + Name: Pavadinimas: - + New Filename Naujas failo pavadinimas @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Kraunama) - + %1 % (%2 Remaining) %1 % (Liko %2) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Laiko juosta (%1) - + Use System Time Naudoti sistemos laiką @@ -851,7 +851,7 @@ LSession - + Desktop Darbalaukis diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts index 7cf1b6f3..85e89710 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts @@ -83,17 +83,17 @@ Dzēst - + Select Application Izvēlieties lietotni - + Name: Nosaukums: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (uzlādējas) - + %1 % (%2 Remaining) %1 % (%2 atlicis) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Laika zona (%1) - + Use System Time Izmantot sistēmas laiku @@ -851,7 +851,7 @@ LSession - + Desktop Darbvirsma diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts index 9702b408..11e7a6d6 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts @@ -83,17 +83,17 @@ Verwijderen - + Select Application Applicatie selecteren - + Name: Naam: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Bezig met opladen) - + %1 % (%2 Remaining) %1 % (%2 resterend) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Tijdzone (%1) - + Use System Time Systeemtijd gebruiken @@ -851,7 +851,7 @@ LSession - + Desktop Bureaublad diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts index f9c747e9..a65c9eb0 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts @@ -83,17 +83,17 @@ Usuń - + Select Application Wybierz aplikację - + Name: Nazwa: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Ładowanie) - + %1 % (%2 Remaining) %1 % (%2 pozostało) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Strefa czasowa (%1) - + Use System Time Czas systemowy @@ -851,7 +851,7 @@ LSession - + Desktop Pulpit diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts index dfe5c837..5a20441b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts @@ -83,17 +83,17 @@ Excluir - + Select Application Selecionar Aplicativo - + Name: Nome: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Carregando) - + %1 % (%2 Remaining) %1 % (%2 Restantes) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop Área de Trabalho diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts index 08732029..632f7134 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts @@ -83,17 +83,17 @@ Excluir - + Select Application Selecionar aplicativo - + Name: Nome: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (carregando) - + %1 % (%2 Remaining) %1 % (%2 restantes) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Fuso horário (%1) - + Use System Time Usar hora do sistema @@ -851,7 +851,7 @@ LSession - + Desktop Área de trabalho diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts index a7a78a16..d3d5c05d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts @@ -83,17 +83,17 @@ Удалить - + Select Application Выбрать Приложение - + Name: Название: - + New Filename Новое имя файла @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Заряжается) - + %1 % (%2 Remaining) %1 % (Осталось %2 ) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Часовой пояс (%1) - + Use System Time Использовать системное время @@ -851,7 +851,7 @@ LSession - + Desktop Рабочий стол diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts index c9bfecb1..5a2a2977 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts @@ -83,17 +83,17 @@ Vymazať - + Select Application Výber aplikácie - + Name: Meno: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Nabíjania) - + %1 % (%2 Remaining) %1 % (%2 zostáva) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Časová zóna (%1) - + Use System Time Použiť systémový čas @@ -851,7 +851,7 @@ LSession - + Desktop Pracovná plocha diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts index 5a4ab343..3892c2fb 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts @@ -83,17 +83,17 @@ Izbriši - + Select Application Izberi program - + Name: Ime: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts index 9a5870cd..54180b60 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts @@ -83,17 +83,17 @@ Ta bort - + Select Application Välj program - + Name: Namn: - + New Filename Nytt filnamn @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Laddar) - + %1 % (%2 Remaining) %1 % (%2 Återstår) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Tidszon (%1) - + Use System Time Använd systemtid @@ -851,7 +851,7 @@ LSession - + Desktop Skrivbord diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts index 02e7e914..1dc9a831 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts @@ -83,17 +83,17 @@ Sil - + Select Application Uygulama Seç - + Name: Ad: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) % %1 (Doluyor) - + %1 % (%2 Remaining) % %1 (Kalan %2) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Saat Dilimi (%1) - + Use System Time Sistem Saatini Kullan @@ -851,7 +851,7 @@ LSession - + Desktop Masaüstü diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts index eef5d753..b35f1956 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts @@ -83,17 +83,17 @@ Видалити - + Select Application Оберіть додаток - + Name: Ім'я: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 % (Заряд) - + %1 % (%2 Remaining) %1 (залишилося %2) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) Часовий пояс (%1) - + Use System Time Використовувати системний час @@ -851,7 +851,7 @@ LSession - + Desktop Робочий стіл diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts index 17149435..ae3342f5 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts @@ -83,17 +83,17 @@ 删除 - + Select Application 选择程序 - + Name: 名称： - + New Filename 新文件名 @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) %1 %(充电) - + %1 % (%2 Remaining) %1 (%2 剩余) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) 时区 (%1) - + Use System Time 使用系统时间 @@ -851,7 +851,7 @@ LSession - + Desktop 桌面 diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts index caeb719a..39dd32ba 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts @@ -83,17 +83,17 @@ - + Select Application - + Name: - + New Filename @@ -664,12 +664,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -677,12 +677,12 @@ LClock - + Time Zone (%1) - + Use System Time @@ -851,7 +851,7 @@ LSession - + Desktop -- cgit From 7331cfaf0a9af1b05a40755f61257579ce1b9731 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Aug 2017 14:26:54 -0400 Subject: Couple quick updates to LSession - not enabled at the moment. --- src-qt5/core/lumina-desktop/LSession.cpp | 9 +++++++-- src-qt5/core/lumina-desktop/LSession.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 777affd1..a5785963 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -49,6 +49,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu lastActiveWin = 0; cleansession = true; TrayStopping = false; + xchange = false; ICONS = new LIconCache(this); screenTimer = new QTimer(this); screenTimer->setSingleShot(true); @@ -364,12 +365,14 @@ void LSession::screensChanged(){ qDebug() << "Screen Number Changed"; if(screenTimer->isActive()){ screenTimer->stop(); } screenTimer->start(); + xchange = true; } void LSession::screenResized(int scrn){ qDebug() << "Screen Resized:" << scrn; if(screenTimer->isActive()){ screenTimer->stop(); } screenTimer->start(); + xchange = true; } void LSession::checkWindowGeoms(){ @@ -467,9 +470,10 @@ void LSession::updateDesktops(){ } dset.setValue("last_used_screens", allNames); //Make sure fluxbox also gets prompted to re-load screen config if the number of screens changes in the middle of a session - if(numchange && !firstrun) { + if(!firstrun && xchange){ qDebug() << "Update WM"; - refreshWindowManager(); + //QProcess::startDetached("killall fluxbox"); + xchange = false; } //Make sure all the background windows are registered on the system as virtual roots @@ -660,6 +664,7 @@ void LSession::playAudioFile(QString filepath){ void LSession::RootSizeChange(){ qDebug() << "Got Root Size Change"; if(DESKTOPS.isEmpty()){ return; } //Initial setup not run yet + xchange = true; screenTimer->start(); } diff --git a/src-qt5/core/lumina-desktop/LSession.h b/src-qt5/core/lumina-desktop/LSession.h index 4c8da41c..0d69df84 100644 --- a/src-qt5/core/lumina-desktop/LSession.h +++ b/src-qt5/core/lumina-desktop/LSession.h @@ -109,6 +109,7 @@ private: QList DESKTOPS; QFileSystemWatcher *watcher; QTimer *screenTimer; + bool xchange; //flag for when the x11 session was adjusted //Internal variable for global usage AppMenu *appmenu; -- cgit From 9fe4993bdc8a166c60c1191292aa353d1937f109 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 15 Aug 2017 16:28:16 -0400 Subject: Added translations to menu buttons and the panel settings dialogue --- src-qt5/core/lumina-desktop/SystemWindow.cpp | 3 ++ .../core/lumina-desktop/i18n/lumina-desktop_af.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ar.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_az.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_bg.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_bn.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_bs.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ca.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_cs.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_cy.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_da.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_de.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_el.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_en_AU.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_en_GB.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_en_ZA.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_es.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_et.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_eu.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_fa.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_fi.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_fr.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_fr_CA.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_gl.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_he.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_hi.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_hr.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_hu.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_id.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_is.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_it.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ja.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ka.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ko.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_lt.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_lv.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_mk.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_mn.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ms.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_mt.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_nb.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_nl.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_pa.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_pl.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_pt.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_pt_BR.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ro.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ru.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_sk.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_sl.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_sr.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_sv.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_sw.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_ta.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_tg.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_th.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_tr.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_uk.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_uz.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_vi.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_zh_CN.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_zh_HK.ts | 42 +++++++++++++++++----- .../lumina-desktop/i18n/lumina-desktop_zh_TW.ts | 42 +++++++++++++++++----- .../core/lumina-desktop/i18n/lumina-desktop_zu.ts | 42 +++++++++++++++++----- .../panel-plugins/systemstart/StartMenu.cpp | 7 ++-- 65 files changed, 2149 insertions(+), 507 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/SystemWindow.cpp b/src-qt5/core/lumina-desktop/SystemWindow.cpp index 1c0b59a5..cd09c9bd 100644 --- a/src-qt5/core/lumina-desktop/SystemWindow.cpp +++ b/src-qt5/core/lumina-desktop/SystemWindow.cpp @@ -55,6 +55,9 @@ bool SystemWindow::promptAboutUpdates(bool &skip){ if(pending.isEmpty()){ skip = false; } //continue without skip else{ QMessageBox dlg(QMessageBox::Question, tr("Apply Updates?"), tr("You have system updates waiting to be applied! Do you wish to install them now?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, this); + dlg.setButtonText(QMessageBox::Yes, tr("Yes")); + dlg.setButtonText(QMessageBox::No, tr("No")); + dlg.setButtonText(QMessageBox::Cancel, tr("Cancel")); dlg.setDetailedText(pending); dlg.setDefaultButton(QMessageBox::Yes); dlg.show(); diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts index bc8ebeca..c603fd8c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts @@ -1449,34 +1449,49 @@ Назад - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Отказ + + + %1% (Plugged In) %1% (външно захранване) - + %1% (%2 Estimated) %1% (приблизително %2) - + %1% Remaining остават %1% - - - + + + Workspace %1/%2 Работен плот %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Отказ @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts index 03cc11a0..4cd0c63e 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts @@ -1449,34 +1449,49 @@ Enrere - + Apply Updates? Aplico les actualitzacions? - + You have system updates waiting to be applied! Do you wish to install them now? Teniu actualitzacions de sistema per aplicar! Voleu instal·lar-les ara? - + + Yes + + + + + No + + + + + Cancel + Cancel·la + + + %1% (Plugged In) %1% (connectat) - + %1% (%2 Estimated) %1% (%2 estimat) - + %1% Remaining Resta %1% - - - + + + Workspace %1/%2 Espai de treball %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancel·la @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Teniu actualitzacions de sistema per aplicar! Voleu instal·lar-les ara? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts index e40b53de..adc843ed 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts @@ -1449,34 +1449,49 @@ Zpět - + Apply Updates? Nainstalovat aktualizace? - + You have system updates waiting to be applied! Do you wish to install them now? Aktualizace systému čekají na instalaci! Chcete je nainstalovat nyní? - + + Yes + + + + + No + + + + + Cancel + Storno + + + %1% (Plugged In) %1% (zapojeno) - + %1% (%2 Estimated) %1% (odhadováno %2) - + %1% Remaining %1% zbývá - - - + + + Workspace %1/%2 Pracovní plocha %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Storno @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Aktualizace systému čekají na instalaci! Chcete je nainstalovat nyní? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts index 6d961601..f791a3d9 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -1449,34 +1449,49 @@ Tilbage - + Apply Updates? Opdater? - + You have system updates waiting to be applied! Do you wish to install them now? Du har systemopdateringer der venter! Ønsker du at installere dem nu? - + + Yes + + + + + No + + + + + Cancel + Annuller + + + %1% (Plugged In) %1% (tilsluttet) - + %1% (%2 Estimated) %1% (%2 estimeret) - + %1% Remaining %1% tilbage - - - + + + Workspace %1/%2 Arbejdsområde %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Annuller @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Du har systemopdateringer der venter! Ønsker du at installere dem nu? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts index 9cb26ec5..80b8eb9d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts @@ -1449,34 +1449,49 @@ Zurück - + Apply Updates? Aktualisierungen anwenden? - + You have system updates waiting to be applied! Do you wish to install them now? Sie haben Systemaktualisierungen, die darauf warten, angewendet zu werden! Möchten Sie sie jetzt installieren? - + + Yes + + + + + No + + + + + Cancel + Abbrechen + + + %1% (Plugged In) %1% (Eingesteckt) - + %1% (%2 Estimated) %1% (%2 Geschätzt) - + %1% Remaining %1% verbleibend - - - + + + Workspace %1/%2 Arbeitsbereich %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Abbrechen @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Sie haben Systemaktualisierungen, die darauf warten, angewendet zu werden! Möchten Sie sie jetzt installieren? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts index e3863914..118b48b1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts index cef0eaa8..3cf7e09c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_AU.ts @@ -1449,34 +1449,49 @@ Back - + Apply Updates? Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Cancel + + + %1% (Plugged In) %1% (Plugged In) - + %1% (%2 Estimated) %1% (%2 Estimated) - + %1% Remaining %1% Remaining - - - + + + Workspace %1/%2 Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts index 2aa1b8c3..db35d013 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_GB.ts @@ -1449,34 +1449,49 @@ Back - + Apply Updates? Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Cancel + + + %1% (Plugged In) %1% (Plugged In) - + %1% (%2 Estimated) %1% (%2 Estimated) - + %1% Remaining %1% Remaining - - - + + + Workspace %1/%2 Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_en_ZA.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts index b596e01f..319f90ab 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts @@ -1449,34 +1449,49 @@ Atrás - + Apply Updates? ¿Aplicar Actualizaciones? - + You have system updates waiting to be applied! Do you wish to install them now? ¡Tienes actualizaciones del sistema esperando ser aplicadas! ¿Desearías instalarlas ahora? - + + Yes + + + + + No + + + + + Cancel + Cancelar + + + %1% (Plugged In) %1% (Conectado) - + %1% (%2 Estimated) %1% (%2 Estimado) - + %1% Remaining %1% Restante - - - + + + Workspace %1/%2 Área de Trabajo %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancelar @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? !Tienes actualizaciones del sistema esperando ser aplicadas! ¿Quisieras instalarlas ahora? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts index 993663f8..4fbe1d5b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts @@ -1449,34 +1449,49 @@ Tagasi - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Loobu + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Tööruum %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Loobu @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts index fe52adc4..248cc262 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Utzi + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Laneko area %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Utzi @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts index 4d9ca09a..e45c6072 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts index e0c620fd..ff8e867c 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts @@ -1449,34 +1449,49 @@ Takaisin - + Apply Updates? Toteutetaanko päivitykset? - + You have system updates waiting to be applied! Do you wish to install them now? Jotkin järjestelmäpäivitykset odottavat toteuttamista! Haluatko asentaa ne nyt? - + + Yes + + + + + No + + + + + Cancel + Peru + + + %1% (Plugged In) %1 % (verkkovirta) - + %1% (%2 Estimated) %1 % (arviolta %2) - + %1% Remaining %1 % jäljellä - - - + + + Workspace %1/%2 Työtila %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Peru @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Joitakin järjestelmäpäivityksiä odottavat toteuttamista! Haluatko asentaa ne nyt? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts index 4e97fc73..f85a0380 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts @@ -1449,34 +1449,49 @@ Retour - + Apply Updates? Appliquer les Mises à Jour ? - + You have system updates waiting to be applied! Do you wish to install them now? Des mises à jour du système sont en attente, voulez-vous les installer maintenant ? - + + Yes + + + + + No + + + + + Cancel + Annuler + + + %1% (Plugged In) %1% (Branchée) - + %1% (%2 Estimated) %1% (%2 Estimé) - + %1% Remaining %1% restant(s) - - - + + + Workspace %1/%2 Espace de Travail %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Annuler @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Des mises à jour du système sont en attente, voulez-vous les installer maintenant ? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr_CA.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts index f323f9bd..fabf3f31 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts @@ -1449,34 +1449,49 @@ אחורה - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + ביטול + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel ביטול @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts index 2a026368..f1cb1d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts @@ -1449,34 +1449,49 @@ वापस - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + रद्द + + + %1% (Plugged In) %1%(प्लग इन) - + %1% (%2 Estimated) %1% (%2 लगभग) - + %1% Remaining %1% शेष - - - + + + Workspace %1/%2 कार्यस्थल %1/%2 @@ -1505,6 +1520,7 @@ + Cancel रद्द @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts index 7ae3bfa7..30cc030d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts @@ -1449,34 +1449,49 @@ Vissza - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Mégsem + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 %1/%2 munkaterület @@ -1505,6 +1520,7 @@ + Cancel Mégsem @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts index 64266b63..38cdee0f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts @@ -1449,34 +1449,49 @@ Mundur - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Batalkan + + + %1% (Plugged In) %1% (Terpasang Dalam) - + %1% (%2 Estimated) %1% (%2 Perkiraan) - + %1% Remaining %1% Sisa - - - + + + Workspace %1/%2 Ruang kerja %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Batalkan @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts index bf898955..32aae413 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts @@ -1449,34 +1449,49 @@ Indietro - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Cancella + + + %1% (Plugged In) %1% (Plugged In) - + %1% (%2 Estimated) %1% (%2 Stimato) - + %1% Remaining %1% Rimanente - - - + + + Workspace %1/%2 Spazio Lavoro %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancella @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts index 70b9304f..0179804f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts @@ -1466,34 +1466,49 @@ 戻る - + Apply Updates? 更新を行いますか? - + You have system updates waiting to be applied! Do you wish to install them now? 適用されていないシステムアップデートがあります。インストールしますか? - + + Yes + + + + + No + + + + + Cancel + キャンセル + + + %1% (Plugged In) %1% (電源接続中) - + %1% (%2 Estimated) %1% (推定残り時間: %2) - + %1% Remaining 残り %1% - - - + + + Workspace %1/%2 ワークスペース %1/%2 @@ -1522,6 +1537,7 @@ + Cancel キャンセル @@ -1545,6 +1561,16 @@ You have system updates waiting to be applied! Do you wish to install them now? システムが適用されるのを待っている更新があります！ 今それらをインストールしますか？ + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts index 6e458cda..b7a23143 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts @@ -1449,34 +1449,49 @@ 뒤로 - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + 취소 + + + %1% (Plugged In) %1% (연결됨) - + %1% (%2 Estimated) %1% (%2 예상) - + %1% Remaining %1% 남음 - - - + + + Workspace %1/%2 작업 공간 %1/%2 @@ -1505,6 +1520,7 @@ + Cancel 취소 @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts index ecb0a1ed..55cc8ec1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts @@ -1449,34 +1449,49 @@ Atgal - + Apply Updates? Taikyti atnaujinimus? - + You have system updates waiting to be applied! Do you wish to install them now? Jūsų sistemoje yra laukiančių atnaujinimų! Ar norite įdiegti juos dabar? - + + Yes + + + + + No + + + + + Cancel + Atsisakyti + + + %1% (Plugged In) %1% (Įdėta) - + %1% (%2 Estimated) %1% (Apytikriai %2) - + %1% Remaining Liko %1% - - - + + + Workspace %1/%2 Darbo sritis %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Atsisakyti @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Jūsų sistemoje yra laukiančių atnaujinimų! Ar norite įdiegti juos dabar? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts index 85e89710..5d7d9e0f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts @@ -1449,34 +1449,49 @@ Atpakaļ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Atcelt + + + %1% (Plugged In) %1% (pievienots) - + %1% (%2 Estimated) %1% (%2 paredzamais) - + %1% Remaining %1% atlicis - - - + + + Workspace %1/%2 Darbvieta %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Atcelt @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts index 11e7a6d6..3e0fc664 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts @@ -1449,34 +1449,49 @@ Terug - + Apply Updates? Wilt u de updates toepassen? - + You have system updates waiting to be applied! Do you wish to install them now? Er zijn systeemupdates beschikbaar. Wilt u deze nu installeren? - + + Yes + + + + + No + + + + + Cancel + Annuleren + + + %1% (Plugged In) %1% (Oplaadkabel is verbonden) - + %1% (%2 Estimated) %1% (%2 geschat) - + %1% Remaining %1% resterend - - - + + + Workspace %1/%2 Werkruimte %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Annuleren @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Er zijn systeemupdates beschikbaar! Wilt u deze nu installeren? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts index a65c9eb0..e3ebe0a6 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts @@ -1449,34 +1449,49 @@ Wstecz - + Apply Updates? Zastosować aktualizacje? - + You have system updates waiting to be applied! Do you wish to install them now? Masz oczekujące aktualizacje systemowe gotowe do zastosowania! Czy chcesz zainstalować je teraz? - + + Yes + + + + + No + + + + + Cancel + Zaniechaj + + + %1% (Plugged In) %1% (Podłączony) - + %1% (%2 Estimated) %1% (%2 Szacowane) - + %1% Remaining %1% Pozostało - - - + + + Workspace %1/%2 Przestrzeń robocza %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Zaniechaj @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Masz oczekujące aktualizacje systemu gotowe do zastosowania! Czy chcesz je teraz zainstalować? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts index 5a20441b..0321a6b1 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Cancelar + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Espaço de trabalho %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancelar @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts index 632f7134..0fd7d193 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt_BR.ts @@ -1449,34 +1449,49 @@ Voltar - + Apply Updates? Aplicar atualizações? - + You have system updates waiting to be applied! Do you wish to install them now? Você tem atualização de sistema pendentes! Gostaria de instalá-las agora? - + + Yes + + + + + No + + + + + Cancel + Cancelar + + + %1% (Plugged In) %1% (Plugado) - + %1% (%2 Estimated) %1% (%2 Estimado) - + %1% Remaining %1% Restantes - - - + + + Workspace %1/%2 Espaço de trabalho %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Cancelar @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? Você tem atualização de sistema pendentes! Gostaria de instalá-las agora? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts index d3d5c05d..2f4b4072 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts @@ -1449,34 +1449,49 @@ Назад - + Apply Updates? Применить обновления? - + You have system updates waiting to be applied! Do you wish to install them now? У вас есть системные обновления! Вы хотите установить их сейчас? - + + Yes + + + + + No + + + + + Cancel + Отмена + + + %1% (Plugged In) %1% (подключенный) - + %1% (%2 Estimated) %1% (%2 расчетно) - + %1% Remaining %1% осталось - - - + + + Workspace %1/%2 Рабочая Область %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Отмена @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? У вас есть системные обновления! Вы хотите установить их сейчас? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts index 5a2a2977..907717e2 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts @@ -1449,34 +1449,49 @@ Späť - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Zrušiť + + + %1% (Plugged In) %1% (Nabitia) - + %1% (%2 Estimated) %1% (%2 odhadovaný) - + %1% Remaining Zostáva %1% - - - + + + Workspace %1/%2 Pracovná plocha %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Zrušiť @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts index 3892c2fb..637f7436 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts index 54180b60..ecf6aa32 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts @@ -1449,34 +1449,49 @@ Bakåt - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Avbryt + + + %1% (Plugged In) %1% (Inkopplad) - + %1% (%2 Estimated) %1% (%2 Beräknad) - + %1% Remaining %1% återstår - - - + + + Workspace %1/%2 Arbetsyta %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Avbryt @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts index 1dc9a831..f3e6147d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts @@ -1449,34 +1449,49 @@ Geri - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + İptal + + + %1% (Plugged In) %1% (Prize Takılı) - + %1% (%2 Estimated) %1% (Tahmini %2) - + %1% Remaining %1% Kaldı - - - + + + Workspace %1/%2 Çalışma alanı %1/%2 @@ -1505,6 +1520,7 @@ + Cancel İptal @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts index b35f1956..e73fe905 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts @@ -1449,34 +1449,49 @@ Назад - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + Скасувати + + + %1% (Plugged In) %1% (Підключено) - + %1% (%2 Estimated) %1% (%2 розрахунково) - + %1% Remaining %1% Залишилось - - - + + + Workspace %1/%2 Робочий простір %1/%2 @@ -1505,6 +1520,7 @@ + Cancel Скасувати @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts index ae3342f5..cf6f658b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_CN.ts @@ -1449,34 +1449,49 @@ 返回 - + Apply Updates? 应用更新？ - + You have system updates waiting to be applied! Do you wish to install them now? 您有系统更新可用！请问您是否想现在安装？ - + + Yes + + + + + No + + + + + Cancel + 取消 + + + %1% (Plugged In) %1% (已插电) - + %1% (%2 Estimated) %1% (估计 %2) - + %1% Remaining 剩余 %1% - - - + + + Workspace %1/%2 工作区 %1/%2 @@ -1505,6 +1520,7 @@ + Cancel 取消 @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? 您有系统更新可用！请问您是否想现在安装？ + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_HK.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zh_TW.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts index 39dd32ba..8ca71d5a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts @@ -1449,34 +1449,49 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + + Yes + + + + + No + + + + + Cancel + + + + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1505,6 +1520,7 @@ + Cancel @@ -1528,6 +1544,16 @@ You have system updates waiting to be applied! Do you wish to install them now? + + + Yes + + + + + No + + UserItemWidget diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp index 6557dbee..1992db0f 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp @@ -1,8 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details +// Copyright (c) 2015, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== #include "StartMenu.h" #include "ui_StartMenu.h" @@ -290,6 +288,9 @@ bool StartMenu::promptAboutUpdates(bool &skip){ if(pending.isEmpty()){ skip = false; } //continue without skip else{ QMessageBox dlg(QMessageBox::Question, tr("Apply Updates?"), tr("You have system updates waiting to be applied! Do you wish to install them now?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, this); + dlg.setButtonText(QMessageBox::Yes, tr("Yes")); + dlg.setButtonText(QMessageBox::No, tr("No")); + dlg.setButtonText(QMessageBox::Cancel, tr("Cancel")); dlg.setDetailedText(pending); dlg.setDefaultButton(QMessageBox::Yes); dlg.show(); -- cgit