diff options
21 files changed, 57 insertions, 59 deletions
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_en_AU.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_en_AU.ts index 9ed0806b..93f33884 100644 --- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_en_AU.ts +++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>AppDialog</name> <message> diff --git a/src-qt5/core-utils/lumina-search/i18n/lumina-search_en_AU.ts b/src-qt5/core-utils/lumina-search/i18n/lumina-search_en_AU.ts index cbca2d56..7a365bae 100644 --- a/src-qt5/core-utils/lumina-search/i18n/lumina-search_en_AU.ts +++ b/src-qt5/core-utils/lumina-search/i18n/lumina-search_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>ConfigUI</name> <message> 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..2c36af80 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 <QScreen> #include <QApplication> -#define DEBUG 0 +#define DEBUG 1 LScreenSaver::LScreenSaver() : QWidget(0,Qt::BypassWindowManagerHint | Qt::WindowStaysOnTopHint){ starttimer = new QTimer(this); @@ -102,13 +102,14 @@ void LScreenSaver::ShowScreenSaver(){ //Now go through and create/show all the various widgets QList<QScreen*> 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; i<SCREENS.length(); i++){ bounds = bounds.united(SCREENS[i]->geometry()); 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() ); @@ -144,15 +145,16 @@ 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(); emit LockStatusChanged(false); } for(int i=0; i<BASES.length(); i++){ - BASES[i]->hide(); + 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..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"){ @@ -76,8 +75,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/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..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 @@ -14,6 +14,7 @@ #include "BaseAnimGroup.h" #include <QParallelAnimationGroup> #include <QtMath> +#include <QMatrix> class Grav: public QParallelAnimationGroup{ Q_OBJECT @@ -21,11 +22,11 @@ private: QWidget *planet; QPropertyAnimation *orbit; QSize range; - QList<QPoint> path; + //QList<QPoint> 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) )); @@ -39,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; i<step; i++) { @@ -54,21 +55,20 @@ private: //Creates a new point and creates a key as part of the animation QPoint newLoc = QPoint(newX, newY); - //orbit->setKeyValueAt(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();} @@ -79,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); @@ -94,26 +94,31 @@ 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)){ + 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; 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(){} @@ -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; i<number; i++){ Grav *tmp = new Grav(canvas); this->addAnimation(tmp); - connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished())); + connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished())); planets << tmp; } } 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 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>AppLaunchButtonPlugin</name> <message> 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 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>MainUI</name> <message> 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 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>LFileDialog</name> <message> 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 d8ba709e..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 @@ -11,7 +13,7 @@ desktop.path=$${L_SHAREDIR}/applications/ #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/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 += ../ diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_en_AU.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_en_AU.ts index a07004ad..ab6a1f45 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>Backend</name> <message> diff --git a/src-qt5/desktop-utils/lumina-calculator/i18n/l-calc_en_AU.ts b/src-qt5/desktop-utils/lumina-calculator/i18n/l-calc_en_AU.ts index 350c57e7..6a64c72a 100644 --- a/src-qt5/desktop-utils/lumina-calculator/i18n/l-calc_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-calculator/i18n/l-calc_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>mainUI</name> <message> diff --git a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_en_AU.ts b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_en_AU.ts index ed802fce..7c7aea5f 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-fileinfo/i18n/l-fileinfo_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>MainUI</name> <message> diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp index 06f16ad1..d5f219bb 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp @@ -275,7 +275,7 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){ int num = 0; if(listWidget!=0){ //LIST WIDGET - name and icon only - if(info->isDesktopFile() && info.XDG()->isValid()){ + if(info->isDesktopFile() && info->XDG()->isValid()){ QList<QListWidgetItem*> items = listWidget->findItems(info->XDG()->name, Qt::MatchExactly); //Could be multiple items with the same text in this case - check paths as well bool found = false; diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_en_AU.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_en_AU.ts index 843b88a7..8d8066be 100644 --- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>BMMDialog</name> <message> diff --git a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts index 785e0df2..ced32956 100644 --- a/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-mediaplayer/i18n/l-mediap_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>MainUI</name> <message> diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_en_AU.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_en_AU.ts index 2db1b1eb..786cd451 100644 --- a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>ImageEditor</name> <message> diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_en_AU.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_en_AU.ts index 9fd60155..2a5f1298 100644 --- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_en_AU.ts +++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>ColorDialog</name> <message> diff --git a/src-qt5/experimental/lumina-terminal/i18n/l-terminal_en_AU.ts b/src-qt5/experimental/lumina-terminal/i18n/l-terminal_en_AU.ts index 99b84253..e4c5bcc4 100644 --- a/src-qt5/experimental/lumina-terminal/i18n/l-terminal_en_AU.ts +++ b/src-qt5/experimental/lumina-terminal/i18n/l-terminal_en_AU.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en_GB"> +<TS version="2.1" language="en_AU"> <context> <name>TerminalWidget</name> <message> |