From c816fad1b4462b979d7b60c4e510fab3896a6bf1 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 17 Oct 2016 10:31:51 -0400 Subject: Fix the painting routines for the desktop/panel. Make sure we only paint the *requested* rectangle, and not the whole thing on every request. --- src-qt5/core/lumina-desktop/LDesktopBackground.cpp | 5 +++-- src-qt5/core/lumina-desktop/LPanel.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp index 3d33db71..97249384 100644 --- a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp @@ -7,12 +7,13 @@ #include "LDesktopBackground.h" #include +#include -void LDesktopBackground::paintEvent(QPaintEvent *) { +void LDesktopBackground::paintEvent(QPaintEvent *ev) { if (bgPixmap != NULL) { QPainter painter(this); painter.setBrush(*bgPixmap); - painter.drawRect(0, 0, width(), height()); + painter.drawRect(ev->rect()); } } diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index b0abf498..6e07f624 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -324,12 +324,12 @@ void LPanel::paintEvent(QPaintEvent *event){ QPainter *painter = new QPainter(this); //qDebug() << "Paint Panel:" << PPREFIX; //Make sure the base background of the event rectangle is the associated rectangle from the BGWindow - QRect rec = this->geometry(); //start with the global geometry of the panel + QRect rec = event->rect();//this->geometry(); //start with the global geometry of the panel //Need to translate that rectangle to the background image coordinates - //qDebug() << " - Rec:" << rec << hidden << this->geometry(); - rec.moveTo( rec.x()-LSession::handle()->screenGeom(screennum).x(), rec.y()-LSession::handle()->screenGeom(screennum).y() ); - //qDebug() << " - Adjusted Global Rec:" << rec; - painter->drawPixmap(QRect(0,0,this->width(), this->height()), bgWindow->grab(rec) ); + qDebug() << " - Rec:" << rec << hidden << this->geometry() << bgWindow->geometry(); + rec.moveTo( bgWindow->mapFromGlobal( this->mapToGlobal(rec.topLeft()) ) ); //(rec.x()-LSession::handle()->screenGeom(screennum).x(), rec.y()-LSession::handle()->screenGeom(screennum).y() ); + qDebug() << " - Adjusted Window Rec:" << rec; + painter->drawPixmap(event->rect(), bgWindow->grab(rec) ); } QWidget::paintEvent(event); //now pass the event along to the normal painting event } -- cgit From 8691662461303fe6ab195df5aa2f23ed4dc8eedb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 17 Oct 2016 10:43:26 -0400 Subject: Turn off some debugging and fix the repaint of the entire wallpaper on change. --- src-qt5/core/lumina-desktop/LDesktopBackground.cpp | 2 +- src-qt5/core/lumina-desktop/LPanel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp index 97249384..c3d67117 100644 --- a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp @@ -67,7 +67,7 @@ void LDesktopBackground::setBackground(const QString& bgFile, const QString& for painter.setBrushOrigin(dx, dy); painter.drawRect(dx, dy, drawWidth, drawHeight); } - update(); + this->repaint(this->geometry()); //make sure the entire thing gets repainted right away show(); } diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index 6e07f624..1308d61f 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -326,9 +326,9 @@ void LPanel::paintEvent(QPaintEvent *event){ //Make sure the base background of the event rectangle is the associated rectangle from the BGWindow QRect rec = event->rect();//this->geometry(); //start with the global geometry of the panel //Need to translate that rectangle to the background image coordinates - qDebug() << " - Rec:" << rec << hidden << this->geometry() << bgWindow->geometry(); + //qDebug() << " - Rec:" << rec << hidden << this->geometry() << bgWindow->geometry(); rec.moveTo( bgWindow->mapFromGlobal( this->mapToGlobal(rec.topLeft()) ) ); //(rec.x()-LSession::handle()->screenGeom(screennum).x(), rec.y()-LSession::handle()->screenGeom(screennum).y() ); - qDebug() << " - Adjusted Window Rec:" << rec; + //qDebug() << " - Adjusted Window Rec:" << rec; painter->drawPixmap(event->rect(), bgWindow->grab(rec) ); } QWidget::paintEvent(event); //now pass the event along to the normal painting event -- cgit From c7967eb9b1a25767ec29290bebb782a70a45251a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 17 Oct 2016 11:09:05 -0400 Subject: Some more painting cleanup for the wallpaper/panels. --- src-qt5/core/lumina-desktop/LDesktopBackground.cpp | 10 +++++++--- src-qt5/core/lumina-desktop/LPanel.cpp | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp index c3d67117..ed12bcf0 100644 --- a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp @@ -8,13 +8,17 @@ #include #include +#include void LDesktopBackground::paintEvent(QPaintEvent *ev) { if (bgPixmap != NULL) { + //qDebug() << "Wallpaper paint Event:" << ev->rect(); QPainter painter(this); painter.setBrush(*bgPixmap); - painter.drawRect(ev->rect()); - } + painter.drawRect(ev->rect().adjusted(-1,-1,2,2)); + }else{ + QWidget::paintEvent(ev); + } } void LDesktopBackground::setBackground(const QString& bgFile, const QString& format) { @@ -67,7 +71,7 @@ void LDesktopBackground::setBackground(const QString& bgFile, const QString& for painter.setBrushOrigin(dx, dy); painter.drawRect(dx, dy, drawWidth, drawHeight); } - this->repaint(this->geometry()); //make sure the entire thing gets repainted right away + this->repaint(); //make sure the entire thing gets repainted right away show(); } diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index 1308d61f..67cba7f4 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -325,11 +325,12 @@ void LPanel::paintEvent(QPaintEvent *event){ //qDebug() << "Paint Panel:" << PPREFIX; //Make sure the base background of the event rectangle is the associated rectangle from the BGWindow QRect rec = event->rect();//this->geometry(); //start with the global geometry of the panel + rec.adjust(-1,-1,2,2); //add 1 more pixel on each side //Need to translate that rectangle to the background image coordinates //qDebug() << " - Rec:" << rec << hidden << this->geometry() << bgWindow->geometry(); rec.moveTo( bgWindow->mapFromGlobal( this->mapToGlobal(rec.topLeft()) ) ); //(rec.x()-LSession::handle()->screenGeom(screennum).x(), rec.y()-LSession::handle()->screenGeom(screennum).y() ); //qDebug() << " - Adjusted Window Rec:" << rec; - painter->drawPixmap(event->rect(), bgWindow->grab(rec) ); + painter->drawPixmap(event->rect().adjusted(-1,-1,2,2), bgWindow->grab(rec) ); } QWidget::paintEvent(event); //now pass the event along to the normal painting event } -- cgit From 4f9210c8ea6b4aa3d24bb62e6a57c3c0acc60938 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 17 Oct 2016 11:19:30 -0400 Subject: Disable a bunch more options within the default Fluxbox config for Lumina. --- src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-init-rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-init-rc b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-init-rc index 09407ab4..c176e9af 100644 --- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-init-rc +++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-init-rc @@ -55,7 +55,7 @@ session.screen0.menuDelay: 200 session.screen0.clickRaises: true session.screen0.focusSameHead: true session.screen0.focusModel: ClickFocus -session.screen0.workspacewarping: true +session.screen0.workspacewarping: false session.screen0.maxDisableResize: false session.screen0.autoRaise: false session.screen0.allowRemoteActions: false @@ -77,5 +77,5 @@ session.keyFile: ${XDG_CONFIG_HOME}/lumina-desktop/fluxbox-keys session.configVersion: 13 session.autoRaiseDelay: 250 session.cacheMax: 200 -session.imageDither: True -session.forcePseudoTransparency: True +session.imageDither: false +session.forcePseudoTransparency: false -- cgit From ded6e4e13a6a98c3793f73cbb286fcc73caf5bf7 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 18 Oct 2016 10:40:01 -0400 Subject: Large update/refactor of desktop widgets. This reduces the number of widgets in the stack by 1, and seems to help performance a bit. --- src-qt5/core/libLumina/LuminaX11.cpp | 43 +++++++++++++++++++ src-qt5/core/libLumina/LuminaX11.h | 1 + src-qt5/core/lumina-desktop/LDesktop.cpp | 48 ++++++++++++---------- src-qt5/core/lumina-desktop/LDesktop.h | 2 +- src-qt5/core/lumina-desktop/LDesktopBackground.cpp | 42 +++++++++++-------- src-qt5/core/lumina-desktop/LDesktopBackground.h | 2 +- .../core/lumina-desktop/LDesktopPluginSpace.cpp | 40 +++++++++++++++--- src-qt5/core/lumina-desktop/LDesktopPluginSpace.h | 20 +++++---- src-qt5/core/lumina-desktop/LPanel.cpp | 19 ++++++--- src-qt5/core/lumina-desktop/LSession.cpp | 4 +- .../panel-plugins/systemstart/LStartButton.cpp | 2 +- src-qt5/core/lumina-session/session.cpp | 2 +- 12 files changed, 161 insertions(+), 64 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaX11.cpp b/src-qt5/core/libLumina/LuminaX11.cpp index ecaa83d2..3708af6d 100644 --- a/src-qt5/core/libLumina/LuminaX11.cpp +++ b/src-qt5/core/libLumina/LuminaX11.cpp @@ -531,6 +531,49 @@ uint LXCB::GenerateDamageID(WId win){ return ( (uint) dmgID ); } +// === paintRoot() === +void LXCB::paintRoot(QRect area, const QPixmap *pix){ + //Generate a graphics context for this paint + xcb_gcontext_t gc = xcb_generate_id(QX11Info::connection()); + xcb_screen_t *screen = xcb_setup_roots_iterator(xcb_get_setup(QX11Info::connection())).data; + uint32_t values[1]; + values[0] = screen->black_pixel; + + xcb_create_gc(QX11Info::connection(), + gc, + screen->root, + XCB_GC_BACKGROUND, + values ); + //Convert the QPixmap to a xcb_drawable_t + QImage qimage = pix->toImage().convertToFormat(QImage::Format_ARGB32); + xcb_image_t *image = xcb_image_create(pix->width(), pix->height(), XCB_IMAGE_FORMAT_XY_PIXMAP, + 32, qimage.depth(), 32, 32, XCB_IMAGE_ORDER_LSB_FIRST, XCB_IMAGE_ORDER_LSB_FIRST, + 0, qimage.byteCount(), qimage.bits()); + + + //Now paint on the root window + xcb_image_put(QX11Info::connection(), + screen->root, //where to put it + gc, + image, + area.x(), + area.y(), + 0); + /*xcb_copy_area(QX11Info::connection(), + //static_cast( pix.handle() ) , //image to copy + *image, + screen->root, //where to put it + gc, //graphics context for destination + 0, //x origin of picture + 0, // y origin of picture + area.x(), //x origin of where to place it + area.y(), //y origin of where to place it + area.width(), + area.height() );*/ + //Apply the change right now + xcb_flush(QX11Info::connection()); + xcb_image_destroy(image); +} // === SetAsSticky() === void LXCB::SetAsSticky(WId win){ diff --git a/src-qt5/core/libLumina/LuminaX11.h b/src-qt5/core/libLumina/LuminaX11.h index b7310abd..7b6cce3c 100644 --- a/src-qt5/core/libLumina/LuminaX11.h +++ b/src-qt5/core/libLumina/LuminaX11.h @@ -133,6 +133,7 @@ public: // - SubStructure simplifications (not commonly used) void SelectInput(WId win, bool isEmbed = false); //XSelectInput replacement (to see window events) uint GenerateDamageID(WId); + void paintRoot(QRect area, const QPixmap *pix); // - General Window Modifications void SetAsSticky(WId); //Stick to all workspaces diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index 8258dbb6..8b1bd825 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -30,7 +30,7 @@ LDesktop::LDesktop(int deskNum, bool setdefault) : QObject(){ settings = new QSettings(QSettings::UserScope, "lumina-desktop","desktopsettings", this); //qDebug() << " - Desktop Settings File:" << settings->fileName(); if(!QFile::exists(settings->fileName())){ settings->setValue(DPREFIX+"background/filelist",QStringList()<<"default"); settings->sync(); } - bgWindow = 0; + //bgWindow = 0; bgDesktop = 0; QTimer::singleShot(1,this, SLOT(InitDesktop()) ); @@ -39,7 +39,7 @@ LDesktop::LDesktop(int deskNum, bool setdefault) : QObject(){ LDesktop::~LDesktop(){ delete deskMenu; delete winMenu; - delete bgWindow; + //delete bgWindow; delete workspacelabel; delete wkspaceact; } @@ -49,13 +49,13 @@ int LDesktop::Screen(){ } void LDesktop::show(){ - if(bgWindow!=0){ bgWindow->show(); } + //if(bgWindow!=0){ bgWindow->show(); } if(bgDesktop!=0){ bgDesktop->show(); } for(int i=0; ishow(); } } void LDesktop::hide(){ - if(bgWindow!=0){ bgWindow->hide(); } + //if(bgWindow!=0){ bgWindow->hide(); } if(bgDesktop!=0){ bgDesktop->hide(); } for(int i=0; ihide(); } } @@ -71,7 +71,7 @@ void LDesktop::prepareToClose(){ } WId LDesktop::backgroundID(){ - if(bgWindow!=0){ return bgWindow->winId(); } + if(bgDesktop!=0){ return bgDesktop->winId(); } else{ return QX11Info::appRootWindow(); } } @@ -90,7 +90,7 @@ void LDesktop::UpdateGeometry(){ //Now update the screen // NOTE: This functionality is highly event-driven based on X changes - so we need to keep things in order (no signals/slots) //qDebug() << "Changing Desktop Geom:" << desktopnumber; - bgWindow->setGeometry(desktop->screenGeometry(desktopnumber)); + //bgWindow->setGeometry(desktop->screenGeometry(desktopnumber)); //qDebug() << " - Update Desktop Plugin Area"; UpdateDesktopPluginArea(); //qDebug() << " - Done With Desktop Geom Updates"; @@ -213,25 +213,28 @@ void LDesktop::InitDesktop(){ connect(QApplication::instance(), SIGNAL(LocaleChanged()), this, SLOT(LocaleChanged()) ); connect(QApplication::instance(), SIGNAL(WorkspaceChanged()), this, SLOT(UpdateBackground()) ); - if(DEBUG){ qDebug() << "Create bgWindow"; } - bgWindow = new LDesktopBackground(); + //if(DEBUG){ qDebug() << "Create bgWindow"; } + /*bgWindow = new QWidget(); //LDesktopBackground(); bgWindow->setObjectName("bgWindow"); bgWindow->setContextMenuPolicy(Qt::CustomContextMenu); bgWindow->setFocusPolicy(Qt::StrongFocus); bgWindow->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); LSession::handle()->XCB->SetAsDesktop(bgWindow->winId()); bgWindow->setGeometry(LSession::handle()->screenGeom(desktopnumber)); - connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) ); + bgWindow->setWindowOpacity(0.0); + connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) );*/ if(DEBUG){ qDebug() << "Create bgDesktop"; } - bgDesktop = new LDesktopPluginSpace(bgWindow); //new QMdiArea(bgWindow); + bgDesktop = new LDesktopPluginSpace(); int grid = settings->value(DPREFIX+"GridSize",-1).toInt(); - if(grid<0 && bgWindow->height() > 2000){ grid = 200; } + if(grid<0 &&desktop->screenGeometry(desktopnumber).height() > 2000){ grid = 200; } else if(grid<0){ grid = 100; } bgDesktop->SetIconSize( grid ); + bgDesktop->setContextMenuPolicy(Qt::CustomContextMenu); connect(bgDesktop, SIGNAL(PluginRemovedByUser(QString)), this, SLOT(RemoveDeskPlugin(QString)) ); connect(bgDesktop, SIGNAL(IncreaseIcons()), this, SLOT(IncreaseDesktopPluginIcons()) ); connect(bgDesktop, SIGNAL(DecreaseIcons()), this, SLOT(DecreaseDesktopPluginIcons()) ); connect(bgDesktop, SIGNAL(HideDesktopMenu()), deskMenu, SLOT(hide())); + connect(bgDesktop, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) ); if(DEBUG){ qDebug() << " - Desktop Init Done:" << desktopnumber; } //Start the update processes QTimer::singleShot(10,this, SLOT(UpdateMenu()) ); @@ -376,7 +379,7 @@ void LDesktop::RemoveDeskPlugin(QString ID){ void LDesktop::IncreaseDesktopPluginIcons(){ int cur = settings->value(DPREFIX+"GridSize",-1).toInt(); - if(cur<0 && bgWindow->height() > 2000){ cur = 200; } + if(cur<0 && desktop->screenGeometry(desktopnumber).height() > 2000){ cur = 200; } else if(cur<0){ cur = 100; } cur+=16; issyncing=true; //don't let the change cause a refresh @@ -388,7 +391,7 @@ void LDesktop::IncreaseDesktopPluginIcons(){ void LDesktop::DecreaseDesktopPluginIcons(){ int cur = settings->value(DPREFIX+"GridSize",-1).toInt(); - if(cur<0 && bgWindow->height() > 2000){ cur = 200; } + if(cur<0 && desktop->screenGeometry(desktopnumber).height() > 2000){ cur = 200; } else if(cur<0){ cur = 100; } if(cur<32){ return; } //cannot get smaller than 16x16 cur-=16; @@ -426,7 +429,7 @@ void LDesktop::UpdatePanels(){ if(!found){ if(DEBUG){ qDebug() << " -- Create panel "<< i; } //New panel - LPanel *pan = new LPanel(settings, desktopnumber, i, bgWindow); + LPanel *pan = new LPanel(settings, desktopnumber, i, bgDesktop); PANELS << pan; pan->show(); } @@ -436,7 +439,7 @@ void LDesktop::UpdatePanels(){ } void LDesktop::UpdateDesktopPluginArea(){ - QRegion visReg( bgWindow->geometry() ); //visible region (not hidden behind a panel) + QRegion visReg( desktop->screenGeometry(desktopnumber) ); //visible region (not hidden behind a panel) QRect rawRect = visReg.boundingRect(); //initial value (screen size) //qDebug() << "Update Desktop Plugin Area:" << bgWindow->geometry(); for(int i=0; iscreenGeometry(desktopnumber).x() , rec.y()-desktop->screenGeometry(desktopnumber).y() ) ); //qDebug() << "DPlug Area:" << rec << bgDesktop->geometry() << LSession::handle()->desktop()->availableGeometry(bgDesktop); if(rec.size().isNull() || rec == bgDesktop->geometry()){return; } //nothing changed - bgDesktop->setGeometry( rec ); + bgDesktop->setGeometry(desktop->screenGeometry(desktopnumber)); + bgDesktop->setDesktopArea( rec ); bgDesktop->UpdateGeom(); //just in case the plugin space itself needs to do anything //Re-paint the panels (just in case a plugin was underneath it and the panel is transparent) - for(int i=0; iupdate(); } + //for(int i=0; iupdate(); } //Make sure to re-disable any WM control flags - LSession::handle()->XCB->SetDisableWMActions(bgWindow->winId()); + LSession::handle()->XCB->SetDisableWMActions(bgDesktop->winId()); } void LDesktop::UpdateBackground(){ //Get the current Background - if(bgupdating || bgWindow==0){ return; } //prevent multiple calls to this at the same time + if(bgupdating || bgDesktop==0){ return; } //prevent multiple calls to this at the same time bgupdating = true; if(DEBUG){ qDebug() << " - Update Desktop Background for screen:" << desktopnumber; } //Get the list of background(s) to show @@ -494,7 +498,7 @@ void LDesktop::UpdateBackground(){ //qDebug() << "BG List:" << bgL << oldBGL << CBG << bgtimer->isActive(); if(bgL==oldBGL && !CBG.isEmpty() && bgtimer->isActive()){ //No background change scheduled - just update the widget - bgWindow->update(); + bgDesktop->update(); bgupdating=false; return; } @@ -513,7 +517,9 @@ void LDesktop::UpdateBackground(){ if( (bgFile.toLower()=="default")){ bgFile = LOS::LuminaShare()+"desktop-background.jpg"; } //Now set this file as the current background QString format = settings->value(DPREFIX+"background/format","stretch").toString(); - bgWindow->setBackground(bgFile, format); + //bgWindow->setBackground(bgFile, format); + QPixmap backPix = LDesktopBackground::setBackground(bgFile, format, LSession::handle()->screenGeom(desktopnumber)); + bgDesktop->setBackground(backPix); //Now reset the timer for the next change (if appropriate) if(bgtimer->isActive()){ bgtimer->stop(); } if(bgL.length() > 1){ diff --git a/src-qt5/core/lumina-desktop/LDesktop.h b/src-qt5/core/lumina-desktop/LDesktop.h index 52505b12..c576a805 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.h +++ b/src-qt5/core/lumina-desktop/LDesktop.h @@ -68,7 +68,7 @@ private: QStringList oldBGL; QList PANELS; LDesktopPluginSpace *bgDesktop; //desktop plugin area - LDesktopBackground *bgWindow; //full screen background + //QWidget *bgWindow; //full screen background QMenu *deskMenu, *winMenu; QLabel *workspacelabel; QWidgetAction *wkspaceact; diff --git a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp index ed12bcf0..6b458c24 100644 --- a/src-qt5/core/lumina-desktop/LDesktopBackground.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopBackground.cpp @@ -10,27 +10,30 @@ #include #include +#include "LSession.h" + void LDesktopBackground::paintEvent(QPaintEvent *ev) { + //return; //do nothing - always invisible if (bgPixmap != NULL) { //qDebug() << "Wallpaper paint Event:" << ev->rect(); - QPainter painter(this); - painter.setBrush(*bgPixmap); - painter.drawRect(ev->rect().adjusted(-1,-1,2,2)); + //QPainter painter(this); + //painter.setBrush(*bgPixmap); + //painter.drawRect(ev->rect().adjusted(-1,-1,2,2)); }else{ QWidget::paintEvent(ev); } } -void LDesktopBackground::setBackground(const QString& bgFile, const QString& format) { - if (bgPixmap != NULL) delete bgPixmap; - bgPixmap = new QPixmap(size()); +QPixmap LDesktopBackground::setBackground(const QString& bgFile, const QString& format, QRect geom) { + //if (bgPixmap != NULL) delete bgPixmap; + QPixmap bgPixmap(geom.size());// = new QPixmap(size()); if (bgFile.startsWith("rgb(")) { QStringList colors = bgFile.section(")",0,0).section("(",1,1).split(","); QColor color = QColor(colors[0].toInt(), colors[1].toInt(), colors[2].toInt()); - bgPixmap->fill(color); + bgPixmap.fill(color); } else { - bgPixmap->fill(Qt::black); + bgPixmap.fill(Qt::black); // Load the background file and scale QPixmap bgImage(bgFile); @@ -43,7 +46,7 @@ void LDesktopBackground::setBackground(const QString& bgFile, const QString& for } else { mode = Qt::KeepAspectRatio; } - if(bgImage.height() != this->height() && bgImage.width() != this->width() ){ bgImage = bgImage.scaled(size(), mode); } + if(bgImage.height() != geom.height() && bgImage.width() != geom.width() ){ bgImage = bgImage.scaled(geom.size(), mode); } //bgImage = bgImage.scaled(size(), mode); } @@ -51,32 +54,35 @@ void LDesktopBackground::setBackground(const QString& bgFile, const QString& for int dx = 0, dy = 0; int drawWidth = bgImage.width(), drawHeight = bgImage.height(); if (format == "fit" || format == "center" || format == "full") { - dx = (width() - bgImage.width()) / 2; - dy = (height() - bgImage.height()) / 2; + dx = (geom.width() - bgImage.width()) / 2; + dy = (geom.height() - bgImage.height()) / 2; } else if (format == "tile") { - drawWidth = width(); - drawHeight = height(); + drawWidth = geom.width(); + drawHeight = geom.height(); } else { if (format.endsWith("right")) { - dx = width() - bgImage.width(); + dx = geom.width() - bgImage.width(); } if (format.startsWith("bottom")) { - dy = height() - bgImage.height(); + dy = geom.height() - bgImage.height(); } } // Draw the background image - QPainter painter(bgPixmap); + QPainter painter(&bgPixmap); painter.setBrush(bgImage); painter.setBrushOrigin(dx, dy); painter.drawRect(dx, dy, drawWidth, drawHeight); } - this->repaint(); //make sure the entire thing gets repainted right away - show(); + //this->repaint(); //make sure the entire thing gets repainted right away + //LSession::handle()->XCB->paintRoot(geom, &bgPixmap); + return bgPixmap; + //show(); } LDesktopBackground::LDesktopBackground() : QWidget() { bgPixmap = NULL; + this->setWindowOpacity(0); } LDesktopBackground::~LDesktopBackground() { diff --git a/src-qt5/core/lumina-desktop/LDesktopBackground.h b/src-qt5/core/lumina-desktop/LDesktopBackground.h index a9ce64fa..a2e46748 100644 --- a/src-qt5/core/lumina-desktop/LDesktopBackground.h +++ b/src-qt5/core/lumina-desktop/LDesktopBackground.h @@ -18,7 +18,7 @@ public: virtual ~LDesktopBackground(); virtual void paintEvent(QPaintEvent*); - void setBackground(const QString&, const QString&); + static QPixmap setBackground(const QString&, const QString&, QRect geom); private: QPixmap *bgPixmap; diff --git a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp index ff460125..592f3481 100644 --- a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp @@ -16,16 +16,20 @@ // =================== // PUBLIC // =================== -LDesktopPluginSpace::LDesktopPluginSpace(QWidget *parent) : QWidget(parent){ +LDesktopPluginSpace::LDesktopPluginSpace() : QWidget(){ this->setObjectName("LuminaDesktopPluginSpace"); + this->setAttribute(Qt::WA_TranslucentBackground); + //this->setAttribute(Qt::WA_NoSystemBackground); + this->setAutoFillBackground(false); this->setStyleSheet("QWidget#LuminaDesktopPluginSpace{ border: none; background: transparent; }"); + this->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); this->setAcceptDrops(true); this->setContextMenuPolicy(Qt::NoContextMenu); this->setMouseTracking(true); TopToBottom = true; GRIDSIZE = 100.0; //default value if not set plugsettings = LSession::handle()->DesktopPluginSettings(); - + //this->setWindowOpacity(0.0); } LDesktopPluginSpace::~LDesktopPluginSpace(){ @@ -38,6 +42,7 @@ void LDesktopPluginSpace::LoadItems(QStringList plugs, QStringList files){ if(plugs != plugins){ plugins = plugs; changes = true; } if(files != deskitems){ deskitems = files; changes = true; } if(changes){ QTimer::singleShot(0,this, SLOT(reloadPlugins())); } + this->show(); } void LDesktopPluginSpace::SetIconSize(int size){ @@ -61,11 +66,21 @@ void LDesktopPluginSpace::cleanup(){ deskitems.clear(); this->hide(); } + +void LDesktopPluginSpace::setBackground(QPixmap pix){ + wallpaper = pix; + this->repaint(); +} + +void LDesktopPluginSpace::setDesktopArea(QRect area){ + desktopRect = area; +} + // =================== // PUBLIC SLOTS // =================== void LDesktopPluginSpace::UpdateGeom(int oldgrid){ - if(DEBUG){ qDebug() << "Updated Desktop Geom:" << this->size() << GRIDSIZE << this->size()/GRIDSIZE; } + if(DEBUG){ qDebug() << "Updated Desktop Geom:" << desktopRect.size() << GRIDSIZE << desktopRect.size()/GRIDSIZE; } //Go through and check the locations/sizes of all items (particularly the ones on the bottom/right edges) //bool reload = false; for(int i=0; isetAttribute(Qt::WA_TranslucentBackground); plug->setWhatsThis(plugID); //Now get the geometry for the plugin QRect geom = plug->loadPluginGeometry(); //in pixel coords @@ -149,8 +165,8 @@ QRect LDesktopPluginSpace::findOpenSpot(int gridwidth, int gridheight, int start if(col<0){ col = 0; } //just in case - since this can be recursively called bool found = false; int rowCount, colCount; - rowCount = RoundUp(this->height()/GRIDSIZE); - colCount = RoundUp(this->width()/GRIDSIZE); + rowCount = RoundUp(desktopRect.height()/GRIDSIZE); + colCount = RoundUp(desktopRect.width()/GRIDSIZE); if( (row+gridheight)>rowCount){ row = rowCount-gridheight; startRow = row; } if( (col+gridwidth)>colCount){ col = colCount-gridwidth; startCol = col; } QRect geom(0, 0, gridwidth*GRIDSIZE, gridheight*GRIDSIZE); //origin point will be adjusted in a moment @@ -300,3 +316,17 @@ void LDesktopPluginSpace::reloadPlugins(bool ForceIconUpdate ){ addDesktopItem(items[i]); } } + + +//================= +// PROTECTED +//================= +void LDesktopPluginSpace::paintEvent(QPaintEvent*ev){ + if(!wallpaper.isNull()){ + QPainter painter(this); + painter.setBrush(wallpaper); + painter.drawRect(ev->rect().adjusted(-1,-1,2,2)); + }else{ + QWidget::paintEvent(ev); + } +} diff --git a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h index 44765029..12382db8 100644 --- a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h +++ b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h @@ -33,7 +33,7 @@ signals: void HideDesktopMenu(); public: - LDesktopPluginSpace(QWidget *parent = 0); + LDesktopPluginSpace(); ~LDesktopPluginSpace(); void LoadItems(QStringList plugs, QStringList files); @@ -42,6 +42,9 @@ public: void ArrangeTopToBottom(bool ttb); //if false, will arrange left->right void cleanup(); + void setBackground(QPixmap pix); //should already be sized appropriately for this widget + void setDesktopArea(QRect area); + public slots: void UpdateGeom(int oldgrid = -1); @@ -49,6 +52,8 @@ private: QSettings *plugsettings; QStringList plugins, deskitems; QList ITEMS; + QPixmap wallpaper; + QRect desktopRect; bool TopToBottom; float GRIDSIZE; @@ -88,7 +93,7 @@ private: //This function incorporates the bottom/right edge matchins procedures (for incomplete last grid) QRect geom(grid.x()*GRIDSIZE, grid.y()*GRIDSIZE, grid.width()*GRIDSIZE, grid.height()*GRIDSIZE); //Now check the edge conditions (last right/bottom grid points might be smaller than GRIDSIZE) - QSize areaSize = this->size(); //use the size of the area instead of the geometry - because we need this in child coordinates like "geom" above + QSize areaSize = desktopRect.size(); //use the size of the area instead of the geometry - because we need this in child coordinates like "geom" above //qDebug() << "GridToGeom:" << grid << geom << "Area size:" << areaSize; if(geom.right() > areaSize.width() && (geom.right()-areaSize.width())width()/GRIDSIZE) << RoundUp(this->height()/GRIDSIZE); //This just checks that the grid coordinates are not out of bounds - should still run ValidGeometry() below with the actual pixel geom if(grid.x()<0 || grid.y()<0 || grid.width()<0 || grid.height()<0){ return false; } - else if( (grid.x()+grid.width()) > RoundUp(this->width()/GRIDSIZE) ){ return false; } - else if( (grid.y()+grid.height()) > RoundUp(this->height()/GRIDSIZE) ){ return false; } + else if( (grid.x()+grid.width()) > RoundUp(desktopRect.width()/GRIDSIZE) ){ return false; } + else if( (grid.y()+grid.height()) > RoundUp(desktopRect.height()/GRIDSIZE) ){ return false; } return true; } bool ValidGeometry(QString id, QRect geom){ //First check that it is within the desktop area completely // Note that "this->geometry()" is not in the same coordinate space as the geometry inputs - if(!QRect(0,0,this->width(), this->height()).contains(geom)){ return false; } + if(!QRect(0,0,desktopRect.width(), desktopRect.height()).contains(geom)){ return false; } //Now check that it does not collide with any other items for(int i=0; iwhatsThis()==id){ continue; } @@ -183,9 +188,8 @@ private slots: } protected: - void paintEvent(QPaintEvent*){ - //do nothing here - the main plugin area should *always* be invisible - } + void paintEvent(QPaintEvent*ev); + //Need Drag and Drop functionality (internal movement) void dragEnterEvent(QDragEnterEvent *ev){ if(ev->mimeData()->hasFormat(MIMETYPE) ){ diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index 67cba7f4..933dc778 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -20,6 +20,7 @@ LPanel::LPanel(QSettings *file, int scr, int num, QWidget *parent) : QWidget(){ bgWindow = parent; //save for later //Setup the widget overlay for the entire panel to provide transparency effects panelArea = new QWidget(this); + //panelArea->setAttribute(Qt::WA_TranslucentBackground); QBoxLayout *tmp = new QBoxLayout(QBoxLayout::LeftToRight); tmp->setContentsMargins(0,0,0,0); this->setLayout(tmp); @@ -38,9 +39,12 @@ LPanel::LPanel(QSettings *file, int scr, int num, QWidget *parent) : QWidget(){ this->setContentsMargins(0,0,0,0); this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); //panels cannot get keyboard focus otherwise it upsets the task manager window detection - this->setAttribute(Qt::WA_X11DoNotAcceptFocus); + //this->setAttribute(Qt::WA_X11DoNotAcceptFocus); this->setAttribute(Qt::WA_X11NetWmWindowTypeDock); this->setAttribute(Qt::WA_AlwaysShowToolTips); + this->setAttribute(Qt::WA_TranslucentBackground); + //this->setAttribute(Qt::WA_NoSystemBackground); + this->setAutoFillBackground(false); this->setWindowFlags(Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); //this->setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint); @@ -59,8 +63,9 @@ LPanel::LPanel(QSettings *file, int scr, int num, QWidget *parent) : QWidget(){ LSession::handle()->XCB->SetAsSticky(this->winId()); if(hascompositer){ //qDebug() << "Enable Panel compositing"; - this->setWindowOpacity(0.0); //fully transparent background for the main widget - panelArea->setWindowOpacity(0.0); + //this->setStyleSheet("QWidget#LuminaPanelBackgroundWidget{ background: transparent; }"); + //this->setWindowOpacity(0.5); //fully transparent background for the main widget + //panelArea->setWindowOpacity(1.0); //fully opaque for the widget on top (apply stylesheet transparencies) } QTimer::singleShot(1,this, SLOT(UpdatePanel()) ); //start this in a new thread //connect(screen, SIGNAL(resized(int)), this, SLOT(UpdatePanel()) ); //in case the screen resolution changes @@ -330,7 +335,8 @@ void LPanel::paintEvent(QPaintEvent *event){ //qDebug() << " - Rec:" << rec << hidden << this->geometry() << bgWindow->geometry(); rec.moveTo( bgWindow->mapFromGlobal( this->mapToGlobal(rec.topLeft()) ) ); //(rec.x()-LSession::handle()->screenGeom(screennum).x(), rec.y()-LSession::handle()->screenGeom(screennum).y() ); //qDebug() << " - Adjusted Window Rec:" << rec; - painter->drawPixmap(event->rect().adjusted(-1,-1,2,2), bgWindow->grab(rec) ); + painter->drawPixmap(event->rect().adjusted(-1,-1,2,2), bgWindow->grab(rec)); + //painter->drawPixmap(event->rect().adjusted(-1,-1,2,2), QApplication::screens().at(screennum)->grabWindow(QX11Info::appRootWindow(), rec.x(), rec.y(), rec.width(), rec.height()) ); } QWidget::paintEvent(event); //now pass the event along to the normal painting event } @@ -342,7 +348,7 @@ void LPanel::enterEvent(QEvent *event){ this->move(showpoint); this->update(); } - this->activateWindow(); + //this->activateWindow(); event->accept(); //just to quiet the compile warning } @@ -355,5 +361,6 @@ void LPanel::leaveEvent(QEvent *event){ //qDebug() << "Mouse Point (local):" << pt.x() << pt.y(); qDebug() << "Contained:" << this->geometry().contains(pt);*/ checkPanelFocus(); - event->accept(); //just to quiet the compile warning + QWidget::leaveEvent(event); + //event->accept(); //just to quiet the compile warning } diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 9a985b3f..b2cdab13 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -427,11 +427,11 @@ void LSession::updateDesktops(){ } void LSession::registerDesktopWindows(){ - QList wins; + /*QList wins; for(int i=0; ibackgroundID(); } - XCB->RegisterVirtualRoots(wins); + XCB->RegisterVirtualRoots(wins);*/ } void LSession::adjustWindowGeom(WId win, bool maximize){ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp index 92b3c6ea..0a396464 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp @@ -132,6 +132,6 @@ void LStartButtonPlugin::closeMenu(){ void LStartButtonPlugin::shortcutActivated(){ if(LSession::handle()->registerStartButton(this->type())){ if(menu->isVisible()){ closeMenu(); } - else{ openMenu(); } + else{ this->activateWindow(); openMenu(); } } } diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 2647e58d..c689c9a3 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -25,7 +25,7 @@ void LSession::stopall(){ for(int i=0; istate()!=QProcess::NotRunning){ PROCS[i]->terminate(); } } - //QCoreApplication::exit(0); + QCoreApplication::exit(0); } void LSession::procFinished(){ -- cgit From f9959fd5e33717b9855388d40252bda10d2fe32a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 18 Oct 2016 10:55:50 -0400 Subject: Make sure the desktop are registered as virtual roots again. --- src-qt5/core/lumina-desktop/LSession.cpp | 4 ++-- 1 file changed, 2 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 b2cdab13..9a985b3f 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -427,11 +427,11 @@ void LSession::updateDesktops(){ } void LSession::registerDesktopWindows(){ - /*QList wins; + QList wins; for(int i=0; ibackgroundID(); } - XCB->RegisterVirtualRoots(wins);*/ + XCB->RegisterVirtualRoots(wins); } void LSession::adjustWindowGeom(WId win, bool maximize){ -- cgit From 6d6708ee7add7951fe598e0a35467fdd00ebc7a2 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 18 Oct 2016 13:57:47 -0400 Subject: Adjust the icon for the battery notifications a bit. 1) for the "low" battery icon, move it down to the 5-20% range instead of 20-50%. 2) When battery is between 0-5%, change the background color of the icon to red in addition to the "warning" battery icon. 3) Play an audio file when the battery drops to the 0-5% range( /low-battery.ogg), if the file exists. --- src-qt5/core/lumina-desktop/LSession.cpp | 1 + .../core/lumina-desktop/panel-plugins/battery/LBattery.cpp | 12 ++++++++++-- 2 files changed, 11 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 9a985b3f..4e0a8f59 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -578,6 +578,7 @@ void LSession::systemWindow(){ //Play System Audio void LSession::playAudioFile(QString filepath){ + if( !QFile::exists(filepath) ){ return; } //Setup the audio output systems for the desktop if(DEBUG){ qDebug() << "Play Audio File"; } if(mediaObj==0){ qDebug() << " - Initialize media player"; mediaObj = new QMediaPlayer(); } 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 dda32ecd..7b7f5deb 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp @@ -5,6 +5,7 @@ // See the LICENSE file for full details //=========================================== #include "LBattery.h" +#include "LSession.h" LBattery::LBattery(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal){ iconOld = -1; @@ -34,8 +35,8 @@ void LBattery::updateBattery(bool force){ int icon = -1; if (charge > 90) { icon = 4; } else if (charge > 70) { icon = 3; } - else if (charge > 50) { icon = 2; } - else if (charge > 30) { icon = 1; } + else if (charge > 20) { icon = 2; } + else if (charge > 5) { icon = 1; } else if (charge > 0 ) { icon = 0; } if(LOS::batteryIsCharging()){ icon = icon+10; } //icon = icon + result.at(0).toInt() * 10; @@ -75,7 +76,14 @@ void LBattery::updateBattery(bool force){ label->setPixmap( LXDG::findIcon("battery-missing", "").pixmap(label->size()) ); break; } + if(iconplayAudioFile(LOS::LuminaShare()+"low-battery.ogg"); + } + if(icon==0){ label->setStyleSheet("background: red;"); } + else{ label->setStyleSheet("background: transparent;"); } iconOld = icon; + } //Now update the display QString tt; -- cgit From 1ce69df5407f1552e3d78a67fbf0de39b8d3ea75 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 18 Oct 2016 14:53:20 -0400 Subject: Add a new audio file for a low-battery notification. Update the pkg-plist and license files for the sounds as needed. --- src-qt5/core/lumina-desktop/audiofiles/LICENCE | 8 +++++++- src-qt5/core/lumina-desktop/audiofiles/low-battery.ogg | Bin 0 -> 49748 bytes src-qt5/core/lumina-desktop/lumina-desktop.pro | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src-qt5/core/lumina-desktop/audiofiles/low-battery.ogg (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/audiofiles/LICENCE b/src-qt5/core/lumina-desktop/audiofiles/LICENCE index 898894f6..aa601d5e 100644 --- a/src-qt5/core/lumina-desktop/audiofiles/LICENCE +++ b/src-qt5/core/lumina-desktop/audiofiles/LICENCE @@ -1 +1,7 @@ -These audio files are BSD-licensed and were created/owned by the TrueOS Project +These audio files are BSD-licensed and were created/owned by the TrueOS Project: + - Login.ogg + - Logout.ogg + +These audio files are freely available on jewelbeat.com: +"Music by JewelBeat. Download your free music and free sound effects at www.jewelbeat.com." + - low-battery.ogg (http://www.jewelbeat.com/free/free-sound-effects/musical%20effects/Tympani_2.mp3 - converted to OGG afterward) diff --git a/src-qt5/core/lumina-desktop/audiofiles/low-battery.ogg b/src-qt5/core/lumina-desktop/audiofiles/low-battery.ogg new file mode 100644 index 00000000..d129a2b3 Binary files /dev/null and b/src-qt5/core/lumina-desktop/audiofiles/low-battery.ogg differ diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index bc1599c7..814725cc 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -84,7 +84,8 @@ wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE defaults.files = defaults/luminaDesktop.conf \ defaults/compton.conf \ audiofiles/Logout.ogg \ - audiofiles/Login.ogg + audiofiles/Login.ogg \ + audiofiles/low-battery.ogg defaults.path = $${L_SHAREDIR}/lumina-desktop/ conf.path = $${L_ETCDIR} -- cgit From 38732bb2411991b6cc9fc9369370119a32213820 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 19 Oct 2016 10:02:47 -0400 Subject: Fix up the stylesheet for the battery monitor. Don't change any properties other than the background color based on battery level. --- src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') 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 7b7f5deb..af081191 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp @@ -80,8 +80,8 @@ void LBattery::updateBattery(bool force){ //Play some audio warning chime when LSession::handle()->playAudioFile(LOS::LuminaShare()+"low-battery.ogg"); } - if(icon==0){ label->setStyleSheet("background: red;"); } - else{ label->setStyleSheet("background: transparent;"); } + if(icon==0){ label->setStyleSheet("QLabel{ background: red;}"); } + else{ label->setStyleSheet("QLabel{ background: transparent;}"); } iconOld = icon; } -- cgit From 9cb6e2099d9fc8781f0f7a960b67fd1eaa8a8a2d Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 20 Oct 2016 08:48:42 -0400 Subject: Quick update to ensure that 2 monitors are not cloned - only show one of them in that case. --- src-qt5/core/lumina-desktop/LSession.cpp | 7 +++++-- 1 file changed, 5 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 4e0a8f59..8c8562d4 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -391,8 +391,9 @@ void LSession::updateDesktops(){ //First clean up any current desktops QList dnums; //keep track of which screens are already managed + QList geoms; for(int i=0; iScreen() >= sC) { + if (DESKTOPS[i]->Screen() >= sC || geoms.contains(DW->screenGeometry(DESKTOPS[i]->Screen())) ) { //qDebug() << " - Close desktop:" << i; qDebug() << " - Close desktop on screen:" << DESKTOPS[i]->Screen(); DESKTOPS[i]->prepareToClose(); @@ -404,15 +405,17 @@ void LSession::updateDesktops(){ DESKTOPS[i]->UpdateGeometry(); DESKTOPS[i]->show(); dnums << DESKTOPS[i]->Screen(); + geoms << DW->screenGeometry(DESKTOPS[i]->Screen()); } } //Now add any new desktops for(int i=0; iscreenGeometry(i)) ){ //Start the desktop on this screen qDebug() << " - Start desktop on screen:" << i; DESKTOPS << new LDesktop(i); + geoms << DW->screenGeometry(i); } } -- cgit From e13f1779779b05626a71e8a1ca70a844658f6938 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 20 Oct 2016 08:58:31 -0400 Subject: Make sure all the translation files are synced to the sources. --- .../core/lumina-desktop/i18n/lumina-desktop_af.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ar.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_az.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_bg.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_bn.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_bs.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ca.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_cs.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_cy.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_da.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_de.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_el.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_en_GB.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_en_ZA.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_es.ts | 529 ++++++++++---------- .../core/lumina-desktop/i18n/lumina-desktop_et.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_eu.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_fa.ts | 165 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_fi.ts | 163 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_fr.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_fr_CA.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_gl.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_he.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_hi.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_hr.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_hu.ts | 529 ++++++++++---------- .../core/lumina-desktop/i18n/lumina-desktop_id.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_is.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_it.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ja.ts | 535 +++++++++++---------- .../core/lumina-desktop/i18n/lumina-desktop_ka.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ko.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_lt.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_lv.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_mk.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_mn.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ms.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_mt.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_nb.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_nl.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_pa.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_pl.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_pt.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_pt_BR.ts | 529 ++++++++++---------- .../core/lumina-desktop/i18n/lumina-desktop_ro.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ru.ts | 163 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_sk.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_sl.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_sr.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_sv.ts | 529 ++++++++++---------- .../core/lumina-desktop/i18n/lumina-desktop_sw.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_ta.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_tg.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_th.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_tr.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_uk.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_uz.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_vi.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_zh_CN.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_zh_HK.ts | 161 ++++--- .../lumina-desktop/i18n/lumina-desktop_zh_TW.ts | 161 ++++--- .../core/lumina-desktop/i18n/lumina-desktop_zu.ts | 161 ++++--- src-qt5/core/lumina-info/i18n/lumina-info_el.ts | 46 +- src-qt5/core/lumina-info/i18n/lumina-info_ru.ts | 2 +- src-qt5/core/lumina-open/i18n/lumina-open_af.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ar.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_az.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_bg.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_bn.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_bs.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ca.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_cs.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_cy.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_da.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_de.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_el.ts | 88 ++-- src-qt5/core/lumina-open/i18n/lumina-open_en_GB.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_en_ZA.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_es.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_et.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_eu.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_fa.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_fi.ts | 14 +- src-qt5/core/lumina-open/i18n/lumina-open_fr.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_fr_CA.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_gl.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_he.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_hi.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_hr.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_hu.ts | 88 ++-- src-qt5/core/lumina-open/i18n/lumina-open_id.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_is.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_it.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ja.ts | 90 ++-- src-qt5/core/lumina-open/i18n/lumina-open_ka.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ko.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_lt.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_lv.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_mk.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_mn.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ms.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_mt.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_nb.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_nl.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_pa.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_pl.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_pt.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_pt_BR.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ro.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ru.ts | 88 ++-- src-qt5/core/lumina-open/i18n/lumina-open_sk.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_sl.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_sr.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_sv.ts | 88 ++-- src-qt5/core/lumina-open/i18n/lumina-open_sw.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_ta.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_tg.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_th.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_tr.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_uk.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_uz.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_vi.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_zh_HK.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_zh_TW.ts | 12 +- src-qt5/core/lumina-open/i18n/lumina-open_zu.ts | 12 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ca.ts | 16 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_el.ts | 16 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts | 4 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts | 4 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ja.ts | 16 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts | 16 +- .../core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts | 16 +- 133 files changed, 6705 insertions(+), 6395 deletions(-) (limited to 'src-qt5/core') 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_af.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ar.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_az.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 aad31552..ff22fb4b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bg.ts @@ -9,22 +9,22 @@ Кликнете за да присвоите програма - + Launch %1 Стартиране на %1 - + Open %1 Отваряне на %1 - + Select Application Избор на програма - + Name: Име: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Кликнете за задаване - + Select Application Избор на програма - + Name: Име: @@ -56,82 +56,82 @@ Работен плот - + Manage Applications Управление на програми - + Control Panel Контролен панел - + Multimedia Мултимедия - + Development Разработка - + Education Образование - + Games Игри - + Graphics Изображения - + Network Мрежа - + Office Офис - + Science Наука - + Settings Настройки - + System Системни - + Utility Инструменти - + Wine Wine - + Unsorted Несортирани - + Applications Програми @@ -240,27 +240,27 @@ Връщане назад - + Pin to Desktop Заковаване на работния плот - + Remove from Favorites Премахване от предпочитани - + Add to Favorites Добавяне в предпочитани - + Remove from Quicklaunch Премахване от бързо стартиране - + Add to Quicklaunch Добавяне към бързо стартиране @@ -286,87 +286,87 @@ Програми - + Browse Files Разглеждане на файлове - + Install Applications Инсталиране на програми - + Control Panel Контролен панел - + Multimedia Мултимедия - + Development Разработка - + Education Образование - + Games Игри - + Graphics Изображения - + Network Мрежа - + Office Офис - + Science Наука - + Settings Настройки - + System Система - + Utility Инструменти - + Wine Wine - + Unsorted Несортирани - + Leave Напускане @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (зарежда се) - + %1 % (%2 Remaining) %1 % (%2 оставащи) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Започване на преместване на елемент - + Start Resizing Item Започване на преоразмеряване на елемент - + Increase Item Sizes Увеличаване на размерите на елемент - + Decrease Item Sizes Намаляване на размерите на елемент - + Remove Item Премахване на елемент @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Предпочитани програми - + Favorite Folders Предпочитани папки - + Audio Аудио - + Video Видео - + Pictures Снимки - + Other Files Други файлове - + Documents Документи - + Favorite Files Предпочитани файлове @@ -471,32 +476,32 @@ LDesktop - + Window List Списък на прозорците - + Lumina Desktop Графична среда Lumina - + Workspace %1 Работен плот %1 - + Terminal Терминал - + Browse Files Разглеждане на файлове - + Leave Напускане @@ -964,12 +969,12 @@ Екран - + Control Panel Контролен панел - + About Lumina Относно Lumina @@ -1057,34 +1062,34 @@ Назад - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (външно захранване) - + %1% (%2 Estimated) %1% (приблизително %2) - + %1% Remaining остават %1% - - - + + + Workspace %1/%2 Работен плот %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Връщане назад 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bn.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_bs.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 dc0a64fc..463b8b93 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ca.ts @@ -9,22 +9,22 @@ Cliqueu per assignar-hi una aplicació - + Launch %1 Llança %1 - + Open %1 Obre %1 - + Select Application Seleccioneu l'aplicació - + Name: Nom: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Cliqueu per establir-ho - + Select Application Seleccioneu l'aplicació - + Name: Nom: @@ -56,82 +56,82 @@ Escriptori - + Manage Applications Gestiona les aplicacions - + Control Panel Tauler de control - + Multimedia Multimèdia - + Development Desenvolupament - + Education Educació - + Games Jocs - + Graphics Gràfics - + Network Xarxa - + Office Oficina - + Science Ciència - + Settings Configuració - + System Sistema - + Utility Utilitat - + Wine Wine - + Unsorted Sense ordenar - + Applications Aplicacions @@ -240,27 +240,27 @@ Vés enrere - + Pin to Desktop Enganxa a l'escriptori - + Remove from Favorites Suprimeix dels preferits - + Add to Favorites Afegeix als preferits - + Remove from Quicklaunch Elimina del llançador ràpid - + Add to Quicklaunch Afegeix al llançador ràpid @@ -286,87 +286,87 @@ Aplicacions - + Browse Files Navega pels fitxers - + Install Applications Instal·la aplicacions - + Control Panel Tauler de control - + Multimedia Multimèdia - + Development Desenvolupament - + Education Educació - + Games Jocs - + Graphics Gràfics - + Network Xarxa - + Office Oficina - + Science Ciència - + Settings Configuració - + System Sistema - + Utility Utilitat - + Wine Wine - + Unsorted Sense classificar - + Leave Surt @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Carregant) - + %1 % (%2 Remaining) %1 % (resten %2) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Inicia el trasllat de l'ítem - + Start Resizing Item Inicia el canvi de mida de l'ítem - + Increase Item Sizes Augmenta la mida dels ítems - + Decrease Item Sizes Redueix la mida dels ítems - + Remove Item Elimina l'ítem @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Aplicacions preferides - + Favorite Folders Carpetes preferides - + Audio Àudio - + Video Vídeo - + Pictures Imatges - + Other Files Altres fitxers - + Documents Documents - + Favorite Files Fitxers preferits @@ -471,32 +476,32 @@ LDesktop - + Window List Llista de finestres - + Lumina Desktop Escriptori Lumina - + Workspace %1 Espai de treball %1 - + Terminal Terminal - + Browse Files Navega pels fitxers - + Leave Surt @@ -964,12 +969,12 @@ Pantalla - + Control Panel Tauler de control - + About Lumina Quant a Lumina @@ -1057,34 +1062,34 @@ 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? - + %1% (Plugged In) %1% (connectat) - + %1% (%2 Estimated) %1% (%2 estimat) - + %1% Remaining Resta %1% - - - + + + Workspace %1/%2 Espai de treball %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Vés enrere 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 a31e8477..eed620b8 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cs.ts @@ -9,22 +9,22 @@ Klepnutím vyberte aplikaci - + Launch %1 Spustit %1 - + Open %1 Otevřít %1 - + Select Application Vybrat aplikaci - + Name: Jméno: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klepnutím nastavit - + Select Application Vybrat aplikaci - + Name: Název: @@ -56,82 +56,82 @@ Plocha - + Manage Applications Spravovat aplikace - + Control Panel Ovládací panel - + Multimedia Multimédia - + Development Vývoj - + Education Výuka - + Games Hry - + Graphics Grafika - + Network Síť - + Office Kancelář - + Science Věda - + Settings Nastavení - + System Systém - + Utility Nástroje - + Wine Wine - + Unsorted Nezařazeno - + Applications Aplikace @@ -240,27 +240,27 @@ Zpět - + Pin to Desktop Přidat na plochu - + Remove from Favorites Odebrat z oblíbených - + Add to Favorites Přidat do oblíbených - + Remove from Quicklaunch Odebrat z rychlého spuštění - + Add to Quicklaunch Přidat do rychlého spuštění @@ -286,87 +286,87 @@ Aplikace - + Browse Files Procházet soubory - + Install Applications Instalovat aplikace - + Control Panel Ovládací panel - + Multimedia Multimédia - + Development Vývoj - + Education Výuka - + Games Hry - + Graphics Grafika - + Network Síť - + Office Kancelář - + Science Věda - + Settings Nastavení - + System Systém - + Utility Nástroje - + Wine Wine - + Unsorted Neseřazeno - + Leave Opustit @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Nabíjení) - + %1 % (%2 Remaining) %1 % (%2 Zbývá) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Začít přesun položky - + Start Resizing Item Začít změnu velikosti položky - + Increase Item Sizes Zvětšit velikost položky - + Decrease Item Sizes Zmenšit velikost položky - + Remove Item Odebrat položku @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Oblíbené aplikace - + Favorite Folders Oblíbené složky - + Audio Zvuk - + Video Video - + Pictures Obrázky - + Other Files Ostatní soubory - + Documents Dokumenty - + Favorite Files Oblíbené soubory @@ -471,32 +476,32 @@ LDesktop - + Window List Seznam oken - + Lumina Desktop Prostředí Lumina - + Workspace %1 Pracovní plocha %1 - + Terminal Terminál - + Browse Files Procházet soubory - + Leave Opustit @@ -964,12 +969,12 @@ Zobrazení - + Control Panel Ovládací panel - + About Lumina O prostředí Lumina @@ -1057,34 +1062,34 @@ Zpět - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (zapojeno) - + %1% (%2 Estimated) %1% (odhadováno %2) - + %1% Remaining %1% zbývá - - - + + + Workspace %1/%2 Pracovní plocha %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Zpět 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_cy.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 b55d4354..bbe5a9ad 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -9,22 +9,22 @@ Klik for at tildele en applikation - + Launch %1 Start %1 - + Open %1 Åbn %1 - + Select Application Vælg program - + Name: Navn: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klik for at vælge - + Select Application Vælg program - + Name: Navn: @@ -56,82 +56,82 @@ Skrivebord - + Manage Applications Håndtér Programmer - + Control Panel Kontrolpanel - + Multimedia Multimedie - + Development Udvikling - + Education Uddannelse - + Games Spil - + Graphics Grafik - + Network Netværk - + Office Kontor - + Science Videnskab - + Settings Indstillinger - + System System - + Utility Hjælpeværktøj - + Wine Wine - + Unsorted Usorteret - + Applications Programmer @@ -240,27 +240,27 @@ Tilbage - + Pin to Desktop Sæt fast på skrivebordet - + Remove from Favorites Fjern fra favoritter - + Add to Favorites Føj til favoritter - + Remove from Quicklaunch Fjern fra Kvikbar - + Add to Quicklaunch Tilføj til Kvikbar @@ -286,87 +286,87 @@ Programmer - + Browse Files Gennemse filer - + Install Applications Installér programmer - + Control Panel Kontrolpanel - + Multimedia Multimedie - + Development Udvikling - + Education Uddannelse - + Games Spil - + Graphics Grafik - + Network Netværk - + Office Kontor - + Science Videnskab - + Settings Indstillinger - + System System - + Utility Hjælpeværktøj - + Wine Wine - + Unsorted Usorteret - + Leave Forlad @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Oplader) - + %1 % (%2 Remaining) %1 % (%2 Tilbage) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Flyt Element - + Start Resizing Item Ændr størrelse på element - + Increase Item Sizes Forøg element størrelse - + Decrease Item Sizes Formindsk element størrelse - + Remove Item Fjern element @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Farvoritprogrammer - + Favorite Folders Favoritmapper - + Audio Lyd - + Video Video - + Pictures Billeder - + Other Files Andre filer - + Documents Dokumenter - + Favorite Files Favoritfiler @@ -471,32 +476,32 @@ LDesktop - + Window List Vinduesliste - + Lumina Desktop Lumina Skrivebord - + Workspace %1 Arbejdsområde %1 - + Terminal Terminal - + Browse Files Gennemse filer - + Leave Forlad @@ -964,12 +969,12 @@ Fremvis - + Control Panel Kontrolpanel - + About Lumina Om Lumina @@ -1057,34 +1062,34 @@ Tilbage - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Indsat) - + %1% (%2 Estimated) %1% (%2 Estimeret) - + %1% Remaining %1% Tilbage - - - + + + Workspace %1/%2 Arbejdsområde %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Tilbage 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 5ae7df4e..b4cc7656 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_de.ts @@ -9,22 +9,22 @@ Klicke um Programm zuzuweisen - + Launch %1 Starte %1 - + Open %1 Öffne %1 - + Select Application Anwendung auswählen - + Name: Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klicken zum Bestimmen - + Select Application Anwendung auswählen - + Name: Name: @@ -56,82 +56,82 @@ Arbeitsfläche - + Manage Applications Anwendungen verwalten - + Control Panel Kontrollleiste - + Multimedia Multimedia - + Development Entwicklung - + Education Bildung - + Games Spiele - + Graphics Grafik - + Network Netzwerk - + Office Büro - + Science Wissenschaft - + Settings Einstellungen - + System System - + Utility Dienstprogramm - + Wine Wine - + Unsorted Unsortiert - + Applications Anwendungen @@ -240,27 +240,27 @@ Gehe zurück - + Pin to Desktop Zur Arbeitsfläche hinzufügen - + Remove from Favorites Aus den Favoriten entfernen - + Add to Favorites Zu den Favoriten hinzufügen - + Remove from Quicklaunch von QuickLaunch entfernen - + Add to Quicklaunch Füge zu QuickLaunch hinzu @@ -286,87 +286,87 @@ Anwendungen - + Browse Files Dateien durchsuchen - + Install Applications Anwendungen installieren - + Control Panel Einstellungen - + Multimedia Multimedia - + Development Entwicklung - + Education Bildung - + Games Spiele - + Graphics Grafik - + Network Netzwerk - + Office Büro - + Science Wissenschaft - + Settings Einstellungen - + System System - + Utility Dienstprogramm - + Wine Wine - + Unsorted Unsortiert - + Leave Verlassen @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Aufladen) - + %1 % (%2 Remaining) %1 % (%2 verbleibend) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Bewege Element - + Start Resizing Item Größe des Elements ändern - + Increase Item Sizes Element vergrößern - + Decrease Item Sizes Element verkleinern - + Remove Item Element entfernen @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Bevorzugte Anwendungen - + Favorite Folders Bevorzugte Verzeichnisse - + Audio Audio - + Video Video - + Pictures Bilder - + Other Files Andere Dateien - + Documents Dokumente - + Favorite Files Bevorzugte Dateien @@ -471,32 +476,32 @@ LDesktop - + Window List Fensterliste - + Lumina Desktop Lumina-Arbeitsplatz - + Workspace %1 Arbeitsfläche %1 - + Terminal Terminal - + Browse Files Dateien durchsuchen - + Leave Verlassen @@ -964,12 +969,12 @@ Anzeige - + Control Panel Kontrollleiste - + About Lumina Über Lumina @@ -1057,34 +1062,34 @@ 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? - + %1% (Plugged In) %1% (Eingesteckt) - + %1% (%2 Estimated) %1% (%2 Geschätzt) - + %1% Remaining %1% verbleibend - - - + + + Workspace %1/%2 Arbeitsbereich %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Gehe zurück 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 64efc786..da7404cc 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_el.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application Επιλογή εφαρμογής - + Name: Όνομα: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application Επιλογή εφαρμογής - + Name: Όνομα: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 849a5143..94294c27 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 @@ -9,22 +9,22 @@ Click to assign an application - + Launch %1 Launch %1 - + Open %1 Open %1 - + Select Application Select Application - + Name: Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Click to Set - + Select Application Select Application - + Name: Name: @@ -56,82 +56,82 @@ 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 @@ -240,27 +240,27 @@ 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 @@ -286,87 +286,87 @@ 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 @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Charging) - + %1 % (%2 Remaining) %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch 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 @@ -428,42 +433,42 @@ 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 @@ -471,32 +476,32 @@ LDesktop - + Window List Window List - + Lumina Desktop Lumina Desktop - + Workspace %1 Workspace %1 - + Terminal Terminal - + Browse Files Browse Files - + Leave Leave @@ -964,12 +969,12 @@ Display - + Control Panel Control Panel - + About Lumina About Lumina @@ -1057,34 +1062,34 @@ 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 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Go Back 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 30601151..1ac34c18 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 @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 429d0983..d66a9458 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_es.ts @@ -1,30 +1,30 @@ - + AppLaunchButtonPlugin - + Click to assign an application Presione para asignar una aplicación - + Launch %1 Lanzar %1 - + Open %1 Abrir %1 - + Select Application Seleccionar Aplicación - + Name: Nombre: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Presione para Aplicar - + Select Application Seleccionar Aplicación - + Name: Nombre: @@ -51,87 +51,87 @@ AppMenu - + Desktop Escritorio - + Manage Applications Administrar Aplicaciones - + Control Panel Panel de Control - + Multimedia Multimedia - + Development Desarrollo - + Education Educación - + Games Juegos - + Graphics Gráficos - + Network Red - + Office Oficina - + Science Ciencia - + Settings Configuración - + System Sistema - + Utility Utilerías - + Wine Wine - + Unsorted Sin Ordenar - + Applications Aplicaciones @@ -139,57 +139,57 @@ BootSplash - + Form Formulario - + Initializing Session … Iniciando Sesión … - + Loading System Settings … Cargando Configuración del Sistema… - + Loading User Preferences … Cargando Preferencias de Usuario … - + Preparing System Tray … Preparando Bandeja del Sistema ... - + Starting Window Manager … Iniciando Gestor de Ventanas ... - + Detecting Applications … Detectando Aplicaciones ... - + Preparing Menus … Preparando Menus ... - + Preparing Workspace … Preparando Area de Trabajo ... - + Finalizing … Finalizando ... - + Starting App: %1 Iniciando Aplicación: %1 @@ -197,37 +197,37 @@ DesktopViewPlugin - + Open Abrir - + Cut Cortar - + Copy Copiar - + Increase Icons Agrandar Íconos - + Decrease Icons Reducir Íconos - + Delete Borrar - + Properties Propiedades @@ -235,32 +235,32 @@ ItemWidget - + Go Back Atrás - + Pin to Desktop Añadir al Escritorio - + Remove from Favorites Eliminar de los Favoritos - + Add to Favorites Añadir a los Favoritos - + Remove from Quicklaunch Eliminar de Quicklaunch - + Add to Quicklaunch Añadir a Quicklaunch @@ -268,7 +268,7 @@ JsonMenu - + Error parsing script output: %1 Error procesando salida del script: %1 @@ -276,97 +276,97 @@ LAppMenuPlugin - + Quickly launch applications or open files Lanzar aplicaciones o abrir archivos rápidamente - + Applications Aplicaciones - + Browse Files Explorar Archivos - + Install Applications Instalar Aplicaciones - + Control Panel Panel de Control - + Multimedia Multimedia - + Development Desarrollo - + Education Educación - + Games Juegos - + Graphics Gráficos - + Network Red - + Office Oficina - + Science Ciencia - + Settings Configuración - + System Sistema - + Utility Utilerías - + Wine Wine - + Unsorted Sin Ordenar - + Leave Salir @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Cargando) - + %1 % (%2 Remaining) %1 % (%2 Restante) @@ -387,12 +387,12 @@ LClock - + Time Zone (%1) Zona Horaria (%1) - + Use System Time Usar Hora del Sistema @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Comenzar a Mover Elemento - + Start Resizing Item Comenzar a Dimensionar Elemento - + Increase Item Sizes Aumentar Tamaño de Elementos - + Decrease Item Sizes Disminuir Tamaño de Elementos - + Remove Item Eliminar Elemento @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Aplicaciones Favoritas - + Favorite Folders Directorios Favoritos - + Audio Sonido - + Video Video - + Pictures Imágenes - + Other Files Otros Archivos - + Documents Documentos - + Favorite Files Archivos Favoritos @@ -471,32 +476,32 @@ LDesktop - + Window List Lista de Ventanas - + Lumina Desktop Escritorio Lumina - + Workspace %1 Área de trabajo %1 - + Terminal Terminal - + Browse Files Explorar Archivos - + Leave Salir @@ -504,8 +509,8 @@ LDesktopSwitcher - - + + Workspace %1 Área de Trabajo %1 @@ -513,7 +518,7 @@ LQuickLaunchButton - + Remove from Quicklaunch Eliminar de Quicklaunch @@ -521,8 +526,8 @@ LSession - - + + Desktop Escritorio @@ -530,7 +535,7 @@ LSysDashboard - + System Dashboard Tablero del Sistema @@ -538,54 +543,54 @@ LSysMenuQuick - + Form Formulario - + System Volume Volumen del Sistema - + Launch Audio Mixer Abrir Mezclador de Audio - + Screen Brightness Brillo de la Pantalla - + Battery Status Estado de la Batería - + Workspace Área de Trabajo - + Locale Región - + Log Out Cerrar Sesión - + connected conectado - - - + + + %1 of %2 %1 de %2 @@ -593,42 +598,42 @@ LTaskButton - + Activate Window Activar Ventana - + Minimize Window Minimizar Ventana - + Restore Window Restaurar Ventana - + Maximize Window Maximizar Ventana - + Close Window Cerrar Ventana - + Show All Windows Mostrar Todas Las Ventanas - + Minimize All Windows Minimizar Todas las Ventanas - + Close All Windows Cerrar Todas las Ventanas @@ -636,7 +641,7 @@ LUserButtonPlugin - + Quickly launch applications or open files Lanzar aplicaciones o abrir archivos rápidamente @@ -644,32 +649,32 @@ MonitorWidget - + Form Formulario - + Summary Resumen - + CPU Temp: Temperatura de CPU: - + CPU Usage: Uso del CPU: - + Mem Usage: Uso de la Memoria: - + Disk I/O E/S de Disco @@ -677,52 +682,52 @@ NotePadPlugin - + Note Files (*.note) Archivos de Notas (*.note) - + Text Files (*) Archivos de Texto (*) - + Open a note file Abrir un archivo de notas - + Name: Nombre: - + Invalid Note Name: Try Again Nombre de Nota Inválido: Intente Nuevamente - + Select a Note Name Seleccione el Nombre de la Nota - + Open Text File Abrir Archivo de Texto - + Create a Note Crear una Nota - + Rename Note Renombrar Nota - + Delete Note Eliminar Nota @@ -730,57 +735,57 @@ PlayerWidget - + Form Fomulario - + Clear Playlist Limpiar Lista de Reproducción - + Shuffle Playlist Lista de Reproducción Aleatoria - + Add Files Añadir Archivos - + Add Directory Añadir Directorio - + Add URL Añadir URL - + Multimedia Files Archivos Multimedia - + Select Multimedia Files Seleccionar Archivos Multimedia - + Select Multimedia Directory Seleccionar Directorio Multimedia - + Enter a valid URL for a multimedia file or stream: Ingrese una URL válida de un archivo multimedia o transmisión: - + Multimedia URL URL Multimedia @@ -788,155 +793,155 @@ RSSFeedPlugin - + Form Formulario - + View Options Ver Opciones - + Open Website Abrir Sitio Web - + More Más - - - + + + Back to Feeds Regresar al Feed - + Feed Information Información del Feed - + Remove Feed Eliminar Feed - + New Feed Subscription Nueva Suscripción al Feed - + RSS URL URL del RSS - + Load a preset RSS Feed Cargar un Feed RSS predeterminado - + Add to Feeds Añadir a los Feeds - + Feed Reader Settings Configuración del Lector de Feeds - + Manual Sync Only Solo Sincronización Manual - + Some RSS feeds may request custom update intervals instead of using this setting Algunos feeds RSS pueden requerir intervalos de actualización personalizados en vez de usar esta configuración - + Default Sync Interval Intervalo de Sincronización Predeterminado - - + + Hour(s) Hora(s) - + Minutes Minutos - + Save Settings Guardar Configuración - + Add RSS Feed Añadir Feed RSS - + View Feed Details Ver los Detalles del Feed - + Settings Configuración - + Update Feeds Now Actualizar Feeds Ahora - + Lumina Desktop RSS RSS del Escritorio Lumina - + Feed URL: %1 URL del Feed: %1 - + Title: %1 Título: %1 - + Description: %1 Descripción: %1 - + Website: %1 Sitio Web: %1 - + Last Build Date: %1 Última Actualización: %1 - + Last Sync: %1 Última Sincronización: %1 - + Next Sync: %1 Siguiente Sincronización: %1 @@ -944,32 +949,32 @@ SettingsMenu - + Screensaver Protector de Pantalla - + Desktop Escritorio - + Preferences Preferencias - + Display Pantalla - + Control Panel Panel de Control - + About Lumina Acerca de Lumina @@ -977,114 +982,114 @@ StartMenu - + Form Formulario - + Type to search Escribir para buscar - + Browse Files Explorar Archivos - + Browse Applications Buscar Aplicaciones - + Control Panel Panel de Control - + Leave Salir - + Manage Applications Administrar Aplicaciones - + Show Categories Mostrar Categorías - + Configure Desktop Configurar el Escritorio - + Sign Out User Cerrar Sesión - + Restart System Reiniciar Sistema - + Preferences Preferencias - + Power Off System Apagar Sistema - + (System Performing Updates) (Sistema Aplicando Actualizaciones) - + Suspend System Suspender el Sistema - + Back 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? - + %1% (Plugged In) %1% (Conectado) - + %1% (%2 Estimated) %1% (%2 Estimado) - + %1% Remaining %1% Restante - - - + + + Workspace %1/%2 Área de Trabajo %1/%2 @@ -1092,47 +1097,47 @@ SystemWindow - + System Options Opciones del Sistema - + Log Out Cerrar Sesión - + Restart Reiniciar - + Shutdown Apagar - + Cancel Cancelar - + Lock Bloquear - + Suspend Suspender - + 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! ¿Quisieras instalarlas ahora? @@ -1140,22 +1145,22 @@ UserItemWidget - + Go Back Retroceder - + Remove Shortcut Eliminar Acceso Directo - + Delete File Borrar Archivo - + Create Shortcut Crear Acceso Directo @@ -1163,180 +1168,180 @@ UserWidget - + UserWidget WidgetDeUsuario - - + + Favorites Favoritos - + Favorite Applications Aplicaciones Favoritas - - + + Applications Aplicaciones - + Favorite Directories Directorios Favoritos - + Places Lugares - + Favorite FIles Archivos Favoritos - + Files Archivos - + Apps Aplicaciones - - + + Home Inicio - + Home Directory Directorio Personal - + Search this Directory Buscar en el Directorio - + Go back to home directory Regresar al Directorio Personal - + Open Directory Abrir Directorio - + Config Configuración - + Desktop Preferences Preferencias de Escritorio - + Control Panel Panel de Control - + Desktop Appearance/Plugins Apariencia de Escritorio/Plugins - + Screen Configuration Configuración de Pantalla - + Screensaver Settings Configuración del Protector de Pantalla - + About the Lumina Desktop Acerca del Escritorio Lumina - + All Todo - + Multimedia Multimedia - + Development Desarrollo - + Education Educación - + Games Juegos - + Graphics Gráficos - + Network Red - + Office Oficina - + Science Ciencia - + Settings Configuración - + System Sistema - + Utilities Utilerías - + Wine Wine - + Unsorted Sin Ordenar 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 a189a7b9..eda7bc20 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_et.ts @@ -9,22 +9,22 @@ Vajuta, et määrata rakendus - + Launch %1 Käivita %1 - + Open %1 Ava %1 - + Select Application Vali rakendus - + Name: Nimi: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klõpsa määramiseks - + Select Application Vali rakendus - + Name: Nimi: @@ -56,82 +56,82 @@ Töölaud - + Manage Applications - + Control Panel Juhtpaneel - + Multimedia Multimeedia - + Development Arendus - + Education Haridus - + Games Mängud - + Graphics Graafika - + Network Võrk - + Office Kontor - + Science Teadus - + Settings Sätted - + System Süsteem - + Utility Tööriistad - + Wine Wine - + Unsorted Sortimata - + Applications Rakendused @@ -240,27 +240,27 @@ Mine tagasi - + Pin to Desktop Kinnita töölauale - + Remove from Favorites Eemalda lemmikutest - + Add to Favorites Lisa lemmikutesse - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ Rakendused - + Browse Files - + Install Applications Paigalda rakendusi - + Control Panel Juhtpaneel - + Multimedia Multimeedia - + Development Arendus - + Education Haridus - + Games Mängud - + Graphics Graafika - + Network Võrk - + Office Kontor - + Science Teadus - + Settings Sätted - + System Süsteem - + Utility Tööriistad - + Wine Wine - + Unsorted Sortimata - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1% (laeb) - + %1 % (%2 Remaining) %1% (%2 jäänud) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Lemmikrakendused - + Favorite Folders Lemmikkaustad - + Audio Heli - + Video Video - + Pictures Pildid - + Other Files Muud failid - + Documents Dokumendid - + Favorite Files Lemmikfailid @@ -471,32 +476,32 @@ LDesktop - + Window List Akende loend - + Lumina Desktop Lumina töölaud - + Workspace %1 Tööruum %1 - + Terminal Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel Juhtpaneel - + About Lumina Lumina teave @@ -1057,34 +1062,34 @@ Tagasi - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Tööruum %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Mine tagasi 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 52da44b2..14954a7b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_eu.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application Aplikazioa hautatu - + Name: Izena: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application Aplikazioa hautatu - + Name: Izena: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel Kontrol-panela - + Multimedia Multimedia - + Development Garapena - + Education Heziketa - + Games Jokoak - + Graphics Grafikoak - + Network Sarea - + Office Bulegoa - + Science Zientzia - + Settings Ezarpenak - + System Sistema - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ Atzera joan - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications Aplikazioak instalatu - + Control Panel Kontrol-panela - + Multimedia Multimedia - + Development Garapena - + Education Heziketa - + Games Jokoak - + Graphics Grafikoak - + Network Sarea - + Office Bulegoa - + Science Zientzia - + Settings Ezarpenak - + System Sistema - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Kargatzen) - + %1 % (%2 Remaining) %1 % (%2 Faltan) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Gogoko aplikazioak - + Favorite Folders - + Audio Audioa - + Video - + Pictures - + Other Files Beste fitxategiak - + Documents - + Favorite Files Gogoko fitxategiak @@ -471,32 +476,32 @@ LDesktop - + Window List Leihoen zerrenda - + Lumina Desktop Lumina Mahaigaina - + Workspace %1 %1 laneko area - + Terminal Terminala - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel Kontrol-panela - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Laneko area %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Atzera joan 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 48083653..adfdef45 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts @@ -1,4 +1,4 @@ - + @@ -9,22 +9,22 @@ تْلیک کنید تا یک کاربست بگمارید - + Launch %1 %1 را راه بیانداز - + Open %1 %1 را باز کن - + Select Application کاربست برگزین - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + کاربست برگزین - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 0c60a7cb..07e6d582 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts @@ -1,4 +1,4 @@ - + @@ -9,22 +9,22 @@ Aseta sovellus napsauttamalla - + Launch %1 Käynnistä %1 - + Open %1 Avaa %1 - + Select Application Valitse sovellus - + Name: Nimi: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Aseta napsauttamalla - + Select Application Valitse sovellus - + Name: Nimi: @@ -56,82 +56,82 @@ Työpöytä - + Manage Applications Sovellusten hallinta - + Control Panel Ohjauskeskus - + Multimedia Multimedia - + Development Kehitystyökalut - + Education Kasvatus - + Games Pelit - + Graphics Grafiikka - + Network Verkko - + Office Toimisto - + Science Tiede - + Settings Asetukset - + System Järjestelmä - + Utility Työkalu - + Wine Wine - + Unsorted Lajittelematta - + Applications Sovellukset @@ -240,27 +240,27 @@ Palaa - + Pin to Desktop Kiinnitä työpöydälle - + Remove from Favorites Poista suosikeista - + Add to Favorites Lisää suosikkeihin - + Remove from Quicklaunch Poista pikakäynnistimestä - + Add to Quicklaunch Lisää pikakäynnistimeen @@ -286,87 +286,87 @@ Sovellukset - + Browse Files Selaa tiedostoja - + Install Applications Asenna sovelluksia - + Control Panel Ohjauskeskus - + Multimedia Multimedia - + Development Kehitystyökalut - + Education Kasvatus - + Games Pelit - + Graphics Grafiikka - + Network Verkko - + Office Toimisto - + Science Tiede - + Settings Asetukset - + System Järjestelmä - + Utility Työkalu - + Wine Wine - + Unsorted Lajittelematta - + Leave Poistu @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (lataa) - + %1 % (%2 Remaining) %1 % (%2 jäljellä) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Aloita tietueen siirto - + Start Resizing Item Ala muuttaa kohteen kokoa - + Increase Item Sizes Suurennan kohteiden kokoa - + Decrease Item Sizes Pienennä kohteiden kokoa - + Remove Item Poista kohde @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Suosikkisovellukset - + Favorite Folders Suosikkikansiot - + Audio Ääni - + Video Video - + Pictures Kuvat - + Other Files Muita tiedostoja - + Documents Asiakirjat - + Favorite Files Suosikkitiedostot @@ -471,32 +476,32 @@ LDesktop - + Window List Ikkunaluettelo - + Lumina Desktop Lumina-työpöytä - + Workspace %1 Työtila %1 - + Terminal Pääte - + Browse Files Selaa tiedostoja - + Leave Poistu @@ -964,12 +969,12 @@ Näkymä - + Control Panel Ohjauskeskus - + About Lumina Tietoa Luminasta @@ -1057,34 +1062,34 @@ 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? - + %1% (Plugged In) %1 % (verkkovirta) - + %1% (%2 Estimated) %1 % (arviolta %2) - + %1% Remaining %1 % jäljellä - - - + + + Workspace %1/%2 Työtila %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Palaa 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 23ad5cfc..39246b2a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fr.ts @@ -9,22 +9,22 @@ Cliquez pour affecter une application - + Launch %1 Lancer %1 - + Open %1 Ouvrir %1 - + Select Application Sélectionner une application - + Name: Nom : @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Cliquer pour définir - + Select Application Sélectionner une application - + Name: Nom : @@ -56,82 +56,82 @@ Bureau - + Manage Applications Gérer les Applications - + Control Panel Panneau de contrôle - + Multimedia Multimédia - + Development Développement - + Education Éducation - + Games Jeux - + Graphics Graphiques - + Network Réseau - + Office Bureautique - + Science Sciences - + Settings Paramètres - + System Système - + Utility Utilitaires - + Wine Wine - + Unsorted Non trié - + Applications Applications @@ -240,27 +240,27 @@ Retour - + Pin to Desktop Epingler au Bureau - + Remove from Favorites Retirer des favoris - + Add to Favorites Ajouter aux favoris - + Remove from Quicklaunch Retirer du Lancement rapide - + Add to Quicklaunch Ajouter au Lancement rapide @@ -286,87 +286,87 @@ Applications - + Browse Files Explorer des fichiers - + Install Applications Installer les applications - + Control Panel Panneau de contrôle - + Multimedia Multimédia - + Development Développement - + Education Éducation - + Games Jeux - + Graphics Graphiques - + Network Réseau - + Office Bureau - + Science Sciences - + Settings Paramètres - + System Système - + Utility Utilitaire - + Wine Wine - + Unsorted Non trié - + Leave Quitter @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Chargement) - + %1 % (%2 Remaining) %1 % (%2 Restant) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Début de déplacement d'objet - + Start Resizing Item Début de redimensionnement d'objet - + Increase Item Sizes Augmenter la taille des objets - + Decrease Item Sizes Diminuer la taille d'objet - + Remove Item Suppression l'objet @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Applications favorites - + Favorite Folders Dossiers favoris - + Audio Audio - + Video Vidéo - + Pictures Images - + Other Files Autres fichiers - + Documents Documents - + Favorite Files Fichiers favoris @@ -471,32 +476,32 @@ LDesktop - + Window List Liste des fenêtres - + Lumina Desktop Bureau Lumina - + Workspace %1 Espace de travail %1 - + Terminal Terminal - + Browse Files Explorer les fichiers - + Leave Quitter @@ -964,12 +969,12 @@ Affichage - + Control Panel Panneau de contrôle - + About Lumina À propos de Lumina @@ -1057,34 +1062,34 @@ Retour - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Greffon chargé) - + %1% (%2 Estimated) %1% (%2 Estimé) - + %1% Remaining %1% restant(s) - - - + + + Workspace %1/%2 Espace de travail %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Retour 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 30601151..1ac34c18 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 @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_gl.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 82263661..7f05725e 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_he.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ שולחן עבודה - + Manage Applications - + Control Panel לוח בקרה - + Multimedia - + Development - + Education לומדות - + Games משחקים - + Graphics גרפיקה - + Network אינטרנט - + Office משרד - + Science מדע - + Settings הגדרות - + System מערכת - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ חזור - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel לוח בקרה - + Multimedia - + Development - + Education לומדות - + Games משחקים - + Graphics גרפיקה - + Network אינטרנט - + Office משרד - + Science מדע - + Settings הגדרות - + System מערכת - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ תצוגה - + Control Panel לוח בקרה - + About Lumina אודות Lumina @@ -1057,34 +1062,34 @@ אחורה - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back חזור 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 19026c2f..39eaf169 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hi.ts @@ -9,22 +9,22 @@ एप्लीकेशन निर्धारित करने के लिए क्लिक करें - + Launch %1 प्रारंभ %1 - + Open %1 चालू %1 - + Select Application एप्लीकेशन चुनें - + Name: नाम @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set निश्चित करने के लिए क्लिक करे - + Select Application एप्लीकेशन चुनें - + Name: नाम @@ -56,82 +56,82 @@ डेस्कटॉप - + Manage Applications एप्लीकेशन प्रबंधन - + Control Panel कंट्रोल पैनल - + Multimedia मल्टीमीडिया - + Development विकास - + Education पढाई - + Games खेल - + Graphics चित्र - + Network नेटवर्क - + Office कार्यालय - + Science विज्ञान - + Settings सेटिंग - + System उपकरण - + Utility सुविधाएँ - + Wine शराब - + Unsorted अवर्गीकृत - + Applications एप्लीकेशन्स @@ -240,27 +240,27 @@ वापस जाएँ - + Pin to Desktop डेस्कटॉप पर स्थापित करें - + Remove from Favorites पसंदीदा सूचि से हटायें - + Add to Favorites पसंदीदा सूचि में जोड़ें - + Remove from Quicklaunch क्विकलांच से हटायें - + Add to Quicklaunch क्विकलांच में जोड़ें @@ -286,87 +286,87 @@ एप्लीकेशन्स - + Browse Files फाइल ढूंढे - + Install Applications एप्लीकेशन इनस्टॉल करें - + Control Panel कण्ट्रोल पैनल - + Multimedia मल्टीमीडिया - + Development विकास - + Education पढाई - + Games खेल - + Graphics चित्र - + Network नेटवर्क - + Office कार्यालय - + Science विज्ञान - + Settings सेटिंग - + System सिस्टम - + Utility सुविधाएँ - + Wine शराब - + Unsorted अवर्गीकृत - + Leave छोड़ें @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 %(चार्ज हो रहा है) - + %1 % (%2 Remaining) %1 %(%2 बचा है) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item वस्तु को हटाना शुरू करें - + Start Resizing Item वस्तु को पुनः आकार दें - + Increase Item Sizes वस्तु का आकार बढाएं - + Decrease Item Sizes वस्तु का आकार घटाएँ - + Remove Item वस्तु को हटायें @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications पसंदीदा एप्लीकेशन - + Favorite Folders पसंदीदा फ़ोल्डर्स - + Audio ऑडियो - + Video वीडियो - + Pictures तस्वीरें - + Other Files अन्य फाइलें - + Documents दस्तावेज - + Favorite Files पसंदीदा फाइलें @@ -471,32 +476,32 @@ LDesktop - + Window List विंडो सूचि - + Lumina Desktop लुमिना का डेस्कटॉप - + Workspace %1 कार्यस्थल %1 - + Terminal टर्मिनल - + Browse Files फाइल खोजें - + Leave छोड़ें @@ -964,12 +969,12 @@ प्रदर्शन - + Control Panel कण्ट्रोल पैनल - + About Lumina लूमिया के विषय में @@ -1057,34 +1062,34 @@ वापस - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1%(प्लग इन) - + %1% (%2 Estimated) %1% (%2 लगभग) - + %1% Remaining %1% शेष - - - + + + Workspace %1/%2 कार्यस्थल %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back वापस जाएँ 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hr.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 efb2f20a..f5b68a73 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_hu.ts @@ -1,30 +1,30 @@ - + AppLaunchButtonPlugin - + Click to assign an application Kattintson egy művelet hozzárendeléséhez - + Launch %1 %1 indítása - + Open %1 %1 megnyitása - + Select Application Alkalmazás kiválasztása - + Name: Név: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Kattintás a beállításhoz - + Select Application Alkalmazás kiválasztása - + Name: Név: @@ -51,87 +51,87 @@ AppMenu - + Desktop Asztal - + Manage Applications Alkalmazások kezelése - + Control Panel Vezérlőpult - + Multimedia Multimédia - + Development Fejlesztés - + Education Oktatás - + Games Játékok - + Graphics Grafika - + Network Hálózat - + Office Iroda - + Science Tudomány - + Settings Beállítások - + System Rendszer - + Utility Segédeszközök - + Wine Wine - + Unsorted Rendezés nélkül - + Applications Alkalmazások @@ -139,57 +139,57 @@ BootSplash - + Form Űrlap - + Initializing Session … Munkamenet indítása ... - + Loading System Settings … Rendszerbeállítások betöltése … - + Loading User Preferences … Felhasználói beállítások betöltése ... - + Preparing System Tray … Rendszertálca előkészítése ... - + Starting Window Manager … Ablakkezelő indítása ... - + Detecting Applications … Alkalmazások keresése ... - + Preparing Menus … Menük előkészítése ... - + Preparing Workspace … Munkaterület előkészítése ... - + Finalizing … Befejezés ... - + Starting App: %1 Alkalmazás indítása: %1 @@ -197,37 +197,37 @@ DesktopViewPlugin - + Open Megnyitás - + Cut Kivágás - + Copy Másolás - + Increase Icons Ikonok növelése - + Decrease Icons Ikonok csökkentése - + Delete Törlés - + Properties Tulajdonságok @@ -235,32 +235,32 @@ ItemWidget - + Go Back Ugrás vissza - + Pin to Desktop Rögzítés az asztalra - + Remove from Favorites Eltávolítás a Kedvencek közül - + Add to Favorites Hozzáadás a Kedvencekhez - + Remove from Quicklaunch Eltávolítás a gyorsindítóból - + Add to Quicklaunch Hozzáadás a gyorsindítóhoz @@ -268,7 +268,7 @@ JsonMenu - + Error parsing script output: %1 Hiba a script feldolgozásában: %1 @@ -276,97 +276,97 @@ LAppMenuPlugin - + Quickly launch applications or open files Alkalmazások gyors indítása vagy fájlok megnyitása - + Applications Alkalmazások - + Browse Files Fájlok tallózása - + Install Applications Alkalmazások telepítése - + Control Panel Vezérlőpult - + Multimedia Multimédia - + Development Fejlesztés - + Education Oktatás - + Games Játékok - + Graphics Grafika - + Network Hálózat - + Office Iroda - + Science Tudomány - + Settings Beállítások - + System Rendszer - + Utility Segédeszközök - + Wine Wine - + Unsorted Nem rendezett - + Leave Kijelentkezés @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Töltés) - + %1 % (%2 Remaining) %1 % (%2 hátralévő) @@ -387,12 +387,12 @@ LClock - + Time Zone (%1) Időzóna (%1) - + Use System Time Rendszeridő használata @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Elem mozgatásának indítása - + Start Resizing Item Elem átméretezésének indítása - + Increase Item Sizes Elemméretek növelése - + Decrease Item Sizes Elemméretek csökkentése - + Remove Item Elem eltávolítása @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Kedvenc alkalmazások - + Favorite Folders Kedvenc mappák - + Audio Audió - + Video Videó - + Pictures Képek - + Other Files Egyéb fájlok - + Documents Dokumentumok - + Favorite Files Kedvenc fájlok @@ -471,32 +476,32 @@ LDesktop - + Window List Ablaklista - + Lumina Desktop Lumina Desktop - + Workspace %1 %1 munkaterület - + Terminal Terminál - + Browse Files Fájlok tallózása - + Leave Kilépés @@ -504,8 +509,8 @@ LDesktopSwitcher - - + + Workspace %1 %1 munkaterület @@ -513,7 +518,7 @@ LQuickLaunchButton - + Remove from Quicklaunch Eltávolítás a gyorsindítóból @@ -521,8 +526,8 @@ LSession - - + + Desktop Asztal @@ -530,7 +535,7 @@ LSysDashboard - + System Dashboard Rendszeráttekintés @@ -538,54 +543,54 @@ LSysMenuQuick - + Form Űrlap - + System Volume Rendszer hangereje - + Launch Audio Mixer Hangkeverő indítása - + Screen Brightness Képernyő világosság - + Battery Status Akkumulátor állapota - + Workspace Munkaterület - + Locale Területi beállítás - + Log Out Kijelentkezés - + connected kapcsolódva - - - + + + %1 of %2 %1 / %2 (összes) @@ -593,42 +598,42 @@ LTaskButton - + Activate Window Ablak aktiválása - + Minimize Window Ablak minimalizálása - + Restore Window Ablak visszaállítása - + Maximize Window Ablak maximalizálása - + Close Window Ablak bezárása - + Show All Windows Ablakok megjelenítése - + Minimize All Windows Ablakok minimalizálása - + Close All Windows Ablakok bezárása @@ -636,7 +641,7 @@ LUserButtonPlugin - + Quickly launch applications or open files Alkalmazások gyors indítása vagy fájlok megnyitása @@ -644,32 +649,32 @@ MonitorWidget - + Form Űrlap - + Summary Összegzés - + CPU Temp: CPU hőmérséklete: - + CPU Usage: CPU használat: - + Mem Usage: Memória használat: - + Disk I/O Lemez i/O @@ -677,52 +682,52 @@ NotePadPlugin - + Note Files (*.note) Jegyzetfájlok (*.note) - + Text Files (*) Szövegfájlok (*) - + Open a note file Jegyzet fájl megnyitása - + Name: Név: - + Invalid Note Name: Try Again Érvénytelen jegyzet név - + Select a Note Name Jegyzet nevének kiválasztása - + Open Text File Szövegfájl megnyitása - + Create a Note Jegyzet létrehozása - + Rename Note Jegyzet átnevezése - + Delete Note Jegyzet törlése @@ -730,57 +735,57 @@ PlayerWidget - + Form Űrlap - + Clear Playlist Lejátszólista törlése - + Shuffle Playlist Lejátszólista keverése - + Add Files Fájlok hozzáadása - + Add Directory Könyvtár hozzáadása - + Add URL URL hozzáadása - + Multimedia Files Multimédia fájlok - + Select Multimedia Files Multimédia fájlok kiválasztása - + Select Multimedia Directory Multimédia könyvtár kiválasztása - + Enter a valid URL for a multimedia file or stream: - + Multimedia URL Multimédia URL @@ -788,155 +793,155 @@ RSSFeedPlugin - + Form Űrlap - + View Options - + Open Website Weboldal megnyitása - + More - - - + + + Back to Feeds Vissza a hírforrásokhoz - + Feed Information Hírforrás információ - + Remove Feed Hírcsatorna eltávolítása - + New Feed Subscription Feliratkozás hírforrásra - + RSS URL RSS URL - + Load a preset RSS Feed - + Add to Feeds Hozzáadás a hírforrásokhoz - + Feed Reader Settings - + Manual Sync Only Csak kézi frissítés - + Some RSS feeds may request custom update intervals instead of using this setting - + Default Sync Interval Alapértelmezett frissítési időköz - - + + Hour(s) óra - + Minutes perc - + Save Settings Beállítások mentése - + Add RSS Feed RSS hírforrás hozzáadása - + View Feed Details Hírforrás részleteinek megjelenítése - + Settings Beállítások - + Update Feeds Now Hírforrások frissítése most - + Lumina Desktop RSS Lumina Desktop RSS - + Feed URL: %1 Hírcsatorna URL: %1 - + Title: %1 Cím: %1 - + Description: %1 Leírás: %1 - + Website: %1 Weboldal: %1 - + Last Build Date: %1 - + Last Sync: %1 - + Next Sync: %1 Következő frissítés: %1 @@ -944,32 +949,32 @@ SettingsMenu - + Screensaver Képernyővédő - + Desktop Asztali környezet - + Preferences Beállítások - + Display Kijelző - + Control Panel Vezérlőpult - + About Lumina A Lumina névjegye @@ -977,114 +982,114 @@ StartMenu - + Form Űrlap - + Type to search Gépeljen a kereséshez - + Browse Files Fájlok tallózása - + Browse Applications Alkalmazások böngészése - + Control Panel Vezérlőpult - + Leave Kilépés - + Manage Applications Alkalmazások kezelése - + Show Categories Kategóriák megjelenítése - + Configure Desktop Asztal beállítása - + Sign Out User Felhasználó kijelentkezése - + Restart System Rendszer újraindítása - + Preferences Beállítások - + Power Off System Rendszer kikapcsolása - + (System Performing Updates) - + Suspend System Rendszer felfüggesztése - + Back Vissza - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 %1/%2 munkaterület @@ -1092,47 +1097,47 @@ SystemWindow - + System Options Rendszer opciók - + Log Out Kijelentkezés - + Restart Újraindítás - + Shutdown Leállítás - + Cancel Mégsem - + Lock Zárolás - + Suspend Felfüggesztés - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? @@ -1140,22 +1145,22 @@ UserItemWidget - + Go Back Vissza - + Remove Shortcut Közvetlen hivatkozás eltávolítása - + Delete File Fájl törlése - + Create Shortcut Közvetlen hivatkozás létrehozása @@ -1163,180 +1168,180 @@ UserWidget - + UserWidget - - + + Favorites Kedvencek - + Favorite Applications Kedvenc alkalmazások - - + + Applications Alkalmazások - + Favorite Directories Kedvenc könyvtárak/mappák - + Places Helyek - + Favorite FIles Kedvenc fájlok - + Files Fájlok - + Apps Alkalmazások - - + + Home Saját könyvtár - + Home Directory Saját könyvtár - + Search this Directory Keresés ebben a könyvtárban - + Go back to home directory Vissza a saját könyvtárra - + Open Directory Könyvtár megnyitása - + Config Beállítás - + Desktop Preferences Asztal beállításai - + Control Panel Vezérlőpult - + Desktop Appearance/Plugins Asztal megjelenése / pluginek - + Screen Configuration Képernyő beállítása - + Screensaver Settings Képernyővédő beállításai - + About the Lumina Desktop A Lumina Desktop névjegye - + All Mind - + Multimedia Multimédia - + Development Fejlesztés - + Education Oktatás - + Games Játékok - + Graphics Grafika - + Network Hálózat - + Office Iroda - + Science Tudomány - + Settings Beállítások - + System Rendszer - + Utilities Segédprogramok - + Wine Wine - + Unsorted Nem rendszerezett 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 db47146f..00551bd9 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_id.ts @@ -9,22 +9,22 @@ tetapkan sebuah aplikasi - + Launch %1 Luncurkan %1 - + Open %1 Buka %1 - + Select Application Pilih Aplikasi - + Name: Nama: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set klik untuk mengatur - + Select Application Pilih Aplikasi - + Name: Nama: @@ -56,82 +56,82 @@ Layar Kerja Utama - + Manage Applications Aplikasi Atur - + Control Panel Panel Kendali - + Multimedia Multimedia - + Development Pengembangan - + Education Edukasi - + Games Permainan - + Graphics Grafis - + Network Jaringan - + Office Kantor - + Science Sains - + Settings Pengaturan - + System Sistem - + Utility Utilitas - + Wine Wine - + Unsorted Tak terurut - + Applications Aplikasi @@ -240,27 +240,27 @@ Mundur - + Pin to Desktop Tambah ke Desktop - + Remove from Favorites Hapus dari Favorit - + Add to Favorites Tambah ke Favorit - + Remove from Quicklaunch Hapus dari Quicklaunch - + Add to Quicklaunch Tambah ke Quicklaunch @@ -286,87 +286,87 @@ Aplikasi - + Browse Files Rambah Berkas - + Install Applications Memasang aplikasi - + Control Panel Panel Kontrol - + Multimedia Multimedia - + Development Pengembangan - + Education Edukasi - + Games Permainan - + Graphics Grafis - + Network Jaringan - + Office Kantor - + Science Sains - + Settings Pengaturan - + System Sistem - + Utility Utilitas - + Wine Wine - + Unsorted Tak terurut - + Leave Tinggalkan @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (pengisian baterai) - + %1 % (%2 Remaining) %1 % (%2 sisa) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Mulai Pindah Item - + Start Resizing Item Mulai Mengubah ukuran Item - + Increase Item Sizes Perbesar Ukuran Item - + Decrease Item Sizes Perkecil Ukuran Item - + Remove Item Hapus Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Aplikasi Favorit - + Favorite Folders Folder favorit - + Audio Audio - + Video Video - + Pictures Gambar - + Other Files Berkas Lain - + Documents Dokumen - + Favorite Files Berkas Favorit @@ -471,32 +476,32 @@ LDesktop - + Window List Daftar Jendela - + Lumina Desktop Lumina Desktop - + Workspace %1 Ruang kerja %1 - + Terminal Terminal - + Browse Files Rambah Berkas - + Leave Tinggalkan @@ -964,12 +969,12 @@ Tampilan - + Control Panel Panel Kendali - + About Lumina Tentang Lumina @@ -1057,34 +1062,34 @@ Mundur - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Terpasang Dalam) - + %1% (%2 Estimated) %1% (%2 Perkiraan) - + %1% Remaining %1% Sisa - - - + + + Workspace %1/%2 Ruang kerja %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Mundur 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_is.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 ade9895e..5879055b 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_it.ts @@ -9,22 +9,22 @@ Clicca per assegnare un'applicazione - + Launch %1 Lancia %1 - + Open %1 Apri %1 - + Select Application Seleziona Applicazione - + Name: Nome: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Clicca per Impostare - + Select Application Seleziona Applicazione - + Name: Nome: @@ -56,82 +56,82 @@ Desktop - + Manage Applications Gestisci le Applicazioni - + Control Panel Pannello di Controllo - + Multimedia Multimedia - + Development Sviluppo - + Education Educazione - + Games Giochi - + Graphics Grafici - + Network Rete - + Office Ufficio - + Science Scienza - + Settings Impostazioni - + System Sistema - + Utility Utilità - + Wine Wine - + Unsorted Non ordinato - + Applications Applicazioni @@ -240,27 +240,27 @@ Va Indietro - + Pin to Desktop Appendi a Desktop - + Remove from Favorites Rimuovi dai Preferiti - + Add to Favorites Aggiungi a Preferiti - + Remove from Quicklaunch Rimuovi da Quicklaunch - + Add to Quicklaunch Aggiungi a Quicklaunch @@ -286,87 +286,87 @@ Applicazioni - + Browse Files Sfoglia File - + Install Applications Installa Applicazioni - + Control Panel Pannello di Controllo - + Multimedia Multimedia - + Development Sviluppo - + Education Educazione - + Games Giochi - + Graphics Grafici - + Network Rete - + Office Ufficio - + Science Scienza - + Settings Impostazioni - + System Sistema - + Utility Utilità - + Wine Wine - + Unsorted Non ordinato - + Leave Esci @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (In Carica) - + %1 % (%2 Remaining) %1 % (%2 Rimanente) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Inizia a Muovere Elemento - + Start Resizing Item Inizia Ridimensionamento Elemento - + Increase Item Sizes Aumenta Dimensioni Elemento - + Decrease Item Sizes Ridici Dimensioni Elemento - + Remove Item Rimuovi elemento @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Applicazioni Preferite - + Favorite Folders Cartelle Preferite - + Audio Suono - + Video Video - + Pictures Immagini - + Other Files Altri File - + Documents Documenti - + Favorite Files File Preferiti @@ -471,32 +476,32 @@ LDesktop - + Window List Lista delle Finestre - + Lumina Desktop Desktop Lumina - + Workspace %1 Spazio Lavoro %1 - + Terminal Terminale - + Browse Files Sfoglia File - + Leave Esci @@ -964,12 +969,12 @@ Schermo - + Control Panel Pannello di Controllo - + About Lumina Riguardo a Lumina @@ -1057,34 +1062,34 @@ Indietro - + Apply Updates? - + 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 Stimato) - + %1% Remaining %1% Rimanente - - - + + + Workspace %1/%2 Spazio Lavoro %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Va Indietro 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 256e6be4..f832ba03 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ja.ts @@ -1,32 +1,32 @@ - + AppLaunchButtonPlugin - + Click to assign an application ツールチップ クリックしてアプリケーションを指定します - + Launch %1 %1 を起動 - + Open %1 %1 を開く - + Select Application ダイアログのタイトル アプリケーションを選択してください - + Name: 名前: @@ -34,19 +34,19 @@ AppLauncherPlugin - - + + Click to Set テキスト表示欄のツールチップ。アプリケーション名が設定されると置き換えられる。 クリックして設定してください - + Select Application アプリケーションを選択してください - + Name: 名前: @@ -54,87 +54,87 @@ AppMenu - + Desktop デスクトップ - + Manage Applications アプリケーションの管理 - + Control Panel コントロールパネル - + Multimedia マルチメディア - + Development 開発 - + Education 教育 - + Games ゲーム - + Graphics グラフィックス - + Network ネットワーク - + Office オフィス - + Science 科学 - + Settings 設定 - + System システム - + Utility ユーティリティー - + Wine Wine - + Unsorted 未分類 - + Applications アプリケーション @@ -142,57 +142,57 @@ BootSplash - + Form フォーム - + Initializing Session … セッションを初期化しています... - + Loading System Settings … システム設定をロードしています... - + Loading User Preferences … ユーザー設定をロードしています... - + Preparing System Tray … システムトレイを準備しています... - + Starting Window Manager … ウィンドウマネージャーを起動しています... - + Detecting Applications … アプリケーションを検出しています... - + Preparing Menus … メニューの準備をしています... - + Preparing Workspace … ワークスペースの準備をしています... - + Finalizing … 仕上げ処理を実行しています... - + Starting App: %1 スプラッシュ画面のテキスト アプリケーションを起動しています: %1 @@ -201,37 +201,37 @@ DesktopViewPlugin - + Open 開く - + Cut 切り取り - + Copy コピー - + Increase Icons アイコンの拡大 - + Decrease Icons アイコンの縮小 - + Delete 削除 - + Properties プロパティ @@ -239,32 +239,32 @@ ItemWidget - + Go Back 前に戻る - + Pin to Desktop デスクトップに付ける - + Remove from Favorites お気に入りから削除 - + Add to Favorites お気に入りに追加 - + Remove from Quicklaunch クイック起動から削除 - + Add to Quicklaunch クイック起動に追加 @@ -272,7 +272,7 @@ JsonMenu - + Error parsing script output: %1 スクリプト出力の解析に失敗しました: %1 @@ -280,97 +280,97 @@ LAppMenuPlugin - + Quickly launch applications or open files アプリケーションの起動やファイルの読み込みを素早く行います - + Applications アプリケーション - + Browse Files ファイルを探索 - + Install Applications アプリケーションをインストールします - + Control Panel コントロールパネル - + Multimedia マルチメディア - + Development 開発 - + Education 教育 - + Games ゲーム - + Graphics グラフィックス - + Network ネットワーク - + Office オフィス - + Science 科学 - + Settings 設定 - + System システム - + Utility ユーティリティー - + Wine Wine - + Unsorted 未分類 - + Leave 終了 @@ -378,12 +378,12 @@ LBattery - + %1 % (Charging) %1 % (充電中) - + %1 % (%2 Remaining) %1 % (残り %2 %) @@ -391,12 +391,12 @@ LClock - + Time Zone (%1) タイムゾーン (%1) - + Use System Time システムの時刻を使用する @@ -404,28 +404,33 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - "transform-move" アイコンを使用する操作 + "transform-move" アイコンを使用する操作 アイテムの移動を開始 - + Start Resizing Item アイテムのサイズを変更 - + Increase Item Sizes アイテムを大きくする - + Decrease Item Sizes アイテムを小さくする - + Remove Item アイテムを削除する @@ -433,42 +438,42 @@ LDeskBarPlugin - + Favorite Applications お気に入りのアプリケーション - + Favorite Folders お気に入りフォルダー - + Audio オーディオ - + Video ビデオ - + Pictures 画像 - + Other Files その他のファイル - + Documents 文書 - + Favorite Files お気に入りのフォルダ @@ -476,32 +481,32 @@ LDesktop - + Window List ウィンドウの一覧 - + Lumina Desktop Lumina デスクトップ - + Workspace %1 ワークスペース %1 - + Terminal 端末 - + Browse Files ファイルを探索 - + Leave 終了 @@ -509,8 +514,8 @@ LDesktopSwitcher - - + + Workspace %1 ワークスペース %1 @@ -518,7 +523,7 @@ LQuickLaunchButton - + Remove from Quicklaunch クイック起動から削除 @@ -526,8 +531,8 @@ LSession - - + + Desktop これ、ファイルパスなので、「デスクトップ」と訳したらまずい Desktop @@ -536,7 +541,7 @@ LSysDashboard - + System Dashboard システムダッシュボード @@ -544,54 +549,54 @@ LSysMenuQuick - + Form フォーム - + System Volume システムのボリューム - + Launch Audio Mixer オーディオミキサーを起動します - + Screen Brightness 画面の明るさ - + Battery Status バッテリーの状態 - + Workspace ワークスペース - + Locale ロケール - + Log Out ログアウト - + connected 接続済み - - - + + + %1 of %2 さっきのコメントは間違い %1 / %2 @@ -600,42 +605,42 @@ LTaskButton - + Activate Window ウィンドウをアクティブ化します - + Minimize Window ウィンドウを最小化します - + Restore Window ウィンドウを元のサイズに戻す - + Maximize Window ウィンドウを最大化します - + Close Window ウィンドウを閉じます - + Show All Windows すべてのウインドウを開く - + Minimize All Windows すべてのウインドウを最小化 - + Close All Windows すべてのウィンドウを閉じる @@ -643,7 +648,7 @@ LUserButtonPlugin - + Quickly launch applications or open files アプリケーションの起動やファイルの読み込みを素早く行います @@ -651,33 +656,33 @@ MonitorWidget - + Form 表示されない画面タイトル フォーム - + Summary 概要 - + CPU Temp: CPU 温度: - + CPU Usage: CPU 使用率: - + Mem Usage: メモリー使用率: - + Disk I/O ディスク I/O @@ -685,54 +690,54 @@ NotePadPlugin - + Note Files (*.note) メモファイル (*.note) - + Text Files (*) テキストファイル (*) - + Open a note file メモファイルを開く - + Name: 名前: - + Invalid Note Name: Try Again ウインドウのタイトル メモの名前が不完全: 再変更 - + Select a Note Name メモの名前を指定 - + Open Text File テキストファイルを開く - + Create a Note メニュー項目 新しいメモを作成 - + Rename Note メモの名前を変更 - + Delete Note メモを削除 @@ -740,58 +745,58 @@ PlayerWidget - + Form 表示されない画面タイトル フォーム - + Clear Playlist プレイリストを消去する - + Shuffle Playlist プレイリストをシャッフルする - + Add Files ファイルを追加 - + Add Directory ディレクトリーを追加 - + Add URL URL を追加 - + Multimedia Files マルチメディアファイル - + Select Multimedia Files マルチメディアファイルを選択 - + Select Multimedia Directory マルチメディアディレクトリーを選択 - + Enter a valid URL for a multimedia file or stream: 有効なマルチメディアファイルまたはストリームの URL を入力: - + Multimedia URL マルチメディア URL @@ -799,158 +804,158 @@ RSSFeedPlugin - + Form フォーム - + View Options オプションを表示します - + Open Website ウェブサイトを開く - + More 詳しく表示 - - - + + + Back to Feeds フィード一覧に戻る - + Feed Information フィードの情報 - + Remove Feed ボタンのキャプション フィードを削除 - + New Feed Subscription グループボックスのタイトル? 新しいフィードを登録する - + RSS URL RSS の URL - + Load a preset RSS Feed プリセットされた RSS フィードを読み込む - + Add to Feeds ボタンのキャプション フィード一覧に追加 - + Feed Reader Settings フィードリーダーの設定 - + Manual Sync Only 手動同期のみ - + Some RSS feeds may request custom update intervals instead of using this setting いくつかの RSS フィードは元の設定とは異なる同期間隔を設定することができます。 - + Default Sync Interval デフォルトの同期間隔 - - + + Hour(s) 時間 - + Minutes 分 - + Save Settings 設定を保存 - + Add RSS Feed RSS フィードを追加 - + View Feed Details フィードの詳細を表示 - + Settings 設定 - + Update Feeds Now 今すぐフィードを更新 - + Lumina Desktop RSS Lumina デスクトップ RSS - + Feed URL: %1 フィードの URL: %1 - + Title: %1 タイトル: %1 - + Description: %1 説明: %1 - + Website: %1 Web サイト: %1 - + Last Build Date: %1 最終更新日時: %1 - + Last Sync: %1 最終同期日時: %1 - + Next Sync: %1 次回同期日時: %1 @@ -958,32 +963,32 @@ SettingsMenu - + Screensaver スクリーンセーバー - + Desktop デスクトップ - + Preferences 設定 - + Display ディスプレイ - + Control Panel コントロールパネル - + About Lumina Lumina について @@ -991,117 +996,117 @@ StartMenu - + Form 表示されない画面タイトル フォーム - + Type to search 検索キーワードを入力してください - + Browse Files ボタンのキャプション ファイルを探索 - + Browse Applications アプリケーションを探索 - + Control Panel コントロールパネル - + Leave 実際に使ったところ「席を外す」は意味が違う気がします。「退出」「離脱」が良いかもしれません。 終了 - + Manage Applications アプリケーションの管理 - + Show Categories カテゴリー別表示 - + Configure Desktop デスクトップの設定 - + Sign Out User ユーザーのサインアウト - + Restart System システムの再起動 - + Preferences 設定 - + Power Off System システムの電源を切る - + (System Performing Updates) (システムはアップデート中です) - + Suspend System システムのサスペンド - + Back 戻る - + Apply Updates? 更新を行いますか? - + You have system updates waiting to be applied! Do you wish to install them now? 適用されていないシステムアップデートがあります。インストールしますか? - + %1% (Plugged In) %1% (電源接続中) - + %1% (%2 Estimated) %1% (推定残り時間: %2) - + %1% Remaining 残り %1% - - - + + + Workspace %1/%2 ワークスペース %1/%2 @@ -1109,47 +1114,47 @@ SystemWindow - + System Options システムのオプション - + Log Out ログアウト - + Restart 再起動 - + Shutdown シャットダウン - + Cancel キャンセル - + Lock ロック - + Suspend サスペンド - + Apply Updates? 更新を行いますか？ - + You have system updates waiting to be applied! Do you wish to install them now? システムが適用されるのを待っている更新があります！ 今それらをインストールしますか？ @@ -1157,22 +1162,22 @@ UserItemWidget - + Go Back 戻る - + Remove Shortcut ショートカットを削除 - + Delete File ファイルを削除 - + Create Shortcut ショートカットを作成 @@ -1180,187 +1185,187 @@ UserWidget - + UserWidget 表示されないタイトル UserWidget - - + + Favorites お気に入り - + Favorite Applications ツールチップ お気に入りのアプリケーション - - + + Applications アプリケーション - + Favorite Directories ツールチップ お気に入りのディレクトリー - + Places 場所 - + Favorite FIles ツールチップ お気に入りのファイル - + Files ファイル - + Apps アプリ - - + + Home ホーム - + Home Directory ホームディレクトリー - + Search this Directory ツールチップ このディレクトリーを検索する - + Go back to home directory - なぜ"back"? + なぜ"back"? ホームディレクトリーに移動する - + Open Directory - "Browse"ボタンのツールチップ + "Browse"ボタンのツールチップ ディレクトリーを開く - + Config 設定 - + Desktop Preferences デスクトップの設定 - + Control Panel コントロールパネル - + Desktop Appearance/Plugins デスクトップの外観/プラグイン - + Screen Configuration 画面の設定 - + Screensaver Settings スクリーンセーバーの設定 - + About the Lumina Desktop Lumina デスクトップについて - + All すべて - + Multimedia マルチメディア - + Development 開発 - + Education 教育 - + Games ゲーム - + Graphics グラフィックス - + Network ネットワーク - + Office オフィス - + Science 科学 - + Settings 設定 - + System システム - + Utilities ユーティリティー - + Wine Wine - + Unsorted 未分類 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ka.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 364c1904..8d975f7f 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ko.ts @@ -9,22 +9,22 @@ 프로그램을 지정하기 위해 누름 - + Launch %1 %1 실행 - + Open %1 %1 열기 - + Select Application 프로그램 선택 - + Name: 이름: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set 설정하기 위해 누름 - + Select Application 프로그램 선택 - + Name: 이름: @@ -56,82 +56,82 @@ 바탕 화면 - + Manage Applications 프로그램 관리 - + Control Panel 제어판 - + Multimedia 멀티미디어 - + Development 개발 - + Education 교육 - + Games 게임 - + Graphics 그래픽 - + Network 네트워크 - + Office 업무 - + Science 과학 - + Settings 설정 - + System 시스템 - + Utility 유틸리티 - + Wine 와인 - + Unsorted 미분류 - + Applications 프로그램 @@ -240,27 +240,27 @@ 뒤로 가기 - + Pin to Desktop 바탕 화면에 고정 - + Remove from Favorites 즐겨 찾기에서 제거 - + Add to Favorites 즐겨 찾기에 추가 - + Remove from Quicklaunch 빠른 실행에서 제거 - + Add to Quicklaunch 빠른 실행에 추가 @@ -286,87 +286,87 @@ 프로그램 - + Browse Files 파일 둘러보기 - + Install Applications 프로그램 설치 - + Control Panel 제어판 - + Multimedia 멀티미디어 - + Development 개발 - + Education 교육 - + Games 게임 - + Graphics 그래픽 - + Network 네트워크 - + Office 업무 - + Science 과학 - + Settings 설정 - + System 시스템 - + Utility 유틸리티 - + Wine 와인 - + Unsorted 미분류 - + Leave 떠나기 @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (충전중) - + %1 % (%2 Remaining) %1 % (%2 남음) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item 아이템 이동 시작 - + Start Resizing Item 아이템 크기 조정 시작 - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item 아이템 제거 @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications 즐겨 쓰는 프로그램 - + Favorite Folders 즐겨 찾는 폴더 - + Audio 오디오 - + Video 비디오 - + Pictures 그림 - + Other Files 기타 파일 - + Documents 문서 - + Favorite Files 즐겨 찾는 파일 @@ -471,32 +476,32 @@ LDesktop - + Window List 창 목록 - + Lumina Desktop 루미나 데스크탑 - + Workspace %1 작업 공간 %1 - + Terminal 터미널 - + Browse Files 파일 둘러보기 - + Leave 떠나기 @@ -964,12 +969,12 @@ - + Control Panel 제어판 - + About Lumina 루미나 안내 @@ -1057,34 +1062,34 @@ 뒤로 - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (연결됨) - + %1% (%2 Estimated) %1% (%2 예상) - + %1% Remaining %1% 남음 - - - + + + Workspace %1/%2 작업 공간 %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 뒤로 가기 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 7fb74df2..902a2b04 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lt.ts @@ -9,22 +9,22 @@ Spustelėkite, norėdami priskirti programą - + Launch %1 Paleisti %1 - + Open %1 Atverti %1 - + Select Application Pasirinkti programą - + Name: Pavadinimas: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Spustelėkite, norėdami nustatyti - + Select Application Pasirinkti programą - + Name: Pavadinimas: @@ -56,82 +56,82 @@ Darbalaukis - + Manage Applications Tvarkyti programas - + Control Panel Valdymo skydelis - + Multimedia Multimedija - + Development Programavimas - + Education Švietimas - + Games Žaidimai - + Graphics Grafika - + Network Tinklas - + Office Raštinė - + Science Mokslas - + Settings Nustatymai - + System Sistema - + Utility Paslaugų programos - + Wine Wine - + Unsorted Nesurūšiuota - + Applications Programos @@ -240,27 +240,27 @@ Grįžti - + Pin to Desktop Prisegti prie darbalaukio - + Remove from Favorites Šalinti iš mėgstamų - + Add to Favorites Pridėti į mėgstamus - + Remove from Quicklaunch Šalinti iš sparčiojo paleidimo - + Add to Quicklaunch Pridėti į spartųjį paleidimą @@ -286,87 +286,87 @@ Programos - + Browse Files Naršyti failus - + Install Applications Įdiegti programas - + Control Panel Valdymo skydelis - + Multimedia Multimedija - + Development Programavimas - + Education Švietimas - + Games Žaidimai - + Graphics Grafika - + Network Tinklas - + Office Raštinė - + Science Mokslas - + Settings Nustatymai - + System Sistema - + Utility Paslaugų programos - + Wine Wine - + Unsorted Nesurūšiuota - + Leave Išeiti @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Kraunama) - + %1 % (%2 Remaining) %1 % (Liko %2) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Pradėti elemento perkėlimą - + Start Resizing Item Pradėti elemento dydžio keitimą - + Increase Item Sizes Padidinti elementų dydžius - + Decrease Item Sizes Sumažinti elementų dydžius - + Remove Item Šalinti elementą @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Mėgstamos programos - + Favorite Folders Mėgstami aplankai - + Audio Garsas - + Video Vaizdas - + Pictures Paveikslai - + Other Files Kiti failai - + Documents Dokumentai - + Favorite Files Mėgstami failai @@ -471,32 +476,32 @@ LDesktop - + Window List Langų sąrašas - + Lumina Desktop Lumina darbalaukis - + Workspace %1 Darbo sritis %1 - + Terminal Terminalas - + Browse Files Naršyti failus - + Leave Išeiti @@ -964,12 +969,12 @@ Ekranas - + Control Panel Valdymo skydelis - + About Lumina Apie Lumina @@ -1057,34 +1062,34 @@ 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? - + %1% (Plugged In) %1% (Įdėta) - + %1% (%2 Estimated) %1% (Apytikriai %2) - + %1% Remaining Liko %1% - - - + + + Workspace %1/%2 Darbo sritis %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Grįžti 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 3ed3464b..a01431fd 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_lv.ts @@ -9,22 +9,22 @@ Noklikšķiniet, lai norādītu lietotni - + Launch %1 Palaist %1 - + Open %1 Atvērt %1 - + Select Application Izvēlieties lietotni - + Name: Nosaukums: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klikšķiniet, lai iestatītu - + Select Application Izvēlieties lietotni - + Name: Nosaukums: @@ -56,82 +56,82 @@ Darbvirsma - + Manage Applications Pārvaldīt lietotnes - + Control Panel Vadības panelis - + Multimedia Multivide - + Development Izstrāde - + Education Izglītība - + Games Spēles - + Graphics Grafika - + Network Tīkls - + Office Birojs - + Science Zinātne - + Settings Iestatījumi - + System Sistēma - + Utility Utilītas - + Wine Wine - + Unsorted Nesakārtots - + Applications Lietojumprogrammas @@ -240,27 +240,27 @@ Atpakaļ - + Pin to Desktop Piespraust darbvirsmai - + Remove from Favorites Izņemt no izlases - + Add to Favorites Pievienot izlasei - + Remove from Quicklaunch Izņemt no ātrās palaišanas - + Add to Quicklaunch Pievienot ātrai palaišanai @@ -286,87 +286,87 @@ Lietojumprogrammas - + Browse Files Pārlūkot failus - + Install Applications Instalēt lietojumprogrammas - + Control Panel Vadības panelis - + Multimedia Multivide - + Development Izstrāde - + Education Izglītība - + Games Spēles - + Graphics Grafika - + Network Tīkls - + Office Birojs - + Science Zinātne - + Settings Iestatījumi - + System Sistēma - + Utility Utilītprogrammas - + Wine Wine - + Unsorted Nesakārtots - + Leave Atstāt @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (uzlādējas) - + %1 % (%2 Remaining) %1 % (%2 atlicis) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Sākt pārvietot vienumu - + Start Resizing Item Sākt izmēra maiņu vienumam - + Increase Item Sizes Palielināt vienuma izmērus - + Decrease Item Sizes Samazināt vienuma izmērus - + Remove Item Noņemt vienumu @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Izlases lietojumprogrammas - + Favorite Folders Izlases mapes - + Audio Audio - + Video Video - + Pictures Attēli - + Other Files Citi faili - + Documents Dokumenti - + Favorite Files Izlases faili @@ -471,32 +476,32 @@ LDesktop - + Window List Logu saraksts - + Lumina Desktop Lumina darbvirsma - + Workspace %1 Darbvieta %1 - + Terminal Terminālis - + Browse Files Pārlūkot failus - + Leave Atstāt @@ -964,12 +969,12 @@ Displejs - + Control Panel Vadības panelis - + About Lumina Par Lumina @@ -1057,34 +1062,34 @@ Atpakaļ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (pievienots) - + %1% (%2 Estimated) %1% (%2 paredzamais) - + %1% Remaining %1% atlicis - - - + + + Workspace %1/%2 Darbvieta %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Atpakaļ 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mk.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mn.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ms.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_mt.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nb.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 60205f48..5ef91bab 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_nl.ts @@ -9,22 +9,22 @@ Klik om een toepassing toe te wijzen - + Launch %1 %1 opstarten - + Open %1 %1 openen - + Select Application Applicatie selecteren - + Name: Naam: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klik om in te stellen - + Select Application Applicatie selecteren - + Name: Naam: @@ -56,82 +56,82 @@ Bureaublad - + Manage Applications Applicaties beheren - + Control Panel Configuratiescherm - + Multimedia Multimedia - + Development Ontwikkeling - + Education Onderwijs - + Games Spellen - + Graphics Grafisch - + Network Netwerk - + Office Kantoor - + Science Wetenschap - + Settings Instellingen - + System Systeem - + Utility Hulpmiddel - + Wine Wine - + Unsorted Ongesorteerd - + Applications Applicaties @@ -240,27 +240,27 @@ Ga terug - + Pin to Desktop Vastmaken aan bureaublad - + Remove from Favorites Verwijderen uit favorieten - + Add to Favorites Toevoegen aan favorieten - + Remove from Quicklaunch Verwijderen uit snelstart - + Add to Quicklaunch Toevoegen aan snelstart @@ -286,87 +286,87 @@ Applicaties - + Browse Files Door bestanden bladeren - + Install Applications Applicaties installeren - + Control Panel Configuratiescherm - + Multimedia Multimedia - + Development Ontwikkeling - + Education Educatie - + Games Spellen - + Graphics Grafisch - + Network Netwerk - + Office Kantoor - + Science Wetenschap - + Settings Instellingen - + System Systeem - + Utility Hulpmiddel - + Wine Wine - + Unsorted Ongesorteerd - + Leave Verlaten @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Bezig met opladen) - + %1 % (%2 Remaining) %1 % (%2 resterend) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Starten met verplaatsen van item - + Start Resizing Item Starten met herschalen van item - + Increase Item Sizes Itemgroottes vergroten - + Decrease Item Sizes Itemgroottes verkleinen - + Remove Item Item verwijderen @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Favoriete applicaties - + Favorite Folders Favoriete mappen - + Audio Audio - + Video Video - + Pictures Afbeeldingen - + Other Files Overige bestanden - + Documents Documenten - + Favorite Files Favoriete bestanden @@ -471,32 +476,32 @@ LDesktop - + Window List Vensterlijst - + Lumina Desktop Lumina-bureaublad - + Workspace %1 Werkruimte %1 - + Terminal Terminalvenster - + Browse Files Door bestanden bladeren - + Leave Verlaten @@ -964,12 +969,12 @@ Weergave - + Control Panel Configuratiescherm - + About Lumina Over Lumina @@ -1057,34 +1062,34 @@ 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? - + %1% (Plugged In) %1% (Oplaadkabel is verbonden) - + %1% (%2 Estimated) %1% (%2 geschat) - + %1% Remaining %1% resterend - - - + + + Workspace %1/%2 Werkruimte %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Ga terug 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pa.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 e684ae49..1c80bee6 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pl.ts @@ -9,22 +9,22 @@ Kliknij, aby przypisać aplikację. - + Launch %1 Uruchom %1 - + Open %1 Otwórz %1 - + Select Application Wybierz aplikację - + Name: Nazwa: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Kliknij by ustawić - + Select Application Wybierz aplikację - + Name: Nazwa: @@ -56,82 +56,82 @@ Pulpit - + Manage Applications Zarządzaj aplikacjami - + Control Panel Panel sterowania - + Multimedia Multimedia - + Development Narzędzia programistów - + Education Edukacja - + Games Gry - + Graphics Grafika - + Network Sieć - + Office Biuro - + Science Nauka - + Settings Ustawienia - + System System - + Utility Narzędzia - + Wine Wine - + Unsorted Nieuporządkowane - + Applications Aplikacje @@ -240,27 +240,27 @@ Wstecz - + Pin to Desktop Dodaj do pulpitu - + Remove from Favorites Usuń z ulubionych - + Add to Favorites Dodaj do ulubionych - + Remove from Quicklaunch Usuń z szybkiego uruchamiania - + Add to Quicklaunch Dodaj do szybkiego uruchamiania @@ -286,87 +286,87 @@ Aplikacje - + Browse Files Przeglądaj pliki - + Install Applications Instaluj aplikacje - + Control Panel Panel sterowania - + Multimedia Multimedia - + Development Narzędzia programistów - + Education Edukacja - + Games Gry - + Graphics Grafika - + Network Sieć - + Office Biuro - + Science Nauka - + Settings Ustawienia - + System System - + Utility Narzędzia - + Wine Wine - + Unsorted Nieuporządkowane - + Leave Wyjdź @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Ładowanie) - + %1 % (%2 Remaining) %1 % (%2 pozostało) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Zacznij przesuwać element - + Start Resizing Item Zacznij zmieniać rozmiar elementu - + Increase Item Sizes Zwiększ wielkość elementu - + Decrease Item Sizes Zmniejsz wielkość elementu - + Remove Item Usuń element @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Ulubione aplikacje - + Favorite Folders Ulubione foldery - + Audio Dźwięk - + Video Wideo - + Pictures Obrazy - + Other Files Inne Pliki - + Documents Dokumenty - + Favorite Files Ulubione Pliki @@ -471,32 +476,32 @@ LDesktop - + Window List Lista Okien - + Lumina Desktop Pulpit Lumina - + Workspace %1 Przestrzeń robocza %1 - + Terminal Terminal - + Browse Files Przeglądaj pliki - + Leave Wyjdź @@ -964,12 +969,12 @@ Ekran - + Control Panel Panel sterowania - + About Lumina Lumina - informacje @@ -1057,34 +1062,34 @@ Wstecz - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Podłączony) - + %1% (%2 Estimated) %1% (%2 Szacowane) - + %1% Remaining %1% Pozostało - - - + + + Workspace %1/%2 Przestrzeń robocza %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Wróć 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 c29b01d0..084c9d5d 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_pt.ts @@ -9,22 +9,22 @@ Clique para atribuir um aplicativo - + Launch %1 Iniciar %1 - + Open %1 Abrir %1 - + Select Application Selecionar Aplicativo - + Name: Nome: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Clique para Definir - + Select Application Selecionar Aplicativo - + Name: Nome: @@ -56,82 +56,82 @@ Área de Trabalho - + Manage Applications - + Control Panel Painel de Controle - + Multimedia Multimídia - + Development Desenvolvimento - + Education Educação - + Games Jogos - + Graphics Gráficos - + Network Rede - + Office Escritório - + Science Ciência - + Settings Definições - + System Sistema - + Utility Utilitário - + Wine Vinho - + Unsorted Sem ordem - + Applications Aplicativos @@ -240,27 +240,27 @@ Voltar - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ Aplicativos - + Browse Files - + Install Applications Instalar Aplicativos - + Control Panel - + Multimedia Multimídia - + Development Desenvolvimento - + Education Educação - + Games Jogos - + Graphics Gráficos - + Network Rede - + Office Escritório - + Science Ciência - + Settings Definições - + System Sistema - + Utility Utilitário - + Wine Vinho - + Unsorted Sem ordem - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Carregando) - + %1 % (%2 Remaining) %1 % (%2 Restantes) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Aplicativos Favoritos - + Favorite Folders Pastas Favoritas - + Audio Áudio - + Video Vídeo - + Pictures Fotos - + Other Files Outros Arquivos - + Documents Documentos - + Favorite Files Arquivos Favoritos @@ -471,32 +476,32 @@ LDesktop - + Window List Lista de Janelas - + Lumina Desktop Área de Trabalho Lumina - + Workspace %1 Espaço de trabalho %1 - + Terminal Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel Painel de Controle - + About Lumina Sobre Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 Espaço de trabalho %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Voltar 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 cd1c5080..2b4f0cf6 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 @@ -1,30 +1,30 @@ - + AppLaunchButtonPlugin - + Click to assign an application Clique para atribuir um aplicativo - + Launch %1 Lançar %1 - + Open %1 Abrir %1 - + Select Application Selecionar aplicativo - + Name: Nome: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Clique para definir - + Select Application Selecionar aplicativo - + Name: Nome: @@ -51,87 +51,87 @@ AppMenu - + Desktop Área de trabalho - + Manage Applications Gerenciar aplicativos - + Control Panel Painel de controle - + Multimedia Multimídia - + Development Desenvolvimento - + Education Educação - + Games Jogos - + Graphics Gráficos - + Network Redes - + Office Escritório - + Science Ciências - + Settings Configurações - + System Sistema - + Utility Utilitários - + Wine Wine - + Unsorted Não organizados - + Applications Aplicativos @@ -139,57 +139,57 @@ BootSplash - + Form Formulário - + Initializing Session … Inicializando sessão… - + Loading System Settings … Carregando configurações do sistema… - + Loading User Preferences … Carregando preferências do usuário… - + Preparing System Tray … Preparando bandeja do sistema… - + Starting Window Manager … Iniciando gerenciador de janelas … - + Detecting Applications … Detectando aplicativos… - + Preparing Menus … Preparando menus… - + Preparing Workspace … Preparando o espaço de trabalho… - + Finalizing … Finalizando… - + Starting App: %1 Iniciando aplicativo: %1 @@ -197,37 +197,37 @@ DesktopViewPlugin - + Open Abrir - + Cut Cortar - + Copy Copiar - + Increase Icons Aumentar ícones - + Decrease Icons Diminuir ícones - + Delete Excluir - + Properties Propriedades @@ -235,32 +235,32 @@ ItemWidget - + Go Back Voltar - + Pin to Desktop Fixa na área de trabalho - + Remove from Favorites Remover dos favoritos - + Add to Favorites Adicionar aos favoritos - + Remove from Quicklaunch Remover do lançador rápido - + Add to Quicklaunch Adicionar ao lançador rápido @@ -268,7 +268,7 @@ JsonMenu - + Error parsing script output: %1 Erro ao executar o script: %1 @@ -276,97 +276,97 @@ LAppMenuPlugin - + Quickly launch applications or open files Inicia aplicativos ou abra arquivos rapidamente - + Applications Aplicativos - + Browse Files navegar por arquivos - + Install Applications Instalar aplicativos - + Control Panel Painel de controle - + Multimedia Multimídia - + Development Desenvolvimento - + Education Educação - + Games Jogos - + Graphics Gráficos - + Network Rede - + Office Escritório - + Science Ciência - + Settings Configurações - + System Sistema - + Utility Utilitário - + Wine Wine - + Unsorted Não ordenado - + Leave Deixar @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (carregando) - + %1 % (%2 Remaining) %1 % (%2 restantes) @@ -387,12 +387,12 @@ LClock - + Time Zone (%1) Fuso horário (%1) - + Use System Time Usar hora do sistema @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Movendo item - + Start Resizing Item Redimensionar item - + Increase Item Sizes Aumentar tamanho do item - + Decrease Item Sizes Diminuir tamanho do item - + Remove Item Remover item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Aplicativos favoritos - + Favorite Folders Pastas favoritas - + Audio Áudio - + Video Vídeo - + Pictures Imagens - + Other Files Outros arquivos - + Documents Documentos - + Favorite Files Arquivos favoritos @@ -471,32 +476,32 @@ LDesktop - + Window List Lista de janelas - + Lumina Desktop Lumina Desktop - + Workspace %1 Espaço de trabalho %1 - + Terminal Terminal - + Browse Files Navegar por arquivos - + Leave Deixar @@ -504,8 +509,8 @@ LDesktopSwitcher - - + + Workspace %1 Espaço de trabalho %1 @@ -513,7 +518,7 @@ LQuickLaunchButton - + Remove from Quicklaunch Remover do lançador rápido @@ -521,8 +526,8 @@ LSession - - + + Desktop Área de trabalho @@ -530,7 +535,7 @@ LSysDashboard - + System Dashboard Painel do sistema @@ -538,54 +543,54 @@ LSysMenuQuick - + Form Formulário - + System Volume Volume do sistema - + Launch Audio Mixer Iniciar mixer de áudio - + Screen Brightness Brilho da tela - + Battery Status Estado da bateria - + Workspace Espaço de trabalho - + Locale Local - + Log Out Encerrar sessão - + connected conectado - - - + + + %1 of %2 %1 de %2 @@ -593,42 +598,42 @@ LTaskButton - + Activate Window Ativar janela - + Minimize Window Minimizar janela - + Restore Window Restaurar janela - + Maximize Window Maximizar janela - + Close Window Fechar janela - + Show All Windows Exibir todas janelas - + Minimize All Windows Minimizar todas janelas - + Close All Windows Fechar todas as janelas @@ -636,7 +641,7 @@ LUserButtonPlugin - + Quickly launch applications or open files Inicia aplicativos ou abra arquivos rapidamente @@ -644,32 +649,32 @@ MonitorWidget - + Form Formulário - + Summary Resumo - + CPU Temp: Temp. do CPU: - + CPU Usage: Uso do CPU: - + Mem Usage: Uso da mem.: - + Disk I/O Escritas/Leituras no disco @@ -677,52 +682,52 @@ NotePadPlugin - + Note Files (*.note) Arquivo de nota (*.note) - + Text Files (*) Arquivos de texto (*) - + Open a note file Abrir um arquivo de nota - + Name: Nome: - + Invalid Note Name: Try Again Nome da anotação inválida: tente novamente - + Select a Note Name Selecionar nome da anotação - + Open Text File Abrir Arquivo de Texto - + Create a Note Criar anotação - + Rename Note Renomear anotação - + Delete Note Apagar anotação @@ -730,57 +735,57 @@ PlayerWidget - + Form Formulário - + Clear Playlist Limpar a lista de reprodução - + Shuffle Playlist Embaralhar a lista de reprodução - + Add Files Adicionar arquivos - + Add Directory Adicionar diretório - + Add URL Adicionar URL - + Multimedia Files Arquivos de multimídia - + Select Multimedia Files Selecionar arquivos de multimídia - + Select Multimedia Directory Selecionar pasta de mídia - + Enter a valid URL for a multimedia file or stream: Digite um endereço para um arquivo ou fluxo de mídia válido: - + Multimedia URL Endereço de mídia @@ -788,155 +793,155 @@ RSSFeedPlugin - + Form Formulário - + View Options Opções de visualização - + Open Website Abrir site - + More Mais - - - + + + Back to Feeds Voltar para postagens - + Feed Information Informação da postagem - + Remove Feed Remover postagem - + New Feed Subscription Nova Inscrição - + RSS URL RSS URL - + Load a preset RSS Feed Carregar conjunto de postagens RSS - + Add to Feeds Adicionar para postagens - + Feed Reader Settings Configurações do Leitor de Postagens - + Manual Sync Only Somente sincronização manual - + Some RSS feeds may request custom update intervals instead of using this setting Algumas postagens de RSS podem solicitar intervalos de atualizações diferentes dos usados nesta configuração - + Default Sync Interval Intervalo de sincronização padrão - - + + Hour(s) Hora(s) - + Minutes Minutos - + Save Settings Salvar Configurações - + Add RSS Feed Adicionar postagem RSS - + View Feed Details Ver detalhes da postagem - + Settings Configurações - + Update Feeds Now Atualizar postagens agora - + Lumina Desktop RSS Lumina Desktop RSS - + Feed URL: %1 URL da postagem: %1 - + Title: %1 Título: %1 - + Description: %1 Descrição: %1 - + Website: %1 Site: %1 - + Last Build Date: %1 Última data da compilação: %1 - + Last Sync: %1 Última sincronização: %1 - + Next Sync: %1 Próxima sincronização: %1 @@ -944,32 +949,32 @@ SettingsMenu - + Screensaver Protetor de tela - + Desktop Área de trabalho - + Preferences Preferências - + Display Exibição - + Control Panel Painel de controle - + About Lumina Sobre Lumina @@ -977,114 +982,114 @@ StartMenu - + Form Formulário - + Type to search Digitar para pesquisar - + Browse Files Navegar nos arquivos - + Browse Applications Navegar pelos Aplicativos - + Control Panel Painel de controle - + Leave Deixar - + Manage Applications Gerenciar aplicativos - + Show Categories Mostra categorias - + Configure Desktop Configurar área de trabalho - + Sign Out User Desconectar Usuário - + Restart System Reiniciar sistema - + Preferences Preferências - + Power Off System Desligar sistema - + (System Performing Updates) (Sistema aplicando atualizações) - + Suspend System Suspender Sistema - + Back 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? - + %1% (Plugged In) %1% (Plugado) - + %1% (%2 Estimated) %1% (%2 Estimado) - + %1% Remaining %1% Restantes - - - + + + Workspace %1/%2 Espaço de trabalho %1/%2 @@ -1092,47 +1097,47 @@ SystemWindow - + System Options Opções do sistema - + Log Out Encerrar sessão - + Restart Reiniciar - + Shutdown Desligar - + Cancel Cancelar - + Lock Bloquear - + Suspend Suspender - + 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? @@ -1140,22 +1145,22 @@ UserItemWidget - + Go Back Voltar - + Remove Shortcut Excluir atalho - + Delete File Excluir arquivo - + Create Shortcut Criar atalho @@ -1163,180 +1168,180 @@ UserWidget - + UserWidget Widget do usuário - - + + Favorites Favoritos - + Favorite Applications Aplicativos favoritos - - + + Applications Aplicativos - + Favorite Directories Pastas favoritas - + Places Locais - + Favorite FIles Arquivos favoritos - + Files Arquivos - + Apps Aplicativos - - + + Home Início - + Home Directory Pasta pessoal - + Search this Directory Pesquisar nesta pasta - + Go back to home directory Voltar para a pasta pessoal - + Open Directory Abrir Pasta - + Config Configuração - + Desktop Preferences Preferências da área de trabalho - + Control Panel Painel de controle - + Desktop Appearance/Plugins Aparência/Plugins da área de trabalho - + Screen Configuration Configuração de tela - + Screensaver Settings Configurações do protetor de tela - + About the Lumina Desktop Sobre o Lumina Desktop - + All Todos - + Multimedia Multimídia - + Development Desenvolvimento - + Education Educação - + Games Jogos - + Graphics Gráficos - + Network Redes - + Office Escritório - + Science Ciências - + Settings Configurações - + System Sistema - + Utilities Utilitários - + Wine Wine - + Unsorted Não organizados 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ro.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 5fe2c5aa..33f300be 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts @@ -1,4 +1,4 @@ - + @@ -9,22 +9,22 @@ Нажмите, чтобы назначить приложение - + Launch %1 Запуск %1 - + Open %1 Открыто %1 - + Select Application Выбор Приложения - + Name: Имя: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Нажмите что бы выбрать - + Select Application Выбрать Приложение - + Name: Название: @@ -56,82 +56,82 @@ Рабочий стол - + Manage Applications Управление приложениями - + Control Panel Панель Управления - + Multimedia Мультимедиа - + Development Разработка - + Education Образование - + Games Игры - + Graphics Графика - + Network Сети - + Office Офис - + Science Наука - + Settings Параметры - + System Система - + Utility Инструменты - + Wine Вино - + Unsorted Несортированный - + Applications Приложения @@ -240,27 +240,27 @@ Назад - + Pin to Desktop Вывод на рабочий стол - + Remove from Favorites Удалить из избранного - + Add to Favorites Добавить в избранное - + Remove from Quicklaunch Удалить из Быстрого запуска - + Add to Quicklaunch Добавить в Быстрый запуск @@ -286,87 +286,87 @@ Приложения - + Browse Files Просмотр файлов - + Install Applications Установить Приложения - + Control Panel Панель Управления - + Multimedia Мультимедиа - + Development Разработка - + Education Образование - + Games Игры - + Graphics Графика - + Network Сети - + Office Офис - + Science Наука - + Settings Параметры - + System Система - + Utility Инструменты - + Wine Вино - + Unsorted Не классифицированные - + Leave Оставить @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Заряжается) - + %1 % (%2 Remaining) %1 % (Осталось %2 ) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Начать перемещение предмета - + Start Resizing Item Начать изменение размера предмета - + Increase Item Sizes Увеличить размер изображения - + Decrease Item Sizes Уменьшить размер изображения - + Remove Item Убрать предмет @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Избранные Приложения - + Favorite Folders Избранные Папки - + Audio Звук - + Video Видео - + Pictures Изображения - + Other Files Прочие Файлы - + Documents Документы - + Favorite Files Избранные Файлы @@ -471,32 +476,32 @@ LDesktop - + Window List Список Окон - + Lumina Desktop Рабочий стол Lumina - + Workspace %1 Рабочая Область %1 - + Terminal Терминал - + Browse Files Просмотр файлов - + Leave Оставить @@ -964,12 +969,12 @@ Экран - + Control Panel Панель Управления - + About Lumina О Lumina @@ -1057,34 +1062,34 @@ Назад - + Apply Updates? Применить обновления? - + You have system updates waiting to be applied! Do you wish to install them now? У вас есть системные обновления! Вы хотите установить их сейчас? - + %1% (Plugged In) %1% (подключенный) - + %1% (%2 Estimated) %1% (%2 расчетно) - + %1% Remaining %1% осталось - - - + + + Workspace %1/%2 Рабочая Область %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Назад 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 9f5938ae..b8728bf6 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sk.ts @@ -9,22 +9,22 @@ Kliknutím vyberte aplikáciu - + Launch %1 Spustiť %1 - + Open %1 Otvoriť %1 - + Select Application Vybrať aplikáciu - + Name: Meno: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Kliknutím nastaviť - + Select Application Výber aplikácie - + Name: Meno: @@ -56,82 +56,82 @@ Pracovná plocha - + Manage Applications Správa aplikácií - + Control Panel Ovládací panel - + Multimedia Multimédiá - + Development Vývoj - + Education Vzdelávanie - + Games Hry - + Graphics Grafika - + Network Sieť - + Office Kancelária - + Science Veda - + Settings Nastavenie - + System Systém - + Utility Nástroje - + Wine Wine - + Unsorted Nezoradené - + Applications Aplikácie @@ -240,27 +240,27 @@ Ísť späť - + Pin to Desktop Pripnúť na plochu - + Remove from Favorites Odstrániť z obľúbených - + Add to Favorites Pridať k Obľúbeným - + Remove from Quicklaunch Vymazať zo záložky Rýchle spustenie - + Add to Quicklaunch Pridať do Quicklaunch @@ -286,87 +286,87 @@ Aplikácie - + Browse Files Prehliadať súbory - + Install Applications Nainštalovať aplikácie - + Control Panel Ovládací panel - + Multimedia Multimédiá - + Development Vývoj - + Education Vzdelávanie - + Games Hry - + Graphics Grafika - + Network Sieť - + Office Kancelária - + Science Veda - + Settings Nastavenie - + System Systém - + Utility Nástroje - + Wine Wine - + Unsorted Nezoradené - + Leave Ponechať @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Nabíjania) - + %1 % (%2 Remaining) %1 % (%2 zostáva) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Spustenie Moving Item - + Start Resizing Item Spusť zväčšenie položiek - + Increase Item Sizes Zväčšiť veľkosť položky - + Decrease Item Sizes Zmenšiť veľkosť položky - + Remove Item Odstrániť položku @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Obľúbené aplikácie - + Favorite Folders Obľúbené priečinky - + Audio Audio - + Video Video - + Pictures Obrázky - + Other Files Ostatné súbory - + Documents Dokumenty - + Favorite Files Obľúbené súbory @@ -471,32 +476,32 @@ LDesktop - + Window List Zoznam okien - + Lumina Desktop Prostredie Lumina - + Workspace %1 Pracovná plocha %1 - + Terminal Terminál - + Browse Files Prehliadať súbory - + Leave Ponechať @@ -964,12 +969,12 @@ - + Control Panel Ovládací panel - + About Lumina O prostredí Lumina @@ -1057,34 +1062,34 @@ Späť - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Nabitia) - + %1% (%2 Estimated) %1% (%2 odhadovaný) - + %1% Remaining Zostáva %1% - - - + + + Workspace %1/%2 Pracovná plocha %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Späť 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 4c017754..497e907a 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sl.ts @@ -9,22 +9,22 @@ - + Launch %1 Zaženi %1 - + Open %1 Odpri %1 - + Select Application Izberi program - + Name: Ime: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application Izberi program - + Name: Ime: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel Nadzorna plošča - + Multimedia Večpredstavnost - + Development Razvoj - + Education Izobraževanje - + Games Igre - + Graphics - + Network Omrežje - + Office - + Science Znanost - + Settings Nastavitve - + System - + Utility - + Wine Wine - + Unsorted - + Applications Programi @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ Programi - + Browse Files - + Install Applications Namesti programe - + Control Panel Nadzorna plošča - + Multimedia Večpredstavnost - + Development Razvoj - + Education Izobraževanje - + Games Igre - + Graphics - + Network Omrežje - + Office - + Science Znanost - + Settings Nastavitve - + System - + Utility - + Wine Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures Slike - + Other Files - + Documents Dokumenti - + Favorite Files Priljubljene datoteke @@ -471,32 +476,32 @@ LDesktop - + Window List Seznam oken - + Lumina Desktop - + Workspace %1 - + Terminal Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel Nadzorna plošča - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sr.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 2c46c490..a01411a0 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sv.ts @@ -1,30 +1,30 @@ - + AppLaunchButtonPlugin - + Click to assign an application Klicka här för att tilldela ett program - + Launch %1 Starta %1 - + Open %1 Öppna %1 - + Select Application Välj program - + Name: Namn: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Klicka för att tilldela - + Select Application Välj program - + Name: Namn: @@ -51,87 +51,87 @@ AppMenu - + Desktop Skrivbord - + Manage Applications Hantera program - + Control Panel Kontrollpanel - + Multimedia Multimedia - + Development Utveckling - + Education Utbildning - + Games Spel - + Graphics Grafik - + Network Nätverk - + Office Kontorsprogram - + Science Vetenskap - + Settings Inställningar - + System System - + Utility Verktyg - + Wine Wine - + Unsorted Osorterade - + Applications Program @@ -139,57 +139,57 @@ BootSplash - + Form Formulär - + Initializing Session … Initierar session … - + Loading System Settings … Laddar systeminställningar ... - + Loading User Preferences … Laddar användarinställningar … - + Preparing System Tray … Förbereder System bricka… - + Starting Window Manager … Startar fönsterhanterare … - + Detecting Applications … Upptäcker program… - + Preparing Menus … Förbereder menyer… - + Preparing Workspace … Förbereder arbetsytor… - + Finalizing … Slutför… - + Starting App: %1 Startar program: %1 @@ -197,37 +197,37 @@ DesktopViewPlugin - + Open Öppna - + Cut Klipp ut - + Copy Kopiera - + Increase Icons Förstora ikoner - + Decrease Icons Förminska ikoner - + Delete Ta bort - + Properties Egenskaper @@ -235,32 +235,32 @@ ItemWidget - + Go Back Gå bakåt - + Pin to Desktop Fäst på skrivbordet - + Remove from Favorites Ta bort från favoriter - + Add to Favorites Lägg till i favoriter - + Remove from Quicklaunch Ta bort från Snabbstart - + Add to Quicklaunch Lägg till i Snabbstart @@ -268,7 +268,7 @@ JsonMenu - + Error parsing script output: %1 Fel vid skriptanalysutmatning: %1 @@ -276,97 +276,97 @@ LAppMenuPlugin - + Quickly launch applications or open files Snabbt starta program eller öppna filer - + Applications Program - + Browse Files Bläddra bland filer - + Install Applications Installera program - + Control Panel Kontrollpanel - + Multimedia Multimedia - + Development Utveckling - + Education Utbildning - + Games Spel - + Graphics Grafik - + Network Nätverk - + Office Kontorsprogram - + Science Vetenskap - + Settings Inställningar - + System System - + Utility Verktyg - + Wine Wine - + Unsorted Osorterade - + Leave Lämna @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Laddar) - + %1 % (%2 Remaining) %1 % (%2 Återstår) @@ -387,12 +387,12 @@ LClock - + Time Zone (%1) Tidszon (%1) - + Use System Time Använd systemtid @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Börja flytta objekt - + Start Resizing Item Börja ändra storlek på objekt - + Increase Item Sizes Öka storlek på objekt - + Decrease Item Sizes Minska storlek på objekt - + Remove Item Ta bort objekt @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Favoritprogram - + Favorite Folders Favoritmappar - + Audio Ljud - + Video Video - + Pictures Bilder - + Other Files Andra filer - + Documents Dokument - + Favorite Files Favoritfiler @@ -471,32 +476,32 @@ LDesktop - + Window List Fönsterlista - + Lumina Desktop Lumina Skrivbordet - + Workspace %1 Arbetsyta %1 - + Terminal Terminal - + Browse Files Bläddra bland filer - + Leave Lämna @@ -504,8 +509,8 @@ LDesktopSwitcher - - + + Workspace %1 Arbetsyta %1 @@ -513,7 +518,7 @@ LQuickLaunchButton - + Remove from Quicklaunch Ta bort från Snabbstart @@ -521,8 +526,8 @@ LSession - - + + Desktop Skrivbord @@ -530,7 +535,7 @@ LSysDashboard - + System Dashboard Systemets instrumentpanel @@ -538,54 +543,54 @@ LSysMenuQuick - + Form Formulär - + System Volume Systemvolym - + Launch Audio Mixer Starta ljudmixer - + Screen Brightness Skärmljusstyrka - + Battery Status Batteristatus - + Workspace Arbetsyta - + Locale Språkvariant - + Log Out Logga ut - + connected ansluten - - - + + + %1 of %2 %1 av %2 @@ -593,42 +598,42 @@ LTaskButton - + Activate Window Aktivera fönster - + Minimize Window Minimera fönster - + Restore Window Återställ fönster - + Maximize Window Maximera fönster - + Close Window Stäng fönster - + Show All Windows Visa alla fönster - + Minimize All Windows Minimera alla fönster - + Close All Windows Stäng alla fönster @@ -636,7 +641,7 @@ LUserButtonPlugin - + Quickly launch applications or open files Starta snabbt ett program eller öppna filer @@ -644,32 +649,32 @@ MonitorWidget - + Form Formulär - + Summary Sammanfattning - + CPU Temp: CPU Temp: - + CPU Usage: Processoranvändning: - + Mem Usage: Minnesanvändning: - + Disk I/O Disk-I/O @@ -677,52 +682,52 @@ NotePadPlugin - + Note Files (*.note) Anteckningsfiler (*.note) - + Text Files (*) Textfiler (*) - + Open a note file Öppna en anteckningsfil - + Name: Namn: - + Invalid Note Name: Try Again Ogiltigt anteckningsnamn: Försök igen - + Select a Note Name Välj ett anteckningsnamn - + Open Text File Öppna textfil - + Create a Note Skapa en anteckning - + Rename Note Byt namn på anteckning - + Delete Note Ta bort anteckning @@ -730,57 +735,57 @@ PlayerWidget - + Form Formulär - + Clear Playlist Rensa spellista - + Shuffle Playlist Blanda spellista - + Add Files Lägg till filer - + Add Directory Lägg till katalog - + Add URL Lägg till URL - + Multimedia Files Multimediafiler - + Select Multimedia Files Välj multimediafiler - + Select Multimedia Directory Välj multimediakatalog - + Enter a valid URL for a multimedia file or stream: Ange en giltig URL för en multimediafil eller ström: - + Multimedia URL Multimedia URL @@ -788,155 +793,155 @@ RSSFeedPlugin - + Form Formulär - + View Options Visa alternativ - + Open Website Öppna webbsida - + More Mer - - - + + + Back to Feeds Tillbaka till flöden - + Feed Information Flödets Information - + Remove Feed Ta bort flöde - + New Feed Subscription Ny Prenumeration på RSS-flöde - + RSS URL RSS URL - + Load a preset RSS Feed Ladda ett förinställt RSS-flöde - + Add to Feeds Lägg till RSS-flöden - + Feed Reader Settings RSS-läsarinställningar - + Manual Sync Only Manuell synkronisering endast - + Some RSS feeds may request custom update intervals instead of using this setting Vissa RSS-flöden kan begära anpassade uppdateringsintervall istället för att använda den här inställningen - + Default Sync Interval Standard synkroniseringsintervall - - + + Hour(s) Timma(r) - + Minutes Minuter - + Save Settings Spara inställningar - + Add RSS Feed Lägg till RSS-flöde - + View Feed Details Visa flödes detaljer - + Settings Inställningar - + Update Feeds Now Uppdatera flöden nu - + Lumina Desktop RSS Lumina Skrivbordets RSS läsare - + Feed URL: %1 RSS-Flödes URL: %1 - + Title: %1 Titel: %1 - + Description: %1 Beskrivning: %1 - + Website: %1 Webbplats: %1 - + Last Build Date: %1 Senaste bygg datum: %1 - + Last Sync: %1 Senaste synkronisering: %1 - + Next Sync: %1 Nästa synkronisering: %1 @@ -944,32 +949,32 @@ SettingsMenu - + Screensaver Skärmsläckare - + Desktop Skrivbord - + Preferences Egenskaper - + Display Skärm - + Control Panel Kontrollpanel - + About Lumina Om Lumina @@ -977,114 +982,114 @@ StartMenu - + Form Formulär - + Type to search Skriv för att söka - + Browse Files Bläddra bland filer - + Browse Applications Bläddra bland program - + Control Panel Kontrollpanel - + Leave Lämna - + Manage Applications Hantera program - + Show Categories Visa kategorier - + Configure Desktop Anpassa skrivbordet - + Sign Out User Logga ut användare - + Restart System Starta om systemet - + Preferences Inställningar - + Power Off System Stäng av systemet - + (System Performing Updates) (Systemet utför uppdateringar) - + Suspend System Vänteläge - + Back Bakåt - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Inkopplad) - + %1% (%2 Estimated) %1% (%2 Beräknad) - + %1% Remaining %1% återstår - - - + + + Workspace %1/%2 Arbetsyta %1/%2 @@ -1092,47 +1097,47 @@ SystemWindow - + System Options Systemalternativ - + Log Out Logga ut - + Restart Starta om - + Shutdown Stäng av - + Cancel Avbryt - + Lock Lås - + Suspend Vänteläge - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? @@ -1140,22 +1145,22 @@ UserItemWidget - + Go Back Gå tillbaka - + Remove Shortcut Ta bort genväg - + Delete File Ta bort fil - + Create Shortcut Skapa genväg @@ -1163,180 +1168,180 @@ UserWidget - + UserWidget AnvändarWidget - - + + Favorites Favoriter - + Favorite Applications Favoritprogram - - + + Applications Program - + Favorite Directories Favoritkataloger - + Places Platser - + Favorite FIles Favoritfiler - + Files Filer - + Apps Program - - + + Home Hem - + Home Directory Hemkatalog - + Search this Directory Sök i denna katalog - + Go back to home directory Gå tillbaka till hemkatalogen - + Open Directory Öppna katalog - + Config Inställning - + Desktop Preferences Skrivbordsinställningar - + Control Panel Kontrollpanel - + Desktop Appearance/Plugins Skrivbordsutseende/insticksmoduler - + Screen Configuration Skärminställningar - + Screensaver Settings Inställningar för skärmsläckare - + About the Lumina Desktop Om Lumina Skrivbordsmiljön - + All Alla - + Multimedia Multimedia - + Development Utveckling - + Education Utbildning - + Games Spel - + Graphics Grafik - + Network Nätverk - + Office Kontorsprogram - + Science Vetenskap - + Settings Inställningar - + System System - + Utilities Verktyg - + Wine Wine - + Unsorted Osorterade 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_sw.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ta.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tg.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_th.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 6b4676a4..4b74d099 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_tr.ts @@ -9,22 +9,22 @@ Bir uygulama atamak için tıkla - + Launch %1 %1 öğesini başlat - + Open %1 %1 öğesini aç - + Select Application Uygulama Seç - + Name: Ad: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Ayarlamak için Tıkla - + Select Application Uygulama Seç - + Name: Ad: @@ -56,82 +56,82 @@ Masaüstü - + Manage Applications Uygulamaları Yönet - + Control Panel Denetim Paneli - + Multimedia Multimedya - + Development Geliştirme - + Education Eğitim - + Games Oyunlar - + Graphics Grafik - + Network Ağ - + Office Ofis - + Science Bilim - + Settings Ayarlar - + System Sistem - + Utility Gereç - + Wine Wine - + Unsorted Sınıflandırılmamış - + Applications Uygulamalar @@ -240,27 +240,27 @@ Geri Git - + Pin to Desktop Masaüstüne Sabitle - + Remove from Favorites Sık Kullanılanlardan Kaldır - + Add to Favorites Sık Kullanılanlara Ekle - + Remove from Quicklaunch Hızlı Başlattan Kaldır - + Add to Quicklaunch Hızlı Başlata Ekle @@ -286,87 +286,87 @@ Uygulamalar - + Browse Files Dosyalara Gözat - + Install Applications Uygulama Yükle - + Control Panel Denetim Paneli - + Multimedia Multimedya - + Development Geliştirme - + Education Eğitim - + Games Oyunlar - + Graphics Grafik - + Network Ağ - + Office Ofis - + Science Bilim - + Settings Ayarlar - + System Sistem - + Utility Gereç - + Wine Wine - + Unsorted Sınıflandırılmamış - + Leave Çık @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) % %1 (Doluyor) - + %1 % (%2 Remaining) % %1 (Kalan %2) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Öğe Taşımayı Başlat - + Start Resizing Item Öğe Yeniden Boyutlandırmayı Başlat - + Increase Item Sizes Öğe Boyutlarını Büyüt - + Decrease Item Sizes Öğe Boyutlarını Küçült - + Remove Item Öğeyi Kaldır @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Sık Kullanılan Uygulamalar - + Favorite Folders Sık Kullanılan Klasörler - + Audio Ses - + Video Video - + Pictures Resimler - + Other Files Diğer Dosyalar - + Documents Belgeler - + Favorite Files Sık Kullanılan Dosyalar @@ -471,32 +476,32 @@ LDesktop - + Window List Pencere Listesi - + Lumina Desktop Lumina Masaüstü - + Workspace %1 Çalışma alanı %1 - + Terminal Uçbirim - + Browse Files Dosyalara Gözat - + Leave Çık @@ -964,12 +969,12 @@ Görüntü - + Control Panel Denetim Paneli - + About Lumina Lumina Hakkında @@ -1057,34 +1062,34 @@ Geri - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %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 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Geri Git 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 7fc4605f..024f1f84 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uk.ts @@ -9,22 +9,22 @@ Натисніть, щоб призначити додаток - + Launch %1 Запуск %1 - + Open %1 Відкрити %1 - + Select Application Оберіть Додаток - + Name: Ім'я: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set Натисніть щоб встановити - + Select Application Оберіть додаток - + Name: Ім'я: @@ -56,82 +56,82 @@ - + Manage Applications Керування програмами - + Control Panel Панель керування - + Multimedia Мультимедіа - + Development Розробка - + Education Освіта - + Games Ігри - + Graphics Графіка - + Network Мережа - + Office Офіс - + Science Наука - + Settings Налаштування - + System Система - + Utility Утиліти - + Wine Wine - + Unsorted Невідсортований - + Applications Програми @@ -240,27 +240,27 @@ Назад - + Pin to Desktop Закріпити на стільниці - + Remove from Favorites Вилучити з обраного - + Add to Favorites Додати в обране - + Remove from Quicklaunch Вилучити з швидкого запуску - + Add to Quicklaunch Додати до швидкого запуску @@ -286,87 +286,87 @@ Додатки - + Browse Files Перегляд файлів - + Install Applications Встановлення додатків - + Control Panel Панель керування - + Multimedia Мультимедіа - + Development Розробка - + Education Освіта - + Games Ігри - + Graphics Графіка - + Network Мережа - + Office Офіс - + Science Наука - + Settings Налаштування - + System Система - + Utility Утиліти - + Wine Wine - + Unsorted Не класифіковані - + Leave Лишити @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 % (Заряд) - + %1 % (%2 Remaining) %1 (залишилося %2) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item Почати переміщення елементу - + Start Resizing Item Почати зміну розміру елементу - + Increase Item Sizes Збільшити розмір елементу - + Decrease Item Sizes Зменшити розмір елементу - + Remove Item Видалити елемент @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications Улюблені програми - + Favorite Folders Обрані теки - + Audio Аудіо - + Video Відео - + Pictures Зображення - + Other Files Інші файли - + Documents Документи - + Favorite Files Улюблені файли @@ -471,32 +476,32 @@ LDesktop - + Window List Список вікон - + Lumina Desktop Lumina Desktop - + Workspace %1 Робочий простір %1 - + Terminal Термінал - + Browse Files Перегляд файлів - + Leave Лишити @@ -964,12 +969,12 @@ Дисплей - + Control Panel Панель керування - + About Lumina Про Lumina @@ -1057,34 +1062,34 @@ Назад - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) %1% (Підключено) - + %1% (%2 Estimated) %1% (%2 розрахунково) - + %1% Remaining %1% Залишилось - - - + + + Workspace %1/%2 Робочий простір %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back Назад 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_uz.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_vi.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 94751573..b0edfff8 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 @@ -9,22 +9,22 @@ 单击指定应用程序 - + Launch %1 启动 %1 - + Open %1 打开 %1 - + Select Application 选择程序 - + Name: 名称: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set 单击以设定 - + Select Application 选择程序 - + Name: 名称： @@ -56,82 +56,82 @@ 桌面 - + Manage Applications 管理应用 - + Control Panel 控制面板 - + Multimedia 多媒体 - + Development 开发 - + Education 教育 - + Games 游戏 - + Graphics 图像 - + Network 网络 - + Office 办公 - + Science 科学 - + Settings 设置 - + System 系统 - + Utility 工具 - + Wine Wine 模拟器 - + Unsorted 未排序 - + Applications 应用程序 @@ -240,27 +240,27 @@ 返回 - + Pin to Desktop 固定到桌面 - + Remove from Favorites 从收藏中删除 - + Add to Favorites 添加到收藏 - + Remove from Quicklaunch 从快速启动中删除 - + Add to Quicklaunch 添加到快速启动 @@ -286,87 +286,87 @@ 应用程序 - + Browse Files 浏览文件 - + Install Applications 安装的应用程序 - + Control Panel 控制面板 - + Multimedia 多媒体 - + Development 开发 - + Education 教育 - + Games 游戏 - + Graphics 图像 - + Network 网络 - + Office 办公 - + Science 科学 - + Settings 设置 - + System 系统 - + Utility 工具 - + Wine Wine - + Unsorted 未排序的 - + Leave 离开 @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) %1 %(充电) - + %1 % (%2 Remaining) %1 (%2 剩余) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item 开始移动项目 - + Start Resizing Item 开始改变项目大小 - + Increase Item Sizes 增加项目大小 - + Decrease Item Sizes 减小项目大小 - + Remove Item 删除项目 @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications 收藏的应用 - + Favorite Folders 收藏夹 - + Audio 音频 - + Video 视频 - + Pictures 图片 - + Other Files 其它文件 - + Documents 文档 - + Favorite Files 收藏文件 @@ -471,32 +476,32 @@ LDesktop - + Window List 窗口列表 - + Lumina Desktop Lumina桌面 - + Workspace %1 工作空间 %1 - + Terminal 终端 - + Browse Files 浏览文件 - + Leave 离开 @@ -964,12 +969,12 @@ 显示 - + Control Panel 控制面板 - + About Lumina 关于Lumina @@ -1057,34 +1062,34 @@ 返回 - + Apply Updates? 应用更新？ - + You have system updates waiting to be applied! Do you wish to install them now? 您有系统更新可用！请问您是否想现在安装？ - + %1% (Plugged In) %1% (已插电) - + %1% (%2 Estimated) %1% (估计 %2) - + %1% Remaining 剩余 %1% - - - + + + Workspace %1/%2 工作区 %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 返回 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 30601151..1ac34c18 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 @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 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 @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back 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 30601151..1ac34c18 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_zu.ts @@ -9,22 +9,22 @@ - + Launch %1 - + Open %1 - + Select Application - + Name: @@ -32,18 +32,18 @@ AppLauncherPlugin - - + + Click to Set - + Select Application - + Name: @@ -56,82 +56,82 @@ - + Manage Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Applications @@ -240,27 +240,27 @@ - + Pin to Desktop - + Remove from Favorites - + Add to Favorites - + Remove from Quicklaunch - + Add to Quicklaunch @@ -286,87 +286,87 @@ - + Browse Files - + Install Applications - + Control Panel - + Multimedia - + Development - + Education - + Games - + Graphics - + Network - + Office - + Science - + Settings - + System - + Utility - + Wine - + Unsorted - + Leave @@ -374,12 +374,12 @@ LBattery - + %1 % (Charging) - + %1 % (%2 Remaining) @@ -400,27 +400,32 @@ LDPlugin - + + Launch Item + + + + Start Moving Item - + Start Resizing Item - + Increase Item Sizes - + Decrease Item Sizes - + Remove Item @@ -428,42 +433,42 @@ LDeskBarPlugin - + Favorite Applications - + Favorite Folders - + Audio - + Video - + Pictures - + Other Files - + Documents - + Favorite Files @@ -471,32 +476,32 @@ LDesktop - + Window List - + Lumina Desktop - + Workspace %1 - + Terminal - + Browse Files - + Leave @@ -964,12 +969,12 @@ - + Control Panel - + About Lumina @@ -1057,34 +1062,34 @@ - + Apply Updates? - + You have system updates waiting to be applied! Do you wish to install them now? - + %1% (Plugged In) - + %1% (%2 Estimated) - + %1% Remaining - - - + + + Workspace %1/%2 @@ -1140,7 +1145,7 @@ UserItemWidget - + Go Back diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts index 98a8182d..45d73ebd 100644 --- a/src-qt5/core/lumina-info/i18n/lumina-info_el.ts +++ b/src-qt5/core/lumina-info/i18n/lumina-info_el.ts @@ -1,95 +1,95 @@ - + MainUI - + Lumina Desktop Information Πληροφορίες Γραφικού Περιβάλλοντος Lumina - + General Γενικά - + Source Repository Πηγή Αποθετηρίου - + Lumina Website Η Ιστοσελίδα του Lumina - + Bug Reports Aναφορές Σφαλμάτων (Bugs) - + Desktop Version: Έκδοση Γραφικού Περιβάλλοντος - + OS Build: Έκδοση Δόμησης OS: - + Qt Version: Έκδοση Qt: - + Ask the Community Ρωτήστε την Κοινότητα - + View Information Προβολή Πληροφοριών - + License Άδεια Χρήσης - + Acknowledgements Ευχαριστίες - + Project Lead: Επικεφαλής του Έργου: - - <a href="https://github.com/beanpole135">Ken Moore</a> - <a href="https://github.com/beanpole135"><a href="https://github.com/beanpole135">Ken Moore</a></a> + + <a href="https://github.com/beanpole135">Ken Moore</a> + <a href="https://github.com/beanpole135"><a href="https://github.com/beanpole135">Ken Moore</a></a> - + Contributors: Συντελεστές: - + Sponsors: Χορηγοί - - <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> - <a href="https://github.com/pcbsd/lumina/graphs/contributors">Άνοιγμα στον Φυλλομετρητή (Browser)<a> + + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Open in web browser<a> + <a href="https://github.com/pcbsd/lumina/graphs/contributors">Άνοιγμα στον Φυλλομετρητή (Browser)<a> - + Close Κλείσιμο diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts index b886b049..f86f8764 100644 --- a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts +++ b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts @@ -1,4 +1,4 @@ - + diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_af.ts b/src-qt5/core/lumina-open/i18n/lumina-open_af.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_af.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_af.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ar.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ar.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ar.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ar.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_az.ts b/src-qt5/core/lumina-open/i18n/lumina-open_az.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_az.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_az.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_bg.ts b/src-qt5/core/lumina-open/i18n/lumina-open_bg.ts index e3f0e587..25ba4761 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_bg.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_bg.ts @@ -129,7 +129,7 @@ Други - + Find Application Binary Намиране на изпълнимия файл на програма @@ -142,19 +142,19 @@ Грешка във файла - - + + Audio Volume %1% Сила на звука %1% - - + + Screen Brightness %1% Яркост на екрана %1% - + Invalid file or URL: %1 Невалиден файл или адрес: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_bn.ts b/src-qt5/core/lumina-open/i18n/lumina-open_bn.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_bn.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_bn.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_bs.ts b/src-qt5/core/lumina-open/i18n/lumina-open_bs.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_bs.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_bs.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ca.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ca.ts index 231363c5..8670ea23 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ca.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ca.ts @@ -129,7 +129,7 @@ Altres - + Find Application Binary Troba el binari de l'aplicació @@ -142,19 +142,19 @@ Error del fitxer - - + + Audio Volume %1% Volum de l'àudio: %1% - - + + Screen Brightness %1% Brillantor de la pantalla: %1% - + Invalid file or URL: %1 Fitxer o URL no vàlids: %1 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 4ac14eef..ee7fa68d 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_cs.ts @@ -129,7 +129,7 @@ Ostatní - + Find Application Binary Najít soubor aplikace @@ -142,19 +142,19 @@ Chyba souboru - - + + Audio Volume %1% Hlasitost zvuku %1% - - + + Screen Brightness %1% Jas obrazovky %1% - + Invalid file or URL: %1 Neplatný soubor nebo URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_cy.ts b/src-qt5/core/lumina-open/i18n/lumina-open_cy.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_cy.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_cy.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_da.ts b/src-qt5/core/lumina-open/i18n/lumina-open_da.ts index d1c4e2f9..2024cb1e 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_da.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_da.ts @@ -129,7 +129,7 @@ Andre - + Find Application Binary Find binær program fil @@ -142,19 +142,19 @@ Filfejl - - + + Audio Volume %1% Lyd Volume %1% - - + + Screen Brightness %1% skærm-lysstyrke %1% - + Invalid file or URL: %1 Ugyldig fil eller URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_de.ts b/src-qt5/core/lumina-open/i18n/lumina-open_de.ts index 524a9b9b..a5734223 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_de.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_de.ts @@ -129,7 +129,7 @@ Andere - + Find Application Binary Ausführbare Anwendung finden @@ -142,19 +142,19 @@ Dateifehler - - + + Audio Volume %1% Lautstärke %1% - - + + Screen Brightness %1% Bildschirmhelligkeit %1% - + Invalid file or URL: %1 Ungültige Datei oder URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_el.ts b/src-qt5/core/lumina-open/i18n/lumina-open_el.ts index 39225222..60533170 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_el.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_el.ts @@ -1,135 +1,135 @@ - + LFileDialog - + Open With... Άνοιγμα με... - + Preferred Προτιμώμενη - + Available Διαθέσιμα - + Custom Προσαρμοσμένο - + Binary Location Τοποθεσία Εφαρμογής - + Find Εύρεση - + Set this application as the default Ορισμός αυτής της εφαρμογής ως προεπιλεγμένης - + OK ΟΚ - + Cancel Ακύρωση - + (Email Link) (Σύνδεσμος Ηλεκτρονικού Ταχυδρομείου) - + (Internet URL - %1) (URL Διαδικτύου - %1) - + Audio Ήχος - + Video Βίντεο - + Multimedia Πολυμέσα - + Development Ανάπτυξη - + Education Εκπαίδευση - + Game Παιχνίδια - + Graphics Γραφικά - + Network Δίκτυο - + Office Σουΐτα Γραφείου - + Science Επιστήμη - + Settings Ρυθμίσεις - + System Σύστημα - + Utilities Εργαλεία - + Other Άλλο - + Find Application Binary Βρείτε Εκτελέσιμη Εφαρμογή @@ -137,69 +137,69 @@ QObject - + File Error Σφάλμα Αρχείου - - + + Audio Volume %1% Ένταση ήχου %1% - - + + Screen Brightness %1% Φωτεινότητα οθόνης %1% - + Invalid file or URL: %1 Μη έγκυρο αρχείο ή URL: %1 - + File could not be opened: %1 Αδυναμία ανοίγματος αρχείου: %1 - + Application shortcut is missing the launching information (malformed shortcut): %1 Οι πληροφορίες εκτέλεσης λείπουν απο την συντόμευση της εφαρμογής (Δυσλειτουργία συντόμευσης): %1 - + URL shortcut is missing the URL: %1 Απο την URL συντόμευση λείπει το URL: %1 - + Directory shortcut is missing the path to the directory: %1 Απο την συντόμευση του καταλόγου λείπει η διαδρομή προς τον κατάλογο: %1 - + Unknown type of shortcut : %1 Άγνωστος τύπος συντόμευσης: %1 - + Binary Missing Το Εκτελέσιμο λείπει - - Could not find "%1". Please ensure it is installed first. - Αδυναμία έυρεσης "%1". Παρακαλώ βεβαιωθείτε ότι έχει ήδη εγκατασταθεί. + + Could not find "%1". Please ensure it is installed first. + Αδυναμία έυρεσης "%1". Παρακαλώ βεβαιωθείτε ότι έχει ήδη εγκατασταθεί. - + Application Error Πρόβλημα Εφαρμογής - + The following application experienced an error and needed to close: Η παρακάτω εφαρμογή αντιμετώπισε ένα σφάλμα και πρέπει να τερματιστεί: diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_en_GB.ts b/src-qt5/core/lumina-open/i18n/lumina-open_en_GB.ts index 9221642a..7bd79543 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_en_GB.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_en_GB.ts @@ -129,7 +129,7 @@ Other - + Find Application Binary Find Application Binary @@ -142,19 +142,19 @@ File Error - - + + Audio Volume %1% Audio Volume %1% - - + + Screen Brightness %1% Screen Brightness %1% - + Invalid file or URL: %1 Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_en_ZA.ts b/src-qt5/core/lumina-open/i18n/lumina-open_en_ZA.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_en_ZA.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_en_ZA.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_es.ts b/src-qt5/core/lumina-open/i18n/lumina-open_es.ts index fbf408fa..156a75cb 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_es.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_es.ts @@ -129,7 +129,7 @@ Otros - + Find Application Binary Buscar Binario de la Aplicación @@ -142,19 +142,19 @@ Error de Archivo - - + + Audio Volume %1% Volúmen del Sonido %1% - - + + Screen Brightness %1% Brillo de Pantalla %1% - + Invalid file or URL: %1 Archivo o URL no válido(a): %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_et.ts b/src-qt5/core/lumina-open/i18n/lumina-open_et.ts index 11bb7b01..49b40025 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_et.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_et.ts @@ -129,7 +129,7 @@ Muu - + Find Application Binary Leia programm @@ -142,19 +142,19 @@ Faili viga - - + + Audio Volume %1% Helitugevus %1% - - + + Screen Brightness %1% Ekraani heledus %1% - + Invalid file or URL: %1 Vigane fail või aadress: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_eu.ts b/src-qt5/core/lumina-open/i18n/lumina-open_eu.ts index c4cbdb5b..e08875c8 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_eu.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_eu.ts @@ -129,7 +129,7 @@ Beste bat - + Find Application Binary Azplikazioko binarioa bilatu @@ -142,19 +142,19 @@ Fitxategiko akatsa - - + + Audio Volume %1% Audioaren bolumena %1% - - + + Screen Brightness %1% Pantailaren distira %1% - + Invalid file or URL: %1 Fitxategi edo URL okerra: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_fa.ts b/src-qt5/core/lumina-open/i18n/lumina-open_fa.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_fa.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_fa.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts b/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts index f39d8d2a..d030d644 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts @@ -1,4 +1,4 @@ - + @@ -129,7 +129,7 @@ Muuta - + Find Application Binary Etsi ohjelmatiedosto @@ -142,19 +142,19 @@ Tiedostovirhe - - + + Audio Volume %1% Äänenvoimakkuus %1 % - - + + Screen Brightness %1% Näytön kirkkaus %1 % - + Invalid file or URL: %1 Virheellinen tiedosto tai verkko-osoite: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_fr.ts b/src-qt5/core/lumina-open/i18n/lumina-open_fr.ts index e6d3d193..c9d40e66 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_fr.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_fr.ts @@ -129,7 +129,7 @@ Autre - + Find Application Binary Rechcher les Applications binaires @@ -142,19 +142,19 @@ Erreur de fichier - - + + Audio Volume %1% Volume audio %1% - - + + Screen Brightness %1% Luminosité de l'écran %1% - + Invalid file or URL: %1 Fichier ou URL Invalide: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_fr_CA.ts b/src-qt5/core/lumina-open/i18n/lumina-open_fr_CA.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_fr_CA.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_fr_CA.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_gl.ts b/src-qt5/core/lumina-open/i18n/lumina-open_gl.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_gl.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_gl.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_he.ts b/src-qt5/core/lumina-open/i18n/lumina-open_he.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_he.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_he.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_hi.ts b/src-qt5/core/lumina-open/i18n/lumina-open_hi.ts index 251246c3..811ddbc3 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_hi.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_hi.ts @@ -129,7 +129,7 @@ अन्य - + Find Application Binary एप्लीकेशन बाइनरी खोज @@ -142,19 +142,19 @@ फाइल त्रुटि - - + + Audio Volume %1% ऑडियो ध्वनि %1% - - + + Screen Brightness %1% स्क्रीन चमक %1% - + Invalid file or URL: %1 अवैध फाइल या यूआरएल:%1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_hr.ts b/src-qt5/core/lumina-open/i18n/lumina-open_hr.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_hr.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_hr.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_hu.ts b/src-qt5/core/lumina-open/i18n/lumina-open_hu.ts index 584e863a..1e9edcf7 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_hu.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_hu.ts @@ -1,135 +1,135 @@ - + LFileDialog - + Open With... Megnyitás ezzel... - + Preferred Preferált - + Available Elérhető - + Custom Egyéni - + Binary Location Futtatható program helye - + Find Keresés - + Set this application as the default Alkalmazás beállítása alapértelmezettnek - + OK OK - + Cancel Mégsem - + (Email Link) (E-mail link) - + (Internet URL - %1) (Internet URL - %1) - + Audio Audió - + Video Videó - + Multimedia Multimédia - + Development Fejlesztés - + Education Oktatás - + Game Játék - + Graphics Grafika - + Network Hálózat - + Office Iroda - + Science Tudomány - + Settings Beállítások - + System Rendszer - + Utilities Segédeszközök - + Other Egyéb - + Find Application Binary Futtatható alkalmazás keresése @@ -137,69 +137,69 @@ QObject - + File Error Fájl hiba - - + + Audio Volume %1% Hangerő: %1% - - + + Screen Brightness %1% Képernyő fényessége: %1% - + Invalid file or URL: %1 Érvénytelen fájl vagy URL: %1 - + File could not be opened: %1 A fájl nem nyitható meg: %1 - + Application shortcut is missing the launching information (malformed shortcut): %1 a program hivatkozásában hiányosak az indítási adatok : %1 - + URL shortcut is missing the URL: %1 URL hivatkozás hiányos ebben: %1 - + Directory shortcut is missing the path to the directory: %1 Könyvtár hivatkozás hiányos ebben az útvonalban: %1 - + Unknown type of shortcut : %1 Ismeretlen hivatkozás: %1 - + Binary Missing Hiányos binary - - Could not find "%1". Please ensure it is installed first. - Nem találom: "%1". Először győződj meg hogy telepítve van. + + Could not find "%1". Please ensure it is installed first. + Nem találom: "%1". Először győződj meg hogy telepítve van. - + Application Error Alkalmazás hiba - + The following application experienced an error and needed to close: Az alkalmazás hibát észlelt, és bezárandó: diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_id.ts b/src-qt5/core/lumina-open/i18n/lumina-open_id.ts index 3d131897..538f93ea 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_id.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_id.ts @@ -129,7 +129,7 @@ Yang Lainnya - + Find Application Binary Cari Aplikasi Binari @@ -142,19 +142,19 @@ berkas error - - + + Audio Volume %1% Audio Volume %1% - - + + Screen Brightness %1% kecerahan layar %1% - + Invalid file or URL: %1 file yang tidak valid atau URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_is.ts b/src-qt5/core/lumina-open/i18n/lumina-open_is.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_is.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_is.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_it.ts b/src-qt5/core/lumina-open/i18n/lumina-open_it.ts index 176a5106..a6176cf6 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_it.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_it.ts @@ -129,7 +129,7 @@ Altro - + Find Application Binary Trova Binario Applicazione @@ -142,19 +142,19 @@ Errore File - - + + Audio Volume %1% Volume Suono %1% - - + + Screen Brightness %1% luminosità dello Schermo %1% - + Invalid file or URL: %1 File o URL Invalido: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ja.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ja.ts index 95bc1cf1..ab04d177 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ja.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ja.ts @@ -1,206 +1,206 @@ - + LFileDialog - + Open With... アプリケーションで開く... - + Preferred 推奨 - + Available 利用可能 - + Custom カスタム - + Binary Location バイナリーの場所 - + Find 検索 - + Set this application as the default このアプリケーションをいつも使用する - + OK OK - + Cancel キャンセル - + (Email Link) (電子メールリンク) - + (Internet URL - %1) (インターネット URL - %1) - + Audio オーディオ - + Video 動画 - + Multimedia マルチメディア - + Development 開発 - + Education 教育 - + Game ゲーム - + Graphics グラフィックス - + Network ネットワーク - + Office オフィス - + Science 科学 - + Settings 設定 - + System システム - + Utilities ユーティリティー - + Other その他 - + Find Application Binary - "Find"とあるが、ファイル指定ダイアログのタイトル + "Find"とあるが、ファイル指定ダイアログのタイトル アプリケーションのバイナリーを指定 QObject - + File Error ファイルエラー - - + + Audio Volume %1% 音声ボリューム %1% - - + + Screen Brightness %1% 画面の明るさ %1% - + Invalid file or URL: %1 無効なファイルまたはURL: %1 - + File could not be opened: %1 ファイルを開けません: %1 - + Application shortcut is missing the launching information (malformed shortcut): %1 アプリケーションショートカットの起動情報が失われています(無効なショートカット): %1 - + URL shortcut is missing the URL: %1 URL ショートカットの URL が失われています: %1 - + Directory shortcut is missing the path to the directory: %1 ディレクトリーショートカットのパス情報が失われています: %1 - + Unknown type of shortcut : %1 種類が不明なショートカットです: %1 - + Binary Missing バイナリーがありません - - Could not find "%1". Please ensure it is installed first. - "%1" が見つかりませんでした。まずそれがインストールされている事を確認してください。 + + Could not find "%1". Please ensure it is installed first. + "%1" が見つかりませんでした。まずそれがインストールされている事を確認してください。 - + Application Error アプリケーションエラー - + The following application experienced an error and needed to close: このアプリケーションでエラーが発生したため、閉じる必要があります: diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ka.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ka.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ka.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ka.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ko.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ko.ts index 17bcbedc..6a3878a7 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ko.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ko.ts @@ -129,7 +129,7 @@ 기타 - + Find Application Binary 프로그램 실행 파일 찾기 @@ -142,19 +142,19 @@ 파일 오류 - - + + Audio Volume %1% 오디오 볼륨 %1% - - + + Screen Brightness %1% 화면 밝기 %1% - + Invalid file or URL: %1 잘못된 파일이나 URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts b/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts index 12c2ae39..1132f0ad 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_lt.ts @@ -129,7 +129,7 @@ Kita - + Find Application Binary Rasti programos dvejetainę @@ -142,19 +142,19 @@ Failo klaida - - + + Audio Volume %1% Garso garsis %1% - - + + Screen Brightness %1% Ekrano ryškumas %1% - + Invalid file or URL: %1 Netinkamas failas ar URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_lv.ts b/src-qt5/core/lumina-open/i18n/lumina-open_lv.ts index 47698499..93768e72 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_lv.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_lv.ts @@ -129,7 +129,7 @@ Cits - + Find Application Binary Atrast lietotnes bināro failu @@ -142,19 +142,19 @@ Faila kļūda - - + + Audio Volume %1% Audio skaļums %1% - - + + Screen Brightness %1% Ekrāna spilgtums %1% - + Invalid file or URL: %1 Nederīgs fails vai URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_mk.ts b/src-qt5/core/lumina-open/i18n/lumina-open_mk.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_mk.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_mk.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_mn.ts b/src-qt5/core/lumina-open/i18n/lumina-open_mn.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_mn.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_mn.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ms.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ms.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ms.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ms.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_mt.ts b/src-qt5/core/lumina-open/i18n/lumina-open_mt.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_mt.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_mt.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_nb.ts b/src-qt5/core/lumina-open/i18n/lumina-open_nb.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_nb.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_nb.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_nl.ts b/src-qt5/core/lumina-open/i18n/lumina-open_nl.ts index 4b766740..cfbbad99 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_nl.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_nl.ts @@ -129,7 +129,7 @@ Overig - + Find Application Binary Uitvoerbaar applicatiebestand zoeken @@ -142,19 +142,19 @@ Bestandsfout - - + + Audio Volume %1% Audiovolume %1% - - + + Screen Brightness %1% Schermhelderheid %1% - + Invalid file or URL: %1 Ongeldig bestand of URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_pa.ts b/src-qt5/core/lumina-open/i18n/lumina-open_pa.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_pa.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_pa.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_pl.ts b/src-qt5/core/lumina-open/i18n/lumina-open_pl.ts index 38c35855..d8bbb828 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_pl.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_pl.ts @@ -129,7 +129,7 @@ Inne - + Find Application Binary Znajdź plik binarny aplikacji @@ -142,19 +142,19 @@ Błąd pliku - - + + Audio Volume %1% Głośność dźwięku %1% - - + + Screen Brightness %1% Jasność ekranu %1% - + Invalid file or URL: %1 Nieprawidłowy plik lub URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_pt.ts b/src-qt5/core/lumina-open/i18n/lumina-open_pt.ts index bf05c533..31e1ec4c 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_pt.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_pt.ts @@ -129,7 +129,7 @@ Outros - + Find Application Binary Encontrar binário da aplicação @@ -142,19 +142,19 @@ Erro no Arquivo - - + + Audio Volume %1% Volume do Som %1% - - + + Screen Brightness %1% Brilho da Tela %1% - + Invalid file or URL: %1 Arquivo ou URL Inválidos: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_pt_BR.ts b/src-qt5/core/lumina-open/i18n/lumina-open_pt_BR.ts index ca5588c3..bbf0d236 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_pt_BR.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_pt_BR.ts @@ -129,7 +129,7 @@ Outros - + Find Application Binary Encontrar binário do aplicativo @@ -142,19 +142,19 @@ Erro de arquivo - - + + Audio Volume %1% Volume do som %1% - - + + Screen Brightness %1% Brilho da tela %1% - + Invalid file or URL: %1 Arquivo ou URL inválido: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ro.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ro.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ro.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ro.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts index f27df3a4..1b7722be 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts @@ -1,135 +1,135 @@ - + LFileDialog - + Open With... Открыть с помощью... - + Preferred Предпочтительный - + Available Доступно - + Custom Пользовательские - + Binary Location Расположение Бинарного Приложения - + Find Найти - + Set this application as the default Использовать это приложение по умолчанию - + OK OK - + Cancel Отмена - + (Email Link) (Email адрес) - + (Internet URL - %1) (Интернет URL - %1) - + Audio Звук - + Video Видео - + Multimedia Мультимедиа - + Development Разработка - + Education Образование - + Game Игры - + Graphics Графика - + Network Сети - + Office Офис - + Science Наука - + Settings Настройки - + System Система - + Utilities Инструменты - + Other Разное - + Find Application Binary Найти Бинарное Приложение @@ -137,69 +137,69 @@ QObject - + File Error Ошибка Файла - - + + Audio Volume %1% Громкость %1% - - + + Screen Brightness %1% Яркость Экрана %1% - + Invalid file or URL: %1 Неверный файл или URL-адрес: %1 - + File could not be opened: %1 Файл не может быть открыт: %1 - + Application shortcut is missing the launching information (malformed shortcut): %1 В ярлыке приложения отсутствует информация для запуска (неверный формат ярлыка): %1 - + URL shortcut is missing the URL: %1 В ярлыке отсутствует URL-адрес: %1 - + Directory shortcut is missing the path to the directory: %1 В ярлыке отсутствует путь к папке: %1 - + Unknown type of shortcut : %1 Неизвестный тип ярлыка: %1 - + Binary Missing Приложение отсутствует - - Could not find "%1". Please ensure it is installed first. - Не найден "%1". Пожалуйста, убедитесь, что он установлен в первую очередь. + + Could not find "%1". Please ensure it is installed first. + Не найден "%1". Пожалуйста, убедитесь, что он установлен в первую очередь. - + Application Error Ошибка Приложения - + The following application experienced an error and needed to close: Следующее приложение вызвало ошибку и должно быть закрыто: diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sk.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sk.ts index bb2f6b43..d5af51c8 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sk.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sk.ts @@ -129,7 +129,7 @@ Ostatné - + Find Application Binary Nájsť binárne aplikácie @@ -142,19 +142,19 @@ Chyba súboru - - + + Audio Volume %1% Hlasitosť zvuku %1% - - + + Screen Brightness %1% Jas obrazovky %1% - + Invalid file or URL: %1 Neplatný súbor alebo URL %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sl.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sl.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sl.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sl.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sr.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sr.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sr.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sr.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts index 2bc08ed2..d1b996fe 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sv.ts @@ -1,135 +1,135 @@ - + LFileDialog - + Open With... Öppna med... - + Preferred Föredras - + Available Tillgänglig - + Custom Anpassad - + Binary Location Binärens Plats - + Find Hitta - + Set this application as the default Sätt detta program som standard - + OK OK - + Cancel Avbryt - + (Email Link) (Email Länk) - + (Internet URL - %1) (Internet URL - %1) - + Audio Ljud - + Video Video - + Multimedia Multimedia - + Development Utveckling - + Education Utbildning - + Game Spel - + Graphics Grafik - + Network Nätverk - + Office Kontorsprogram - + Science Vetenskap - + Settings Inställningar - + System System - + Utilities Verktyg - + Other Annat - + Find Application Binary Hitta Programmets Binär @@ -137,69 +137,69 @@ QObject - + File Error Filfel - - + + Audio Volume %1% Ljudvolym %1% - - + + Screen Brightness %1% Skärmljusstyrka %1% - + Invalid file or URL: %1 Ogiltig fil eller URL %1 - + File could not be opened: %1 Filen kunde inte öppnas: %1 - + Application shortcut is missing the launching information (malformed shortcut): %1 Program genväg saknar startinformation (missbildad genväg): %1 - + URL shortcut is missing the URL: %1 URL genväg saknas URL: %1 - + Directory shortcut is missing the path to the directory: %1 Genvägen till katalogen saknar sökvägen till katalogen :%1 - + Unknown type of shortcut : %1 Okänd typ av genväg: %1 - + Binary Missing Binär saknas - - Could not find "%1". Please ensure it is installed first. - Kunde inte hitta "%1". Se till att du har detta programmet installerat först. + + Could not find "%1". Please ensure it is installed first. + Kunde inte hitta "%1". Se till att du har detta programmet installerat först. - + Application Error Program fel - + The following application experienced an error and needed to close: Följande program upplevde ett fel och behövde stängas: diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_sw.ts b/src-qt5/core/lumina-open/i18n/lumina-open_sw.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_sw.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_sw.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ta.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ta.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_ta.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_ta.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_tg.ts b/src-qt5/core/lumina-open/i18n/lumina-open_tg.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_tg.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_tg.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_th.ts b/src-qt5/core/lumina-open/i18n/lumina-open_th.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_th.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_th.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_tr.ts b/src-qt5/core/lumina-open/i18n/lumina-open_tr.ts index 971f4bf0..29e69fb0 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_tr.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_tr.ts @@ -129,7 +129,7 @@ Diğer - + Find Application Binary Uygulama İkilisi Bul @@ -142,19 +142,19 @@ Dosya Hatası - - + + Audio Volume %1% Ses Düzeyi %1% - - + + Screen Brightness %1% Ekran Parlaklığı %1% - + Invalid file or URL: %1 Geçersiz Dosya ya da URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_uk.ts b/src-qt5/core/lumina-open/i18n/lumina-open_uk.ts index ee11e1e3..9d39b5c5 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_uk.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_uk.ts @@ -129,7 +129,7 @@ Різне - + Find Application Binary Знайти бінарну програму @@ -142,19 +142,19 @@ Помилка файлу - - + + Audio Volume %1% Гучність звуку %1% - - + + Screen Brightness %1% Яскравість екрану %1% - + Invalid file or URL: %1 Невірний файл або URL-адреса: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_uz.ts b/src-qt5/core/lumina-open/i18n/lumina-open_uz.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_uz.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_uz.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_vi.ts b/src-qt5/core/lumina-open/i18n/lumina-open_vi.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_vi.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_vi.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts b/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts index 204eea08..36407ad8 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_zh_CN.ts @@ -129,7 +129,7 @@ 其他 - + Find Application Binary 寻找二进制应用程序 @@ -142,19 +142,19 @@ 文件错误 - - + + Audio Volume %1% 音频音量 %1% - - + + Screen Brightness %1% 屏幕亮度 %1% - + Invalid file or URL: %1 无效的文件或网址：%1% diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_zh_HK.ts b/src-qt5/core/lumina-open/i18n/lumina-open_zh_HK.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_zh_HK.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_zh_HK.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_zh_TW.ts b/src-qt5/core/lumina-open/i18n/lumina-open_zh_TW.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_zh_TW.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_zh_TW.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_zu.ts b/src-qt5/core/lumina-open/i18n/lumina-open_zu.ts index d01c2632..e92c3176 100644 --- a/src-qt5/core/lumina-open/i18n/lumina-open_zu.ts +++ b/src-qt5/core/lumina-open/i18n/lumina-open_zu.ts @@ -129,7 +129,7 @@ - + Find Application Binary @@ -142,19 +142,19 @@ - - + + Audio Volume %1% - - + + Screen Brightness %1% - + Invalid file or URL: %1 diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ca.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ca.ts index 8b578974..106fcc87 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ca.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ca.ts @@ -1,40 +1,40 @@ - + LLockScreen - + Form Formulari - + Password Contrasenya - + Unlock Session Desbloqueja la sessió - + Locked by: %1 Bloquejat per %1 - + Too Many Failures Massa fallades - + Wait %1 Minutes Espereu %1 minuts - + Failed Attempts: %1 Intents fallits: %1 diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_el.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_el.ts index 29a9eaf0..492b417b 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_el.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_el.ts @@ -1,40 +1,40 @@ - + LLockScreen - + Form Μορφή - + Password Κωδικός - + Unlock Session Ξεκλείδωμα Συνεδρίας - + Locked by: %1 Κλειδώθηκε απο: %1 - + Too Many Failures Πάρα Πολλές Αποτυχίες - + Wait %1 Minutes Περιμένετε %1 Λεπτά - + Failed Attempts: %1 Αποτυχημένες προσπάθειες: %1 diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts index e5078580..f4441b5f 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts @@ -1,10 +1,10 @@ - + LLockScreen - + Form از diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts index d8341f4d..a9ecb8f8 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts @@ -1,10 +1,10 @@ - + LLockScreen - + Form Lomake diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ja.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ja.ts index c13ed916..52c9b6ae 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ja.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ja.ts @@ -1,40 +1,40 @@ - + LLockScreen - + Form Form - + Password パスワード - + Unlock Session セッションのロックを解除 - + Locked by: %1 %1 によってロックされました - + Too Many Failures 認証に続けて失敗しました - + Wait %1 Minutes %1 分お待ちください - + Failed Attempts: %1 失敗した回数: %1 diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts index 84739b42..e98e4f5e 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts @@ -1,40 +1,40 @@ - + LLockScreen - + Form Forma - + Password Slaptažodis - + Unlock Session Atrakinti seansą - + Locked by: %1 Užrakino: %1 - + Too Many Failures Per daug nesėkmių - + Wait %1 Minutes Palaukite %1 minutes - + Failed Attempts: %1 Nepavykusių bandymų: %1 diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts index 99de4b6a..659116b8 100644 --- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts +++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts @@ -1,40 +1,40 @@ - + LLockScreen - + Form Экран блокировки - + Password Пароль - + Unlock Session Разблокировать сессию - + Locked by: %1 Заблокировано: %1 - + Too Many Failures Слишком много неудач - + Wait %1 Minutes Подождите %1 минут(ы) - + Failed Attempts: %1 Неудачные попытки: %1 -- cgit From 85353ba9941d7971d19698dca54bdc946b4ec9e9 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 21 Oct 2016 10:48:55 -0400 Subject: Tag version 1.1.0 in the source tree --- src-qt5/core/libLumina/LuminaUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp index 9fc4e6b0..d74ca864 100644 --- a/src-qt5/core/libLumina/LuminaUtils.cpp +++ b/src-qt5/core/libLumina/LuminaUtils.cpp @@ -54,7 +54,7 @@ inline QStringList ProcessRun(QString cmd, QStringList args){ // LUtils Functions //============= QString LUtils::LuminaDesktopVersion(){ - QString ver = "1.0.1"; + QString ver = "1.1.0"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif -- cgit From 2119280e7c6c851131764c1287b23653f7a3d4ee Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 21 Oct 2016 10:50:33 -0400 Subject: Tag version 1.1.1 within the master branch. --- src-qt5/core/libLumina/LuminaUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp index d74ca864..0fb44ff1 100644 --- a/src-qt5/core/libLumina/LuminaUtils.cpp +++ b/src-qt5/core/libLumina/LuminaUtils.cpp @@ -54,7 +54,7 @@ inline QStringList ProcessRun(QString cmd, QStringList args){ // LUtils Functions //============= QString LUtils::LuminaDesktopVersion(){ - QString ver = "1.1.0"; + QString ver = "1.1.1"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif -- cgit From ef338ceb9dc6826746a58d903f86200a4da81acb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 21 Oct 2016 14:20:15 -0400 Subject: If a .desktop file is given to launch, be more specific with the error when the file is invalid. --- src-qt5/core/lumina-open/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-open/main.cpp b/src-qt5/core/lumina-open/main.cpp index 68d2575b..b411394c 100644 --- a/src-qt5/core/lumina-open/main.cpp +++ b/src-qt5/core/lumina-open/main.cpp @@ -261,7 +261,7 @@ void getCMD(int argc, char ** argv, QString& binary, QString& args, QString& pat if(extension=="desktop" && !showDLG){ XDGDesktop DF(inFile); if(!DF.isValid()){ - ShowErrorDialog( argc, argv, QString(QObject::tr("File could not be opened: %1")).arg(inFile) ); + ShowErrorDialog( argc, argv, QString(QObject::tr("Application entry is invalid: %1")).arg(inFile) ); } switch(DF.type){ case XDGDesktop::APP: -- cgit From 262e9ff5395e41abc567644530278123f357eee8 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 21 Oct 2016 14:29:15 -0400 Subject: For desktop icons, only check if there is a name to decide when to show it. Let the launcher find any problems with it and alert the user at that time. --- .../lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 e9ef78cb..708355cd 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -40,7 +40,7 @@ void AppLauncherPlugin::loadButton(){ QString txt; if(path.endsWith(".desktop") && ok){ XDGDesktop file(path); - ok = file.isValid(); + ok = !file.name.isEmpty(); if(!ok){ button->setWhatsThis(""); button->setIcon( QIcon(LXDG::findIcon("quickopen-file","").pixmap(QSize(icosize,icosize)).scaledToHeight(icosize, Qt::SmoothTransformation) ) ); -- cgit From 0032544d7d9607ad544dd427ea1bd012291ff962 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 24 Oct 2016 10:55:08 -0400 Subject: Fix the "sticky" status on the wallpaper widgets. --- src-qt5/core/lumina-desktop/LDesktop.cpp | 1 + src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index 8b1bd825..1a11899d 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -230,6 +230,7 @@ void LDesktop::InitDesktop(){ else if(grid<0){ grid = 100; } bgDesktop->SetIconSize( grid ); bgDesktop->setContextMenuPolicy(Qt::CustomContextMenu); + //LSession::handle()->XCB->SetAsDesktop(bgDesktop->winId()); connect(bgDesktop, SIGNAL(PluginRemovedByUser(QString)), this, SLOT(RemoveDeskPlugin(QString)) ); connect(bgDesktop, SIGNAL(IncreaseIcons()), this, SLOT(IncreaseDesktopPluginIcons()) ); connect(bgDesktop, SIGNAL(DecreaseIcons()), this, SLOT(DecreaseDesktopPluginIcons()) ); diff --git a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp index 592f3481..18126dfa 100644 --- a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp +++ b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.cpp @@ -29,6 +29,7 @@ LDesktopPluginSpace::LDesktopPluginSpace() : QWidget(){ TopToBottom = true; GRIDSIZE = 100.0; //default value if not set plugsettings = LSession::handle()->DesktopPluginSettings(); + LSession::handle()->XCB->SetAsDesktop(this->winId()); //this->setWindowOpacity(0.0); } -- cgit From af6ce6ea4f6b62d0b09b0b9ae2f8d640e828802a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 25 Oct 2016 11:54:57 -0400 Subject: Add PulseAudio support into the FreeBSD backend if a PICO session is detected. --- src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp | 77 ++++++++++++++++++----------- src-qt5/core/libLumina/LuminaXDG.cpp | 1 + src-qt5/core/libLumina/LuminaXDG.h | 3 ++ 3 files changed, 51 insertions(+), 30 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp index 2bffb5a1..b9346565 100644 --- a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp +++ b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp @@ -97,13 +97,14 @@ void LOS::setScreenBrightness(int percent){ //Run the command(s) bool success = false; // - try hardware setting first (TrueOS || or intel_backlight) - if( LUtils::isValidBinary("pc-sysconfig") ){ + bool remoteSession = !QString(getenv("PICO_CLIENT_LOGIN")).isEmpty(); + if( LUtils::isValidBinary("pc-sysconfig") && !remoteSession){ //Use TrueOS tool (direct sysctl control) QString ret = LUtils::getCmdOutput("pc-sysconfig", QStringList() <<"setscreenbrightness "+QString::number(percent)).join(""); success = ret.toLower().contains("success"); qDebug() << "Set hardware brightness:" << percent << success; } - if( !success && LUtils::isValidBinary("intel_backlight")){ + if( !success && LUtils::isValidBinary("intel_backlight") && !remoteSession){ //Use the intel_backlight utility (only for Intel mobo/hardware?) if(0== LUtils::runCmd("intel_backlight", QStringList() <100){percent=100;} - QString info = LUtils::getCmdOutput("mixer -S vol").join(":").simplified(); //ignores any other lines - if(!info.isEmpty()){ - int L = info.section(":",1,1).toInt(); - int R = info.section(":",2,2).toInt(); - int diff = L-R; - if((percent == L) && (L==R)){ return; } //already set to that volume - if(diff<0){ R=percent; L=percent+diff; } //R Greater - else{ L=percent; R=percent-diff; } //L Greater or equal - //Check bounds - if(L<0){L=0;}else if(L>100){L=100;} - if(R<0){R=0;}else if(R>100){R=100;} - //Run Command - audiovolume = percent; //save for checking later - LUtils::runCmd("mixer vol "+QString::number(L)+":"+QString::number(R)); - LUtils::writeFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/.currentvolume", QStringList() << QString::number(percent), true); - } + bool remoteSession = !QString(getenv("PICO_CLIENT_LOGIN")).isEmpty(); + if(remoteSession){ + LUtils::runCmd(QString("pactl set-sink-volume @DEFAULT_SINK@ ")+QString::number(percent)+"%"); + }else{ + QString info = LUtils::getCmdOutput("mixer -S vol").join(":").simplified(); //ignores any other lines + if(!info.isEmpty()){ + int L = info.section(":",1,1).toInt(); + int R = info.section(":",2,2).toInt(); + int diff = L-R; + if((percent == L) && (L==R)){ return; } //already set to that volume + if(diff<0){ R=percent; L=percent+diff; } //R Greater + else{ L=percent; R=percent-diff; } //L Greater or equal + //Check bounds + if(L<0){L=0;}else if(L>100){L=100;} + if(R<0){R=0;}else if(R>100){R=100;} + //Run Command + LUtils::runCmd("mixer vol "+QString::number(L)+":"+QString::number(R)); + } + } + audiovolume = percent; //save for checking later + LUtils::writeFile(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/.currentvolume", QStringList() << QString::number(percent), true); } //Change the current volume a set amount (+ or -) void LOS::changeAudioVolume(int percentdiff){ - QString info = LUtils::getCmdOutput("mixer -S vol").join(":").simplified(); //ignores any other lines - if(!info.isEmpty()){ - int L = info.section(":",1,1).toInt() + percentdiff; - int R = info.section(":",2,2).toInt() + percentdiff; - //Check bounds - if(L<0){L=0;}else if(L>100){L=100;} - if(R<0){R=0;}else if(R>100){R=100;} - //Run Command - LUtils::runCmd("mixer vol "+QString::number(L)+":"+QString::number(R)); + bool remoteSession = !QString(getenv("PICO_CLIENT_LOGIN")).isEmpty(); + if(remoteSession){ + LUtils::runCmd(QString("pactl set-sink-volume @DEFAULT_SINK@ ")+((percentdiff>0)?"+" : "") + QString::number(percentdiff)+"%"); + }else{ + QString info = LUtils::getCmdOutput("mixer -S vol").join(":").simplified(); //ignores any other lines + if(!info.isEmpty()){ + int L = info.section(":",1,1).toInt() + percentdiff; + int R = info.section(":",2,2).toInt() + percentdiff; + //Check bounds + if(L<0){L=0;}else if(L>100){L=100;} + if(R<0){R=0;}else if(R>100){R=100;} + //Run Command + LUtils::runCmd("mixer vol "+QString::number(L)+":"+QString::number(R)); + } } } diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index 8ae77ea6..b0d2edd9 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -22,6 +22,7 @@ XDGDesktop::XDGDesktop(QString file, QObject *parent) : QObject(parent){ isHidden=false; useTerminal=false; startupNotify=false; + useVGL = false; type = XDGDesktop::BAD; filePath = file; exec = tryexec = ""; // just to make sure this is initialized diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h index acb688ff..1c86cedb 100644 --- a/src-qt5/core/libLumina/LuminaXDG.h +++ b/src-qt5/core/libLumina/LuminaXDG.h @@ -64,6 +64,9 @@ public: QStringList actionList, mimeList, catList, keyList; bool useTerminal, startupNotify; QList actions; + //Type 1 Extensions for Lumina (Optional) + bool useVGL; //X-VGL + //Type 2 (LINK) variables QString url; -- cgit From f29b8dadbf51ed7eac584f524f3bf05a6a66de16 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 27 Oct 2016 08:26:22 -0400 Subject: Add the beginnings of the new RandR xcb backend to Lumina --- src-qt5/core/libLumina/LuminaRandR.cpp | 1 + src-qt5/core/libLumina/LuminaRandR.h | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src-qt5/core/libLumina/LuminaRandR.cpp create mode 100644 src-qt5/core/libLumina/LuminaRandR.h (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaRandR.cpp b/src-qt5/core/libLumina/LuminaRandR.cpp new file mode 100644 index 00000000..eefc5aa8 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaRandR.cpp @@ -0,0 +1 @@ +#include "LuminaRandR.h" diff --git a/src-qt5/core/libLumina/LuminaRandR.h b/src-qt5/core/libLumina/LuminaRandR.h new file mode 100644 index 00000000..3cdff651 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaRandR.h @@ -0,0 +1,35 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This class governs all the xcb/randr interactions +// and provides simpler Qt-based functions for use elsewhere +//=========================================== + +//Qt includes +#include + +#include "xcb/randr.h" + +class outputDevice{ +public: + QString id; //output ID + bool enabled; + //Monitor Geometry + QPoint geom; //geometry of monitor within session + //Monitor Resolution + QSize cRes; //current resolution of the monitor (could be different from geom.size() if panning is enabled) + QList availRes; //available resolutions supported by the monitor + //Refresh Rate + int cHz; //current refresh rate + QList availHz; //available refresh rates + //Expand this later to include: + // panning (current/possible) + // rotation (current/possible) + + //FUNCTIONS + + //Modification +}; -- cgit From b486021b3dab405161082dbbd0b862a7da0e4c0c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 2 Nov 2016 09:41:07 -0400 Subject: Add a new sessionsettings flag: Qt5_theme_engine= This will allow the user to set some global Qt5 theme engine (such as qt5ct), and activate it for the entire session. --- src-qt5/core/lumina-desktop/LSession.cpp | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 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 8c8562d4..87f270ea 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -150,13 +150,17 @@ void LSession::setupSession(){ if(DEBUG){ qDebug() << " - Init QFileSystemWatcher:" << timer->elapsed();} watcher = new QFileSystemWatcher(this); QString confdir = sessionsettings->fileName().section("/",0,-2); - watcher->addPath( sessionsettings->fileName() ); - watcher->addPath( confdir+"/desktopsettings.conf" ); - watcher->addPath( confdir+"/fluxbox-init" ); - watcher->addPath( confdir+"/fluxbox-keys" ); + watcherChange(sessionsettings->fileName() ); + watcherChange( confdir+"/desktopsettings.conf" ); + watcherChange( confdir+"/fluxbox-init" ); + watcherChange( confdir+"/fluxbox-keys" ); + //watcher->addPath( sessionsettings->fileName() ); + //watcher->addPath( confdir+"/desktopsettings.conf" ); + //watcher->addPath( confdir+"/fluxbox-init" ); + //watcher->addPath( confdir+"/fluxbox-keys" ); //Try to watch the localized desktop folder too - if(QFile::exists(QDir::homePath()+"/"+tr("Desktop"))){ watcher->addPath( QDir::homePath()+"/"+tr("Desktop") ); } - watcher->addPath( QDir::homePath()+"/Desktop" ); + if(QFile::exists(QDir::homePath()+"/"+tr("Desktop"))){ watcherChange( QDir::homePath()+"/"+tr("Desktop") ); } + watcherChange( QDir::homePath()+"/Desktop" ); //connect internal signals/slots //connect(this->desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(screensChanged()) ); @@ -321,8 +325,17 @@ void LSession::reloadIconTheme(){ void LSession::watcherChange(QString changed){ if(DEBUG){ qDebug() << "Session Watcher Change:" << changed; } //if(changed.endsWith("fluxbox-init") || changed.endsWith("fluxbox-keys")){ refreshWindowManager(); } - if(changed.endsWith("sessionsettings.conf") ){ sessionsettings->sync(); emit SessionConfigChanged(); } - else if(changed.endsWith("desktopsettings.conf") ){ emit DesktopConfigChanged(); } + if(changed.endsWith("sessionsettings.conf") ){ + sessionsettings->sync(); + //qDebug() << "Session Settings Changed"; + if(sessionsettings->contains("Qt5_theme_engine")){ + QString engine = sessionsettings->value("Qt5_theme_engine","").toString(); + //qDebug() << "Set Qt5 theme engine: " << engine; + if(engine.isEmpty()){ unsetenv("QT_QPA_PLATFORMTHEME"); } + else{ setenv("QT_QPA_PLATFORMTHEME", engine.toUtf8().data(),1); } + } + emit SessionConfigChanged(); + }else if(changed.endsWith("desktopsettings.conf") ){ emit DesktopConfigChanged(); } else if(changed == QDir::homePath()+"/Desktop" || changed == QDir::homePath()+"/"+tr("Desktop") ){ desktopFiles = QDir(changed).entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs ,QDir::Name | QDir::IgnoreCase | QDir::DirsFirst); if(DEBUG){ qDebug() << "New Desktop Files:" << desktopFiles.length(); } -- cgit From 43358bcfd3f815d6f124c70d330a3128aeff9c08 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 3 Nov 2016 13:55:36 -0400 Subject: Convert the ResizeMenu class into it's own files: 1) Add a new .pri for loading just that class (works stand-alone) 2) Setup the lumina-desktop to use the new build framework for including that class. --- src-qt5/core/libLumina/LuminaUtils.cpp | 4 +- src-qt5/core/libLumina/LuminaUtils.h | 4 +- src-qt5/core/libLumina/ResizeMenu.cpp | 106 +++++++++++++++++++++ src-qt5/core/libLumina/ResizeMenu.h | 51 ++++++++++ src-qt5/core/libLumina/ResizeMenu.pri | 6 ++ src-qt5/core/lumina-desktop/lumina-desktop.pro | 3 + .../panel-plugins/systemstart/LStartButton.h | 1 + 7 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 src-qt5/core/libLumina/ResizeMenu.cpp create mode 100644 src-qt5/core/libLumina/ResizeMenu.h create mode 100644 src-qt5/core/libLumina/ResizeMenu.pri (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp index 0fb44ff1..0d808d1d 100644 --- a/src-qt5/core/libLumina/LuminaUtils.cpp +++ b/src-qt5/core/libLumina/LuminaUtils.cpp @@ -966,7 +966,7 @@ int LUtils::VersionStringToNumber(QString version){ // ======================= // RESIZEMENU CLASS // ======================= -ResizeMenu::ResizeMenu(QWidget *parent) : QMenu(parent){ +/*ResizeMenu::ResizeMenu(QWidget *parent) : QMenu(parent){ this->setContentsMargins(1,1,1,1); this->setMouseTracking(true); resizeSide = NONE; @@ -1060,4 +1060,4 @@ void ResizeMenu::mouseReleaseEvent(QMouseEvent *ev){ }else{ QMenu::mouseReleaseEvent(ev); //do normal processing } -} +}*/ diff --git a/src-qt5/core/libLumina/LuminaUtils.h b/src-qt5/core/libLumina/LuminaUtils.h index e07363ca..4a0a19af 100644 --- a/src-qt5/core/libLumina/LuminaUtils.h +++ b/src-qt5/core/libLumina/LuminaUtils.h @@ -99,7 +99,7 @@ public: //Special subclass for a menu which the user can grab the edges and resize as necessary // Note: Make sure that you don't set 0pixel contents margins on this menu // - it needs at least 1 pixel margins for the user to be able to grab it -class ResizeMenu : public QMenu{ +/*class ResizeMenu : public QMenu{ Q_OBJECT public: ResizeMenu(QWidget *parent = 0); @@ -126,6 +126,6 @@ protected: signals: void MenuResized(QSize); //Emitted when the menu is manually resized by the user -}; +};*/ #endif diff --git a/src-qt5/core/libLumina/ResizeMenu.cpp b/src-qt5/core/libLumina/ResizeMenu.cpp new file mode 100644 index 00000000..9f291134 --- /dev/null +++ b/src-qt5/core/libLumina/ResizeMenu.cpp @@ -0,0 +1,106 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2013-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "ResizeMenu.h" + +// ======================= +// RESIZEMENU CLASS +// ======================= +ResizeMenu::ResizeMenu(QWidget *parent) : QMenu(parent){ + this->setContentsMargins(1,1,1,1); + this->setMouseTracking(true); + resizeSide = NONE; + cAct = new QWidgetAction(this); + contents = 0; + connect(this, SIGNAL(aboutToShow()), this, SLOT(clearFlags()) ); + connect(this, SIGNAL(aboutToHide()), this, SLOT(clearFlags()) ); + connect(cAct, SIGNAL(hovered()), this, SLOT(clearFlags()) ); +} + +ResizeMenu::~ResizeMenu(){ + +} + +void ResizeMenu::setContents(QWidget *con){ + this->clear(); + cAct->setDefaultWidget(con); + this->addAction(cAct); + contents = con; //save for later + contents->setCursor(Qt::ArrowCursor); +} + +void ResizeMenu::mouseMoveEvent(QMouseEvent *ev){ + QRect geom = this->geometry(); + //Note: The exact position does not matter as much as the size + // since the window will be moved again the next time it is shown + // The "-2" in the sizing below accounts for the menu margins + QPoint gpos = this->mapToGlobal(ev->pos()); + bool handled = false; + switch(resizeSide){ + case TOP: + if(gpos.y() >= geom.bottom()-1){ break; } + geom.setTop(gpos.y()); + this->setGeometry(geom); + if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} + handled = true; + break; + case BOTTOM: + if(gpos.y() <= geom.top()+1){ break; } + geom.setBottom( gpos.y()); + this->setGeometry(geom); + if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} + handled = true; + break; + case LEFT: + if(gpos.x() >= geom.right()-1){ break; } + geom.setLeft(gpos.x()); + this->setGeometry(geom); + if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} + handled = true; + break; + case RIGHT: + if(gpos.x() <= geom.left()+1){ break; } + geom.setRight(gpos.x()); + this->setGeometry(geom); + if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} + handled = true; + break; + default: //NONE + //qDebug() << " - Mouse At:" << ev->pos(); + //Just adjust the mouse cursor which is shown + if(ev->pos().x()<=1 && ev->pos().x() >= -1){ this->setCursor(Qt::SizeHorCursor); } + else if(ev->pos().x() >= this->width()-1 && ev->pos().x() <= this->width()+1){ this->setCursor(Qt::SizeHorCursor); } + else if(ev->pos().y()<=1 && ev->pos().y() >= -1){ this->setCursor(Qt::SizeVerCursor); } + else if(ev->pos().y() >= this->height()-1 && ev->pos().y() <= this->height()+1){ this->setCursor(Qt::SizeVerCursor); } + else{ this->setCursor(Qt::ArrowCursor); } + } + if(!handled){ QMenu::mouseMoveEvent(ev); } //do normal processing as well +} + +void ResizeMenu::mousePressEvent(QMouseEvent *ev){ + bool used = false; + if(ev->buttons().testFlag(Qt::LeftButton) && resizeSide==NONE){ + //qDebug() << "Mouse Press Event:" << ev->pos() << resizeSide; + if(ev->pos().x()<=1 && ev->pos().x() >= -1){resizeSide = LEFT; used = true;} + else if(ev->pos().x() >= this->width()-1 && ev->pos().x() <= this->width()+1){ resizeSide = RIGHT; used = true;} + else if(ev->pos().y()<=1 && ev->pos().y() >= -1){ resizeSide = TOP; used = true; } + else if(ev->pos().y() >= this->height()-1 && ev->pos().y() <= this->height()+1){ resizeSide = BOTTOM; used = true; } + } + if(used){ ev->accept(); this->grabMouse(); } + else{ QMenu::mousePressEvent(ev); } //do normal processing +} + +void ResizeMenu::mouseReleaseEvent(QMouseEvent *ev){ + this->releaseMouse(); + if(ev->button() == Qt::LeftButton && resizeSide!=NONE ){ + //qDebug() << "Mouse Release Event:" << ev->pos() << resizeSide; + resizeSide = NONE; + emit MenuResized(contents->size()); + ev->accept(); + }else{ + QMenu::mouseReleaseEvent(ev); //do normal processing + } +} diff --git a/src-qt5/core/libLumina/ResizeMenu.h b/src-qt5/core/libLumina/ResizeMenu.h new file mode 100644 index 00000000..ed909da3 --- /dev/null +++ b/src-qt5/core/libLumina/ResizeMenu.h @@ -0,0 +1,51 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2012-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_LIBRARY_RESIZE_MENU_H +#define _LUMINA_LIBRARY_RESIZE_MENU_H + +#include +#include +#include +#include +#include +#include +#include +#include + +//Special subclass for a menu which the user can grab the edges and resize as necessary +// Note: Make sure that you don't set 0pixel contents margins on this menu +// - it needs at least 1 pixel margins for the user to be able to grab it +class ResizeMenu : public QMenu{ + Q_OBJECT +public: + ResizeMenu(QWidget *parent = 0); + virtual ~ResizeMenu(); + + void setContents(QWidget *con); + +private: + enum SideFlag{NONE, TOP, BOTTOM, LEFT, RIGHT}; + SideFlag resizeSide; + QWidget *contents; + QWidgetAction *cAct; + +private slots: + void clearFlags(){ + resizeSide=NONE; + } + +protected: + virtual void mouseMoveEvent(QMouseEvent *ev); + virtual void mousePressEvent(QMouseEvent *ev); + virtual void mouseReleaseEvent(QMouseEvent *ev); + +signals: + void MenuResized(QSize); //Emitted when the menu is manually resized by the user + +}; + +#endif diff --git a/src-qt5/core/libLumina/ResizeMenu.pri b/src-qt5/core/libLumina/ResizeMenu.pri new file mode 100644 index 00000000..2b055841 --- /dev/null +++ b/src-qt5/core/libLumina/ResizeMenu.pri @@ -0,0 +1,6 @@ +#Subproject file for bundling the ResizeMenu class into an application +SOURCES += $${PWD}/ResizeMenu.cpp +HEADERS += $${PWD}/ResizeMenu.h +#Add this dir to the include path +# This allows the application to simply use "#include " to use it +INCLUDEPATH *= $${PWD} diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index 814725cc..effa0508 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -53,6 +53,9 @@ HEADERS += Globals.h \ FORMS += SystemWindow.ui \ BootSplash.ui +#include all the special classes from the Lumina tree +include(../libLumina/ResizeMenu.pri) + #Now include all the files for the various plugins include(panel-plugins/panel-plugins.pri) include(desktop-plugins/desktop-plugins.pri) diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h index 1a17b75b..22742bc5 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h @@ -25,6 +25,7 @@ // libLumina includes #include #include +#include #include "StartMenu.h" -- cgit From ecae524c77a84b5855fa6390b7e0166c17349c18 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Mon, 7 Nov 2016 10:07:05 +0100 Subject: Fix unportable test(1) operator. Only bash supports "==", the standard is "=". --- src-qt5/core/menu-scripts/ls.json.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/menu-scripts/ls.json.sh b/src-qt5/core/menu-scripts/ls.json.sh index 43b0ead6..754a10d4 100755 --- a/src-qt5/core/menu-scripts/ls.json.sh +++ b/src-qt5/core/menu-scripts/ls.json.sh @@ -1,6 +1,6 @@ #!/bin/sh DIR=${1} -if [ "$1" == "" ] ; then +if [ "$1" = "" ] ; then DIR=`pwd` fi -- cgit From 7ab900e41f5f15adccd573d459a80fe60cf6a044 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 7 Nov 2016 13:52:20 -0500 Subject: LARGE UPDATE: 1) Dismantle the Lumina library completely. 2) Setup lots of small subproject files (.pri) for the individual classes within the old library. 3) Move all the Lumina binaries to use the new subproject files 4) Split up the LuminaUtils class/files into LUtils and LDesktopUtils (generic utilities, and desktop-specific utilities) --- src-qt5/core/colors/Black.qss.colors | 13 + src-qt5/core/colors/Blue-Light.qss.colors | 13 + src-qt5/core/colors/Grey-Dark.qss.colors | 13 + src-qt5/core/colors/Lumina-Glass.qss.colors | 13 + src-qt5/core/colors/Lumina-Gold.qss.colors | 13 + src-qt5/core/colors/Lumina-Green.qss.colors | 13 + src-qt5/core/colors/Lumina-Purple.qss.colors | 13 + src-qt5/core/colors/Lumina-Red.qss.colors | 13 + src-qt5/core/colors/PCBSD10-Default.qss.colors | 13 + src-qt5/core/colors/Solarized-Dark.qss.colors | 16 + src-qt5/core/colors/Solarized-Light.qss.colors | 16 + src-qt5/core/core.pro | 28 +- src-qt5/core/libLumina/LDesktopUtils.cpp | 550 ++++++++++ src-qt5/core/libLumina/LDesktopUtils.h | 49 + src-qt5/core/libLumina/LDesktopUtils.pri | 7 + src-qt5/core/libLumina/LUtils.cpp | 436 ++++++++ src-qt5/core/libLumina/LUtils.h | 78 ++ src-qt5/core/libLumina/LUtils.pri | 34 + src-qt5/core/libLumina/LuminaOS.h | 4 +- src-qt5/core/libLumina/LuminaSingleApplication.h | 2 +- src-qt5/core/libLumina/LuminaSingleApplication.pri | 12 + src-qt5/core/libLumina/LuminaThemes.cpp | 2 +- src-qt5/core/libLumina/LuminaThemes.pri | 10 + src-qt5/core/libLumina/LuminaUtils.cpp | 1063 -------------------- src-qt5/core/libLumina/LuminaUtils.h | 131 --- src-qt5/core/libLumina/LuminaX11.pri | 13 + src-qt5/core/libLumina/LuminaXDG.cpp | 2 +- src-qt5/core/libLumina/LuminaXDG.pri | 10 + src-qt5/core/libLumina/colors/Black.qss.colors | 13 - .../core/libLumina/colors/Blue-Light.qss.colors | 13 - src-qt5/core/libLumina/colors/Grey-Dark.qss.colors | 13 - .../core/libLumina/colors/Lumina-Glass.qss.colors | 13 - .../core/libLumina/colors/Lumina-Gold.qss.colors | 13 - .../core/libLumina/colors/Lumina-Green.qss.colors | 13 - .../core/libLumina/colors/Lumina-Purple.qss.colors | 13 - .../core/libLumina/colors/Lumina-Red.qss.colors | 13 - .../libLumina/colors/PCBSD10-Default.qss.colors | 13 - .../libLumina/colors/Solarized-Dark.qss.colors | 16 - .../libLumina/colors/Solarized-Light.qss.colors | 16 - src-qt5/core/libLumina/libLumina.pro | 86 +- .../core/libLumina/quickplugins/quick-sample.qml | 12 - src-qt5/core/libLumina/themes/Glass.qss.template | 539 ---------- .../libLumina/themes/Lumina-default.qss.template | 494 --------- src-qt5/core/libLumina/themes/None.qss.template | 118 --- src-qt5/core/libLumina/xtrafiles/globs2 | 991 ------------------ src-qt5/core/lumina-desktop/Globals.h | 3 +- src-qt5/core/lumina-desktop/JsonMenu.h | 2 +- src-qt5/core/lumina-desktop/LSession.cpp | 6 +- .../desktop-plugins/notepad/NotepadPlugin.cpp | 2 +- .../desktop-plugins/quickcontainer/QuickDPlugin.h | 2 +- .../desktop-plugins/rssreader/RSSFeedPlugin.cpp | 2 +- src-qt5/core/lumina-desktop/lumina-desktop.pro | 15 +- src-qt5/core/lumina-desktop/main.cpp | 5 +- .../panel-plugins/battery/LBattery.h | 2 +- .../lumina-desktop/panel-plugins/battery/NOTES | 2 +- .../panel-plugins/desktopbar/LDeskBar.cpp | 2 +- .../desktopswitcher/LDesktopSwitcher.h | 2 +- .../panel-plugins/quickcontainer/QuickPPlugin.h | 2 +- .../panel-plugins/systemstart/ItemWidget.cpp | 12 +- .../panel-plugins/systemstart/LStartButton.cpp | 2 +- .../panel-plugins/systemstart/LStartButton.h | 2 +- .../panel-plugins/systemstart/StartMenu.cpp | 2 +- .../panel-plugins/userbutton/UserItemWidget.cpp | 11 +- .../panel-plugins/userbutton/UserWidget.cpp | 2 +- src-qt5/core/lumina-info/MainUI.cpp | 5 +- src-qt5/core/lumina-info/lumina-info.pro | 10 +- src-qt5/core/lumina-info/main.cpp | 2 +- src-qt5/core/lumina-open/LFileDialog.h | 2 +- src-qt5/core/lumina-open/lumina-open.pro | 7 +- src-qt5/core/lumina-open/main.cpp | 2 +- src-qt5/core/lumina-session/lumina-session.pro | 6 +- src-qt5/core/lumina-session/main.cpp | 5 +- src-qt5/core/lumina-session/session.cpp | 2 +- src-qt5/core/quickplugins/quick-sample.qml | 12 + src-qt5/core/themes/Glass.qss.template | 539 ++++++++++ src-qt5/core/themes/Lumina-default.qss.template | 494 +++++++++ src-qt5/core/themes/None.qss.template | 118 +++ src-qt5/core/xtrafiles/globs2 | 991 ++++++++++++++++++ 78 files changed, 3635 insertions(+), 3607 deletions(-) create mode 100644 src-qt5/core/colors/Black.qss.colors create mode 100644 src-qt5/core/colors/Blue-Light.qss.colors create mode 100644 src-qt5/core/colors/Grey-Dark.qss.colors create mode 100644 src-qt5/core/colors/Lumina-Glass.qss.colors create mode 100644 src-qt5/core/colors/Lumina-Gold.qss.colors create mode 100644 src-qt5/core/colors/Lumina-Green.qss.colors create mode 100644 src-qt5/core/colors/Lumina-Purple.qss.colors create mode 100644 src-qt5/core/colors/Lumina-Red.qss.colors create mode 100644 src-qt5/core/colors/PCBSD10-Default.qss.colors create mode 100644 src-qt5/core/colors/Solarized-Dark.qss.colors create mode 100644 src-qt5/core/colors/Solarized-Light.qss.colors create mode 100644 src-qt5/core/libLumina/LDesktopUtils.cpp create mode 100644 src-qt5/core/libLumina/LDesktopUtils.h create mode 100644 src-qt5/core/libLumina/LDesktopUtils.pri create mode 100644 src-qt5/core/libLumina/LUtils.cpp create mode 100644 src-qt5/core/libLumina/LUtils.h create mode 100644 src-qt5/core/libLumina/LUtils.pri create mode 100644 src-qt5/core/libLumina/LuminaSingleApplication.pri create mode 100644 src-qt5/core/libLumina/LuminaThemes.pri delete mode 100644 src-qt5/core/libLumina/LuminaUtils.cpp delete mode 100644 src-qt5/core/libLumina/LuminaUtils.h create mode 100644 src-qt5/core/libLumina/LuminaX11.pri create mode 100644 src-qt5/core/libLumina/LuminaXDG.pri delete mode 100644 src-qt5/core/libLumina/colors/Black.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Blue-Light.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Grey-Dark.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Lumina-Gold.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Lumina-Green.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Lumina-Purple.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Lumina-Red.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/PCBSD10-Default.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Solarized-Dark.qss.colors delete mode 100644 src-qt5/core/libLumina/colors/Solarized-Light.qss.colors delete mode 100644 src-qt5/core/libLumina/quickplugins/quick-sample.qml delete mode 100644 src-qt5/core/libLumina/themes/Glass.qss.template delete mode 100644 src-qt5/core/libLumina/themes/Lumina-default.qss.template delete mode 100644 src-qt5/core/libLumina/themes/None.qss.template delete mode 100644 src-qt5/core/libLumina/xtrafiles/globs2 create mode 100644 src-qt5/core/quickplugins/quick-sample.qml create mode 100644 src-qt5/core/themes/Glass.qss.template create mode 100644 src-qt5/core/themes/Lumina-default.qss.template create mode 100644 src-qt5/core/themes/None.qss.template create mode 100644 src-qt5/core/xtrafiles/globs2 (limited to 'src-qt5/core') diff --git a/src-qt5/core/colors/Black.qss.colors b/src-qt5/core/colors/Black.qss.colors new file mode 100644 index 00000000..b6269188 --- /dev/null +++ b/src-qt5/core/colors/Black.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(204,204,204,200) +ACCENTDISABLECOLOR=rgba(204,204,204,100) +ALTBASECOLOR=rgb(37,37,37) +BASECOLOR=rgb(36,36,36) +HIGHLIGHTCOLOR=rgba(218,222,226,170) +HIGHLIGHTDISABLECOLOR=rgba(218,222,226,160) +PRIMARYCOLOR=rgba(0,0,4,250) +PRIMARYDISABLECOLOR=rgba(0,0,0,180) +SECONDARYCOLOR=rgba(192,192,192,200) +SECONDARYDISABLECOLOR=rgba(192,192,192,100) +TEXTCOLOR=white +TEXTDISABLECOLOR=darkgrey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Blue-Light.qss.colors b/src-qt5/core/colors/Blue-Light.qss.colors new file mode 100644 index 00000000..5bcb85f6 --- /dev/null +++ b/src-qt5/core/colors/Blue-Light.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(157,161,165,200) +ACCENTDISABLECOLOR=rgba(156,156,157,200) +ALTBASECOLOR=rgb(239,247,255) +BASECOLOR=rgb(165,210,255) +HIGHLIGHTCOLOR=rgb(110,158,208) +HIGHLIGHTDISABLECOLOR=rgba(110,158,208,150) +PRIMARYCOLOR=rgba(181,212,238,200) +PRIMARYDISABLECOLOR=rgba(234,237,238,100) +SECONDARYCOLOR=rgba(200,222,243,200) +SECONDARYDISABLECOLOR=rgba(200,222,243,100) +TEXTCOLOR=black +TEXTDISABLECOLOR=grey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Grey-Dark.qss.colors b/src-qt5/core/colors/Grey-Dark.qss.colors new file mode 100644 index 00000000..207edd04 --- /dev/null +++ b/src-qt5/core/colors/Grey-Dark.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(43,43,45,200) +ACCENTDISABLECOLOR=rgba(43,43,45,100) +ALTBASECOLOR=rgb(63,61,61) +BASECOLOR=rgb(93,92,92) +HIGHLIGHTCOLOR=rgba(218,222,226,170) +HIGHLIGHTDISABLECOLOR=rgba(218,222,226,160) +PRIMARYCOLOR=rgba(75,77,80,240) +PRIMARYDISABLECOLOR=rgba(75,77,80,180) +SECONDARYCOLOR=rgba(144,140,142,200) +SECONDARYDISABLECOLOR=rgba(144,140,142,100) +TEXTCOLOR=white +TEXTDISABLECOLOR=darkgrey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Lumina-Glass.qss.colors b/src-qt5/core/colors/Lumina-Glass.qss.colors new file mode 100644 index 00000000..89534aaa --- /dev/null +++ b/src-qt5/core/colors/Lumina-Glass.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(255,252,234,100) +ACCENTDISABLECOLOR=rgba(0,0,0,100) +ALTBASECOLOR=rgba(255,255,255,125) +BASECOLOR=rgb(247,246,244) +HIGHLIGHTCOLOR=rgba(212,212,212,170) +HIGHLIGHTDISABLECOLOR=rgba(184,184,184,100) +PRIMARYCOLOR=rgba(235,242,242,200) +PRIMARYDISABLECOLOR=rgba(214,220,220,200) +SECONDARYCOLOR=rgba(100,100,100,200) +SECONDARYDISABLECOLOR=rgba(100,100,100,100) +TEXTCOLOR=black +TEXTDISABLECOLOR=grey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Lumina-Gold.qss.colors b/src-qt5/core/colors/Lumina-Gold.qss.colors new file mode 100644 index 00000000..cfad7069 --- /dev/null +++ b/src-qt5/core/colors/Lumina-Gold.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(149,144,122,200) +ACCENTDISABLECOLOR=rgba(74,71,60,200) +ALTBASECOLOR=rgb(230,227,204) +BASECOLOR=rgb(247,247,240) +HIGHLIGHTCOLOR=rgba(252,237,149,170) +HIGHLIGHTDISABLECOLOR=rgba(252,237,149,100) +PRIMARYCOLOR=rgba(238,234,226,200) +PRIMARYDISABLECOLOR=rgba(238,235,224,100) +SECONDARYCOLOR=rgba(247,209,112,200) +SECONDARYDISABLECOLOR=rgba(234,198,106,150) +TEXTCOLOR=black +TEXTDISABLECOLOR=grey +TEXTHIGHLIGHTCOLOR=black \ No newline at end of file diff --git a/src-qt5/core/colors/Lumina-Green.qss.colors b/src-qt5/core/colors/Lumina-Green.qss.colors new file mode 100644 index 00000000..99f16acb --- /dev/null +++ b/src-qt5/core/colors/Lumina-Green.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(149,144,122,200) +ACCENTDISABLECOLOR=rgba(74,71,60,200) +ALTBASECOLOR=rgb(230,230,230) +BASECOLOR=rgb(247,246,244) +HIGHLIGHTCOLOR=rgba(66,153,76,170) +HIGHLIGHTDISABLECOLOR=rgba(66,153,76,100) +PRIMARYCOLOR=rgba(229,231,238,200) +PRIMARYDISABLECOLOR=rgba(229,231,238,100) +SECONDARYCOLOR=rgba(76,197,84,200) +SECONDARYDISABLECOLOR=rgba(76,197,84,150) +TEXTCOLOR=black +TEXTDISABLECOLOR=grey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Lumina-Purple.qss.colors b/src-qt5/core/colors/Lumina-Purple.qss.colors new file mode 100644 index 00000000..f2ba7e05 --- /dev/null +++ b/src-qt5/core/colors/Lumina-Purple.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(247,231,255,200) +ACCENTDISABLECOLOR=rgba(167,166,166,200) +ALTBASECOLOR=rgb(63,61,61) +BASECOLOR=rgb(93,92,92) +HIGHLIGHTCOLOR=rgba(76,38,171,170) +HIGHLIGHTDISABLECOLOR=rgba(57,19,139,170) +PRIMARYCOLOR=rgba(65,67,80,240) +PRIMARYDISABLECOLOR=rgba(65,67,80,180) +SECONDARYCOLOR=rgba(74,65,120,200) +SECONDARYDISABLECOLOR=rgba(71,65,120,100) +TEXTCOLOR=white +TEXTDISABLECOLOR=darkgrey +TEXTHIGHLIGHTCOLOR=white \ No newline at end of file diff --git a/src-qt5/core/colors/Lumina-Red.qss.colors b/src-qt5/core/colors/Lumina-Red.qss.colors new file mode 100644 index 00000000..f73bdb75 --- /dev/null +++ b/src-qt5/core/colors/Lumina-Red.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(255,244,245,200) +ACCENTDISABLECOLOR=rgba(167,166,166,200) +ALTBASECOLOR=rgb(63,61,61) +BASECOLOR=rgb(93,92,92) +HIGHLIGHTCOLOR=rgba(175,9,9,170) +HIGHLIGHTDISABLECOLOR=rgba(154,20,20,170) +PRIMARYCOLOR=rgba(80,66,66,240) +PRIMARYDISABLECOLOR=rgba(80,66,66,180) +SECONDARYCOLOR=rgba(120,22,23,200) +SECONDARYDISABLECOLOR=rgba(120,22,23,100) +TEXTCOLOR=white +TEXTDISABLECOLOR=darkgrey +TEXTHIGHLIGHTCOLOR=white \ No newline at end of file diff --git a/src-qt5/core/colors/PCBSD10-Default.qss.colors b/src-qt5/core/colors/PCBSD10-Default.qss.colors new file mode 100644 index 00000000..efcea51d --- /dev/null +++ b/src-qt5/core/colors/PCBSD10-Default.qss.colors @@ -0,0 +1,13 @@ +ACCENTCOLOR=rgba(182,186,191,200) +ACCENTDISABLECOLOR=rgba(190,190,191,200) +ALTBASECOLOR=rgb(241,241,241) +BASECOLOR=rgb(247,246,244) +HIGHLIGHTCOLOR=rgb(129,184,243) +HIGHLIGHTDISABLECOLOR=rgba(129,184,243,150) +PRIMARYCOLOR=rgba(224,236,238,200) +PRIMARYDISABLECOLOR=rgba(234,237,238,100) +SECONDARYCOLOR=rgba(200,222,243,200) +SECONDARYDISABLECOLOR=rgba(200,222,243,100) +TEXTCOLOR=black +TEXTDISABLECOLOR=grey +TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/colors/Solarized-Dark.qss.colors b/src-qt5/core/colors/Solarized-Dark.qss.colors new file mode 100644 index 00000000..d4f0f1c9 --- /dev/null +++ b/src-qt5/core/colors/Solarized-Dark.qss.colors @@ -0,0 +1,16 @@ +# Solarized is a theme created by Ethan Schoonover +# See the project site at http://ethanschoonover.com/solarized +# Or see the source at https://github.com/altercation/solarized +ACCENTCOLOR=rgb(181,137,0) +ACCENTDISABLECOLOR=rgb(181,137,0) +ALTBASECOLOR=rgb(0,43,54) +BASECOLOR=rgb(0,43,54) +HIGHLIGHTCOLOR=rgb(7,54,66) +HIGHLIGHTDISABLECOLOR=rgb(7,53,66) +PRIMARYCOLOR=rgb(0,43,54) +PRIMARYDISABLECOLOR=rgb(7,54,66) +SECONDARYCOLOR=rgb(0,43,54) +SECONDARYDISABLECOLOR=rgb(7,54,66) +TEXTCOLOR=rgb(131,148,150) +TEXTDISABLECOLOR=rgb(88,110,117) +TEXTHIGHLIGHTCOLOR=rgb(147,161,161) diff --git a/src-qt5/core/colors/Solarized-Light.qss.colors b/src-qt5/core/colors/Solarized-Light.qss.colors new file mode 100644 index 00000000..fead1915 --- /dev/null +++ b/src-qt5/core/colors/Solarized-Light.qss.colors @@ -0,0 +1,16 @@ +# Solarized is a theme created by Ethan Schoonover +# See the project site at http://ethanschoonover.com/solarized +# Or see the source at https://github.com/altercation/solarized +ACCENTCOLOR=rgb(38,139,210) +ACCENTDISABLECOLOR=rgb(38,139,210) +ALTBASECOLOR=rgb(253,246,227) +BASECOLOR=rgb(253,246,227) +HIGHLIGHTCOLOR=rgb(238,232,213) +HIGHLIGHTDISABLECOLOR=rgb(238,232,213) +PRIMARYCOLOR=rgb(253,246,227) +PRIMARYDISABLECOLOR=rgb(238,232,213) +SECONDARYCOLOR=rgb(253,246,227) +SECONDARYDISABLECOLOR=rgb(238,232,213) +TEXTCOLOR=rgb(131,148,150) +TEXTDISABLECOLOR=rgb(147,161,161) +TEXTHIGHLIGHTCOLOR=rgb(88,110,117) diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro index a0d0db3e..27aff3a2 100644 --- a/src-qt5/core/core.pro +++ b/src-qt5/core/core.pro @@ -4,23 +4,31 @@ include("../OS-detect.pri") TEMPLATE = subdirs CONFIG += recursive -SUBDIRS+= libLumina \ - lumina-desktop \ +SUBDIRS+= lumina-desktop \ lumina-session \ lumina-open \ lumina-info # lumina-wm-INCOMPLETE \ # lumina-checkpass - -#Make sure to list libLumina as a requirement for the others (for parallellized builds) -lumina-desktop.depends = libLumina -lumina-session.depends = libLumina -lumina-open.depends = libLumina -lumina-info.depends = libLumina - #Also install any special menu scripts scripts.path = $${L_SHAREDIR}/lumina-desktop/menu-scripts scripts.files = menu-scripts/* -INSTALLS+=scripts +#Color themes +colors.path=$${L_SHAREDIR}/lumina-desktop/colors +colors.files=colors/*.qss.colors + +#Theme templates +themes.path=$${L_SHAREDIR}/lumina-desktop/themes/ +themes.files=themes/*.qss.template + +#QtQuick plugins +#quickplugins.path=$${L_SHAREDIR}/lumina-desktop/quickplugins/ +#quickplugins.files=quickplugins/* + +#Mimetype globs +globs.path=$${L_SHAREDIR}/lumina-desktop +globs.files=xtrafiles/globs2 + +INSTALLS+=scripts colors themes globs diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp new file mode 100644 index 00000000..4f8d94ef --- /dev/null +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -0,0 +1,550 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2012-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "LDesktopUtils.h" + +#include +#include +#include + +#include "LuminaThemes.h" + +static QStringList fav; + +QString LDesktopUtils::LuminaDesktopVersion(){ + QString ver = "1.1.1"; + #ifdef GIT_VERSION + ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); + #endif + return ver; +} + +QString LDesktopUtils::LuminaDesktopBuildDate(){ + #ifdef BUILD_DATE + return BUILD_DATE; + #endif + return ""; +} + +//Various function for finding valid QtQuick plugins on the system +bool LDesktopUtils::validQuickPlugin(QString ID){ + return ( !LDesktopUtils::findQuickPluginFile(ID).isEmpty() ); +} + +QString LDesktopUtils::findQuickPluginFile(QString ID){ + if(ID.startsWith("quick-")){ ID = ID.section("-",1,50); } //just in case + //Give preference to any user-supplied plugins (overwrites for system plugins) + QString path = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/quickplugins/quick-"+ID+".qml"; + if( QFile::exists(path) ){return path; } + path = LOS::LuminaShare()+"quickplugins/quick-"+ID+".qml"; + if( QFile::exists(path) ){return path; } + return ""; //could not be found +} + +QStringList LDesktopUtils::listQuickPlugins(){ + QDir dir(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/quickplugins"); + QStringList files = dir.entryList(QStringList() << "quick-*.qml", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); + dir.cd(LOS::LuminaShare()+"quickplugins"); + files << dir.entryList(QStringList() << "quick-*.qml", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); + for(int i=0; i, sym-links in the ~/.lumina/favorites dir} + //Include 0.8.4-devel versions in this upgrade (need to distinguish b/w devel and release versions later somehow) + QDir favdir(QDir::homePath()+"/.lumina/favorites"); + QFileInfoList symlinks = favdir.entryInfoList(QDir::Files | QDir::Dirs | QDir::System | QDir::NoDotAndDotDot); + QStringList favfile = LDesktopUtils::listFavorites(); //just in case some already exist + bool newentry = false; + for(int i=0; iscreenCount(); i++){ + if(desk->screenGeometry(i).x()==0){ + screen = QString::number(i); + screenGeom = desk->screenGeometry(i); + break; + } + } + //Now setup the default "desktopsettings.conf" and "sessionsettings.conf" files + QStringList deskset, sesset;//, lopenset; + + // -- SESSION SETTINGS -- + QStringList tmp = sysDefaults.filter("session_"); + if(tmp.isEmpty()){ tmp = sysDefaults.filter("session."); }//for backwards compat + sesset << "[General]"; //everything is in this section + sesset << "DesktopVersion="+LDesktopUtils::LuminaDesktopVersion(); + for(int i=0; i 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] + //returns true if something changed + int oldversion = LDesktopUtils::VersionStringToNumber(lastversion); + int nversion = LDesktopUtils::VersionStringToNumber(QApplication::applicationVersion()); + bool newversion = ( oldversion < nversion ); //increasing version number + bool newrelease = ( lastversion.contains("-devel", Qt::CaseInsensitive) && QApplication::applicationVersion().contains("-release", Qt::CaseInsensitive) ); //Moving from devel to release + + QString confdir = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/"; + //Check for the desktop settings file + QString dset = confdir+"desktopsettings.conf"; + bool firstrun = false; + if(!QFile::exists(dset) || oldversion < 5000){ + if( oldversion < 100000 && nversion>=100000 ){ system("rm -rf ~/.lumina"); qDebug() << "Current desktop settings obsolete: Re-implementing defaults"; } + else{ firstrun = true; } + LDesktopUtils::LoadSystemDefaults(); + } + //Convert the favorites framework as necessary (change occured with 0.8.4) + if(newversion || newrelease){ + LDesktopUtils::upgradeFavorites(oldversion); + } + //Convert from the old desktop numbering system to the new one (change occured with 1.0.1) + if(oldversion<=1000001){ + QStringList DS = LUtils::readFile(dset); + QList screens = QApplication::screens(); + for(int i=0; i=0 && ok && num< screens.length()){ + //This one needs to be converted + DS[i] = "[desktop-"+screens[num]->name()+"]"; + } + }else if(DS[i].startsWith("[panel")){ + bool ok = false; + int num = DS[i].section("panel",-1).section(".",0,0).toInt(&ok); + if(num>=0 && ok && num< screens.length()){ + //This one needs to be converted + QString rest = DS[i].section(".",1,-1); //everything after the desktop number in the current setting + DS[i] = "[panel_"+screens[num]->name()+"."+rest; + } + } + } + LUtils::writeFile(dset, DS, true); + } + + //Check the fluxbox configuration files + dset = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/"; + if(!QFile::exists(dset+"fluxbox-init")){ + firstrun = true; + } + bool fluxcopy = false; + if(!QFile::exists(dset+"fluxbox-init")){ fluxcopy=true; } + else if(!QFile::exists(dset+"fluxbox-keys")){fluxcopy=true; } + else if(oldversion < 60){ fluxcopy=true; qDebug() << "Current fluxbox settings obsolete: Re-implementing defaults"; } + if(fluxcopy){ + qDebug() << "Copying default fluxbox configuration files"; + if(QFile::exists(dset+"fluxbox-init")){ QFile::remove(dset+"fluxbox-init"); } + if(QFile::exists(dset+"fluxbox-keys")){ QFile::remove(dset+"fluxbox-keys"); } + QString finit = LUtils::readFile(LOS::LuminaShare()+"fluxbox-init-rc").join("\n"); + finit.replace("${XDG_CONFIG_HOME}", QString(getenv("XDG_CONFIG_HOME"))); + LUtils::writeFile(dset+"fluxbox-init", finit.split("\n")); + QFile::copy(LOS::LuminaShare()+"fluxbox-keys", dset+"fluxbox-keys"); + QFile::setPermissions(dset+"fluxbox-init", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); + QFile::setPermissions(dset+"fluxbox-keys", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); + } + + if(firstrun){ qDebug() << "First time using Lumina!!"; } + return (firstrun || newversion || newrelease); +} + +int LDesktopUtils::VersionStringToNumber(QString version){ + version = version.section("-",0,0); //trim any extra labels off the end + int maj, mid, min; //major/middle/minor version numbers (..) + maj = mid = min = 0; + bool ok = true; + maj = version.section(".",0,0).toInt(&ok); + if(ok){ mid = version.section(".",1,1).toInt(&ok); }else{ maj = 0; } + if(ok){ min = version.section(".",2,2).toInt(&ok); }else{ mid = 0; } + if(!ok){ min = 0; } + //Now assemble the number + //NOTE: This format allows numbers to be anywhere from 0->999 without conflict + return (maj*1000000 + mid*1000 + min); +} diff --git a/src-qt5/core/libLumina/LDesktopUtils.h b/src-qt5/core/libLumina/LDesktopUtils.h new file mode 100644 index 00000000..dbad8757 --- /dev/null +++ b/src-qt5/core/libLumina/LDesktopUtils.h @@ -0,0 +1,49 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2012-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_LIBRARY_DESKTOP_UTILS_H +#define _LUMINA_LIBRARY_DESKTOP_UTILS_H + +#include +#include +#include +#include +#include + +//Other classes needed +#include +#include +#include + +class LDesktopUtils{ +public: + //Get the current version/build of the Lumina desktop + static QString LuminaDesktopVersion(); + static QString LuminaDesktopBuildDate(); + + //Various function for finding valid QtQuick plugins on the system + static bool validQuickPlugin(QString ID); + static QString findQuickPluginFile(QString ID); + static QStringList listQuickPlugins(); //List of valid ID's + static QStringList infoQuickPlugin(QString ID); //Returns: [Name, Description, Icon] + + //Various functions for the favorites sub-system + // Formatting Note: "::::[dir/app/]::::" + // the field might not be used for "app" flagged entries + static QStringList listFavorites(); + static bool saveFavorites(QStringList); + static bool isFavorite(QString path); + static bool addFavorite(QString path, QString name = ""); + static void removeFavorite(QString path); + static void upgradeFavorites(int fromoldversionnumber); + + //Load the default setup for the system + static void LoadSystemDefaults(bool skipOS = false); + static bool checkUserFiles(QString lastversion); //returns true if something changed + static int VersionStringToNumber(QString version); //convert the lumina version string to a number for comparisons +}; + +#endif diff --git a/src-qt5/core/libLumina/LDesktopUtils.pri b/src-qt5/core/libLumina/LDesktopUtils.pri new file mode 100644 index 00000000..80bbcfa8 --- /dev/null +++ b/src-qt5/core/libLumina/LDesktopUtils.pri @@ -0,0 +1,7 @@ +SOURCES *= $${PWD}/LDesktopUtils.cpp +HEADERS *= $${PWD}/LDesktopUtils.h + +INCLUDEPATH *= ${PWD} + +#Now the other dependendies of it +include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LUtils.cpp b/src-qt5/core/libLumina/LUtils.cpp new file mode 100644 index 00000000..78831231 --- /dev/null +++ b/src-qt5/core/libLumina/LUtils.cpp @@ -0,0 +1,436 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2013-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "LUtils.h" + +#include "LuminaOS.h" +#include "LuminaXDG.h" + +#include +#include + +inline QStringList ProcessRun(QString cmd, QStringList args){ + //Assemble outputs + QStringList out; out << "1" << ""; //error code, string output + QProcess proc; + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("LANG", "C"); + env.insert("LC_MESSAGES", "C"); + proc.setProcessEnvironment(env); + proc.setProcessChannelMode(QProcess::MergedChannels); + if(args.isEmpty()){ + proc.start(cmd, QIODevice::ReadOnly); + }else{ + proc.start(cmd,args ,QIODevice::ReadOnly); + } + QString info; + while(!proc.waitForFinished(1000)){ + if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal + QString tmp = proc.readAllStandardOutput(); + if(tmp.isEmpty()){ proc.terminate(); } + else{ info.append(tmp); } + } + out[0] = QString::number(proc.exitCode()); + out[1] = info+QString(proc.readAllStandardOutput()); + return out; +} +//============= +// LUtils Functions +//============= +int LUtils::runCmd(QString cmd, QStringList args){ + /*QProcess proc; + proc.setProcessChannelMode(QProcess::MergedChannels); + if(args.isEmpty()){ + proc.start(cmd); + }else{ + proc.start(cmd, args); + } + //if(!proc.waitForStarted(30000)){ return 1; } //process never started - max wait of 30 seconds + while(!proc.waitForFinished(300)){ + if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal + QCoreApplication::processEvents(); + } + int ret = proc.exitCode(); + return ret;*/ + QFuture future = QtConcurrent::run(ProcessRun, cmd, args); + return future.result()[0].toInt(); //turn it back into an integer return code + +} + +QStringList LUtils::getCmdOutput(QString cmd, QStringList args){ + /*QProcess proc; + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("LANG", "C"); + env.insert("LC_MESSAGES", "C"); + proc.setProcessEnvironment(env); + proc.setProcessChannelMode(QProcess::MergedChannels); + if(args.isEmpty()){ + proc.start(cmd); + }else{ + proc.start(cmd,args); + } + //if(!proc.waitForStarted(30000)){ return QStringList(); } //process never started - max wait of 30 seconds + while(!proc.waitForFinished(300)){ + if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal + QCoreApplication::processEvents(); + } + QStringList out = QString(proc.readAllStandardOutput()).split("\n"); + return out;*/ + QFuture future = QtConcurrent::run(ProcessRun, cmd, args); + return future.result()[1].split("\n"); //Split the return message into lines +} + +QStringList LUtils::readFile(QString filepath){ + QStringList out; + QFile file(filepath); + if(file.open(QIODevice::Text | QIODevice::ReadOnly)){ + QTextStream in(&file); + while(!in.atEnd()){ + out << in.readLine(); + } + file.close(); + } + return out; +} + +bool LUtils::writeFile(QString filepath, QStringList contents, bool overwrite){ + QFile file(filepath); + if(file.exists() && !overwrite){ return false; } + bool ok = false; + if(contents.isEmpty()){ contents << "\n"; } + if( file.open(QIODevice::WriteOnly | QIODevice::Truncate) ){ + QTextStream out(&file); + out << contents.join("\n"); + if(!contents.last().isEmpty()){ out << "\n"; } //always end with a new line + file.close(); + ok = true; + } + return ok; +} + +bool LUtils::isValidBinary(QString& bin){ + if(!bin.startsWith("/")){ + //Relative path: search for it on the current "PATH" settings + QStringList paths = QString(qgetenv("PATH")).split(":"); + for(int i=0; i fmt = QImageReader::supportedImageFormats(); + for(int i=0; iremoveTranslator(cTrans); } + //Setup the translator + cTrans = new QTranslator(); + //Use the shortened locale code if specific code does not have a corresponding file + if(!QFile::exists(LOS::LuminaShare()+"i18n/"+appname+"_" + langCode + ".qm") && langCode!="en_US" ){ + langCode.truncate( langCode.indexOf("_") ); + } + QString filename = appname+"_"+langCode+".qm"; + //qDebug() << "FileName:" << filename << "Dir:" << LOS::LuminaShare()+"i18n/"; + if( cTrans->load( filename, LOS::LuminaShare()+"i18n/" ) ){ + app->installTranslator( cTrans ); + }else{ + //Translator could not be loaded for some reason + cTrans = 0; + if(langCode!="en_US"){ + qWarning() << " - Could not load Locale:" << langCode; + } + } + }else{ + //Only going to set the encoding since no application given + qDebug() << "Loading System Encoding:" << langEnc; + } + //Load current encoding for this locale + QTextCodec::setCodecForLocale( QTextCodec::codecForName(langEnc.toUtf8()) ); + return cTrans; +} + +QStringList LUtils::knownLocales(){ + QDir i18n = QDir(LOS::LuminaShare()+"i18n"); + if( !i18n.exists() ){ return QStringList(); } + QStringList files = i18n.entryList(QStringList() << "lumina-desktop_*.qm", QDir::Files, QDir::Name); + if(files.isEmpty()){ return QStringList(); } + //Now strip off the filename and just leave the locale tag + for(int i=0; i=1000 && c=100){ + //No decimel places + num = QString::number(qRound(bytes)); + }else if(bytes>=10){ + //need 1 decimel place + num = QString::number( (qRound(bytes*10)/10.0) ); + }else if(bytes>=1){ + //need 2 decimel places + num = QString::number( (qRound(bytes*100)/100.0) ); + }else{ + //Fully decimel (3 places) + num = "0."+QString::number(qRound(bytes*1000)); + } + //qDebug() << "Bytes to Human-readable:" << bytes << c << num << labs[c]; + return (num+labs[c]); +} + +QString LUtils::SecondsToDisplay(int secs){ + if(secs < 0){ return "??"; } + QString rem; //remaining + if(secs > 3600){ + int hours = secs/3600; + rem.append( QString::number(hours)+"h "); + secs = secs - (hours*3600); + } + if(secs > 60){ + int min = secs/60; + rem.append( QString::number(min)+"m "); + secs = secs - (min*60); + } + if(secs > 0){ + rem.append( QString::number(secs)+"s"); + }else{ + rem.append( "0s" ); + } + return rem; +} diff --git a/src-qt5/core/libLumina/LUtils.h b/src-qt5/core/libLumina/LUtils.h new file mode 100644 index 00000000..459fca60 --- /dev/null +++ b/src-qt5/core/libLumina/LUtils.h @@ -0,0 +1,78 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2012-2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_LIBRARY_UTILS_H +#define _LUMINA_LIBRARY_UTILS_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class LUtils{ +public: + + //Run an external command and return the exit code + static int runCmd(QString cmd, QStringList args = QStringList()); + //Run an external command and return any text output (one line per entry) + static QStringList getCmdOutput(QString cmd, QStringList args = QStringList()); + + //Read a text file + static QStringList readFile(QString filepath); + //Write a text file + static bool writeFile(QString filepath, QStringList contents, bool overwrite=false); + + //Check whether a file/path is a valid binary + static bool isValidBinary(QString& bin); //full path or name only + static bool isValidBinary(const char *bin){ + QString bins(bin); + return isValidBinary(bins); //overload for a "junk" binary variable input + } + + //Return all the dirs on the system which contain .desktop files + static QStringList systemApplicationDirs(); + + //Create the exec string to open a terminal in a particular directory + static QString GenerateOpenTerminalExec(QString term, QString dirpath); + + //List all the sub-directories of a parent dir (recursive) + static QStringList listSubDirectories(QString dir, bool recursive = true); + + //Convert an input file/dir path to an absolute file path + static QString PathToAbsolute(QString path); //This is primarily for CLI usage (relative paths) + static QString AppToAbsolute(QString path); //This is for looking up a binary/ *.desktop path + + //Get the list of all file extensions which Qt can read (lowercase) + static QStringList imageExtensions(bool wildcards = false); + + //Load a translation file for a Lumina Project + static QTranslator* LoadTranslation(QApplication *app, QString appname, QString locale = "", QTranslator *cTrans = 0); + //Other localization shortcuts + static QStringList knownLocales(); //Note: This only lists locales known to Lumina (so the i18n files need to be installed) + static void setLocaleEnv(QString lang, QString msg="", QString time="", QString num="" ,QString money="",QString collate="", QString ctype=""); + static QString currentLocale(); + + //Number format conversions + static double DisplaySizeToBytes(QString num); //Turn a display size (like 50M or 50KB) into a double for calculations (bytes) + static QString BytesToDisplaySize(qint64 bytes); //convert into a readable size (like 50M or 50KB) + + static QString SecondsToDisplay(int secs); //convert into a readable time +}; +#endif diff --git a/src-qt5/core/libLumina/LUtils.pri b/src-qt5/core/libLumina/LUtils.pri new file mode 100644 index 00000000..d5941a41 --- /dev/null +++ b/src-qt5/core/libLumina/LUtils.pri @@ -0,0 +1,34 @@ +#since this is the most common of the include files - make sure it only gets added once +!contains( HEADERS, $${PWD}/LUtils.h ){ + +include("$${PWD}/../../OS-detect.pri") + +QT *= concurrent + +#Setup any special defines (qmake -> C++) +GIT_VERSION=$$system(git describe --always) +!isEmpty(GIT_VERSION){ + DEFINES += GIT_VERSION='"\\\"$${GIT_VERSION}\\\""' +} +#Note: Saving the build date will break reproducible builds (time stamp always different) +# Disable this by default, but leave it possible to re-enable this as needed by user +#DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""' + +#LuminaOS files +HEADERS *= $${PWD}/LuminaOS.h +# LuminaOS support functions (or fall back to generic one) +exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ + SOURCES *= $${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp +}else:exists($${PWD}/LuminaOS-$${OS}.cpp){ + SOURCES *= $${PWD}/LuminaOS-$${OS}.cpp +}else{ + SOURCES *= $${PWD}/LuminaOS-template.cpp +} + +#LUtils Files +SOURCES *= $${PWD}/LUtils.cpp +HEADERS *= $${PWD}/LUtils.h + +INCLUDEPATH *= ${PWD} + +} diff --git a/src-qt5/core/libLumina/LuminaOS.h b/src-qt5/core/libLumina/LuminaOS.h index 50d6baec..96a587a8 100644 --- a/src-qt5/core/libLumina/LuminaOS.h +++ b/src-qt5/core/libLumina/LuminaOS.h @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-15, Ken Moore +// Copyright (c) 2014-16, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -18,7 +18,7 @@ #include #include -#include "LuminaUtils.h" +#include "LUtils.h" class LOS{ public: diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.h b/src-qt5/core/libLumina/LuminaSingleApplication.h index 725d8e40..bacf5640 100644 --- a/src-qt5/core/libLumina/LuminaSingleApplication.h +++ b/src-qt5/core/libLumina/LuminaSingleApplication.h @@ -25,7 +25,7 @@ #include #include -#include +#include //NOTE: This application type will automatically load the proper translation file(s) // if the application name is set properly diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.pri b/src-qt5/core/libLumina/LuminaSingleApplication.pri new file mode 100644 index 00000000..88ab7726 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaSingleApplication.pri @@ -0,0 +1,12 @@ +include("$${PWD}/../../OS-detect.pri") + +QT *= network x11extras + +#LUtils Files +SOURCES *= $${PWD}/LuminaSingleApplication.cpp +HEADERS *= $${PWD}/LuminaSingleApplication.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LuminaThemes.cpp b/src-qt5/core/libLumina/LuminaThemes.cpp index 03dfb771..70cd221d 100644 --- a/src-qt5/core/libLumina/LuminaThemes.cpp +++ b/src-qt5/core/libLumina/LuminaThemes.cpp @@ -6,7 +6,7 @@ //=========================================== #include "LuminaThemes.h" -#include "LuminaUtils.h" +#include "LUtils.h" #include "LuminaOS.h" #include #include diff --git a/src-qt5/core/libLumina/LuminaThemes.pri b/src-qt5/core/libLumina/LuminaThemes.pri new file mode 100644 index 00000000..0fe35b79 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaThemes.pri @@ -0,0 +1,10 @@ +include("$${PWD}/../../OS-detect.pri") + +#LUtils Files +SOURCES *= $${PWD}/LuminaThemes.cpp +HEADERS *= $${PWD}/LuminaThemes.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LuminaUtils.cpp b/src-qt5/core/libLumina/LuminaUtils.cpp deleted file mode 100644 index 0d808d1d..00000000 --- a/src-qt5/core/libLumina/LuminaUtils.cpp +++ /dev/null @@ -1,1063 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2013-2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#include "LuminaUtils.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -static QStringList fav; - -inline QStringList ProcessRun(QString cmd, QStringList args){ - //Assemble outputs - QStringList out; out << "1" << ""; //error code, string output - QProcess proc; - QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("LANG", "C"); - env.insert("LC_MESSAGES", "C"); - proc.setProcessEnvironment(env); - proc.setProcessChannelMode(QProcess::MergedChannels); - if(args.isEmpty()){ - proc.start(cmd, QIODevice::ReadOnly); - }else{ - proc.start(cmd,args ,QIODevice::ReadOnly); - } - QString info; - while(!proc.waitForFinished(1000)){ - if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal - QString tmp = proc.readAllStandardOutput(); - if(tmp.isEmpty()){ proc.terminate(); } - else{ info.append(tmp); } - } - out[0] = QString::number(proc.exitCode()); - out[1] = info+QString(proc.readAllStandardOutput()); - return out; -} -//============= -// LUtils Functions -//============= -QString LUtils::LuminaDesktopVersion(){ - QString ver = "1.1.1"; - #ifdef GIT_VERSION - ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); - #endif - return ver; -} - -QString LUtils::LuminaDesktopBuildDate(){ - #ifdef BUILD_DATE - return BUILD_DATE; - #endif - return ""; -} - -int LUtils::runCmd(QString cmd, QStringList args){ - /*QProcess proc; - proc.setProcessChannelMode(QProcess::MergedChannels); - if(args.isEmpty()){ - proc.start(cmd); - }else{ - proc.start(cmd, args); - } - //if(!proc.waitForStarted(30000)){ return 1; } //process never started - max wait of 30 seconds - while(!proc.waitForFinished(300)){ - if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal - QCoreApplication::processEvents(); - } - int ret = proc.exitCode(); - return ret;*/ - QFuture future = QtConcurrent::run(ProcessRun, cmd, args); - return future.result()[0].toInt(); //turn it back into an integer return code - -} - -QStringList LUtils::getCmdOutput(QString cmd, QStringList args){ - /*QProcess proc; - QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("LANG", "C"); - env.insert("LC_MESSAGES", "C"); - proc.setProcessEnvironment(env); - proc.setProcessChannelMode(QProcess::MergedChannels); - if(args.isEmpty()){ - proc.start(cmd); - }else{ - proc.start(cmd,args); - } - //if(!proc.waitForStarted(30000)){ return QStringList(); } //process never started - max wait of 30 seconds - while(!proc.waitForFinished(300)){ - if(proc.state() == QProcess::NotRunning){ break; } //somehow missed the finished signal - QCoreApplication::processEvents(); - } - QStringList out = QString(proc.readAllStandardOutput()).split("\n"); - return out;*/ - QFuture future = QtConcurrent::run(ProcessRun, cmd, args); - return future.result()[1].split("\n"); //Split the return message into lines -} - -QStringList LUtils::readFile(QString filepath){ - QStringList out; - QFile file(filepath); - if(file.open(QIODevice::Text | QIODevice::ReadOnly)){ - QTextStream in(&file); - while(!in.atEnd()){ - out << in.readLine(); - } - file.close(); - } - return out; -} - -bool LUtils::writeFile(QString filepath, QStringList contents, bool overwrite){ - QFile file(filepath); - if(file.exists() && !overwrite){ return false; } - bool ok = false; - if(contents.isEmpty()){ contents << "\n"; } - if( file.open(QIODevice::WriteOnly | QIODevice::Truncate) ){ - QTextStream out(&file); - out << contents.join("\n"); - if(!contents.last().isEmpty()){ out << "\n"; } //always end with a new line - file.close(); - ok = true; - } - return ok; -} - -bool LUtils::isValidBinary(QString& bin){ - if(!bin.startsWith("/")){ - //Relative path: search for it on the current "PATH" settings - QStringList paths = QString(qgetenv("PATH")).split(":"); - for(int i=0; i fmt = QImageReader::supportedImageFormats(); - for(int i=0; iremoveTranslator(cTrans); } - //Setup the translator - cTrans = new QTranslator(); - //Use the shortened locale code if specific code does not have a corresponding file - if(!QFile::exists(LOS::LuminaShare()+"i18n/"+appname+"_" + langCode + ".qm") && langCode!="en_US" ){ - langCode.truncate( langCode.indexOf("_") ); - } - QString filename = appname+"_"+langCode+".qm"; - //qDebug() << "FileName:" << filename << "Dir:" << LOS::LuminaShare()+"i18n/"; - if( cTrans->load( filename, LOS::LuminaShare()+"i18n/" ) ){ - app->installTranslator( cTrans ); - }else{ - //Translator could not be loaded for some reason - cTrans = 0; - if(langCode!="en_US"){ - qWarning() << " - Could not load Locale:" << langCode; - } - } - }else{ - //Only going to set the encoding since no application given - qDebug() << "Loading System Encoding:" << langEnc; - } - //Load current encoding for this locale - QTextCodec::setCodecForLocale( QTextCodec::codecForName(langEnc.toUtf8()) ); - return cTrans; -} - -QStringList LUtils::knownLocales(){ - QDir i18n = QDir(LOS::LuminaShare()+"i18n"); - if( !i18n.exists() ){ return QStringList(); } - QStringList files = i18n.entryList(QStringList() << "lumina-desktop_*.qm", QDir::Files, QDir::Name); - if(files.isEmpty()){ return QStringList(); } - //Now strip off the filename and just leave the locale tag - for(int i=0; i=1000 && c=100){ - //No decimel places - num = QString::number(qRound(bytes)); - }else if(bytes>=10){ - //need 1 decimel place - num = QString::number( (qRound(bytes*10)/10.0) ); - }else if(bytes>=1){ - //need 2 decimel places - num = QString::number( (qRound(bytes*100)/100.0) ); - }else{ - //Fully decimel (3 places) - num = "0."+QString::number(qRound(bytes*1000)); - } - //qDebug() << "Bytes to Human-readable:" << bytes << c << num << labs[c]; - return (num+labs[c]); -} - -QString LUtils::SecondsToDisplay(int secs){ - if(secs < 0){ return "??"; } - QString rem; //remaining - if(secs > 3600){ - int hours = secs/3600; - rem.append( QString::number(hours)+"h "); - secs = secs - (hours*3600); - } - if(secs > 60){ - int min = secs/60; - rem.append( QString::number(min)+"m "); - secs = secs - (min*60); - } - if(secs > 0){ - rem.append( QString::number(secs)+"s"); - }else{ - rem.append( "0s" ); - } - return rem; -} - -//Various function for finding valid QtQuick plugins on the system -bool LUtils::validQuickPlugin(QString ID){ - return ( !LUtils::findQuickPluginFile(ID).isEmpty() ); -} - -QString LUtils::findQuickPluginFile(QString ID){ - if(ID.startsWith("quick-")){ ID = ID.section("-",1,50); } //just in case - //Give preference to any user-supplied plugins (overwrites for system plugins) - QString path = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/quickplugins/quick-"+ID+".qml"; - if( QFile::exists(path) ){return path; } - path = LOS::LuminaShare()+"quickplugins/quick-"+ID+".qml"; - if( QFile::exists(path) ){return path; } - return ""; //could not be found -} - -QStringList LUtils::listQuickPlugins(){ - QDir dir(QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/quickplugins"); - QStringList files = dir.entryList(QStringList() << "quick-*.qml", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); - dir.cd(LOS::LuminaShare()+"quickplugins"); - files << dir.entryList(QStringList() << "quick-*.qml", QDir::Files | QDir::NoDotAndDotDot, QDir::Name); - for(int i=0; i, sym-links in the ~/.lumina/favorites dir} - //Include 0.8.4-devel versions in this upgrade (need to distinguish b/w devel and release versions later somehow) - QDir favdir(QDir::homePath()+"/.lumina/favorites"); - QFileInfoList symlinks = favdir.entryInfoList(QDir::Files | QDir::Dirs | QDir::System | QDir::NoDotAndDotDot); - QStringList favfile = LUtils::listFavorites(); //just in case some already exist - bool newentry = false; - for(int i=0; iscreenCount(); i++){ - if(desk->screenGeometry(i).x()==0){ - screen = QString::number(i); - screenGeom = desk->screenGeometry(i); - break; - } - } - //Now setup the default "desktopsettings.conf" and "sessionsettings.conf" files - QStringList deskset, sesset;//, lopenset; - - // -- SESSION SETTINGS -- - QStringList tmp = sysDefaults.filter("session_"); - if(tmp.isEmpty()){ tmp = sysDefaults.filter("session."); }//for backwards compat - sesset << "[General]"; //everything is in this section - sesset << "DesktopVersion="+LUtils::LuminaDesktopVersion(); - for(int i=0; i 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] - //returns true if something changed - int oldversion = LUtils::VersionStringToNumber(lastversion); - int nversion = LUtils::VersionStringToNumber(QApplication::applicationVersion()); - bool newversion = ( oldversion < nversion ); //increasing version number - bool newrelease = ( lastversion.contains("-devel", Qt::CaseInsensitive) && QApplication::applicationVersion().contains("-release", Qt::CaseInsensitive) ); //Moving from devel to release - - QString confdir = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/"; - //Check for the desktop settings file - QString dset = confdir+"desktopsettings.conf"; - bool firstrun = false; - if(!QFile::exists(dset) || oldversion < 5000){ - if( oldversion < 100000 && nversion>=100000 ){ system("rm -rf ~/.lumina"); qDebug() << "Current desktop settings obsolete: Re-implementing defaults"; } - else{ firstrun = true; } - LUtils::LoadSystemDefaults(); - } - //Convert the favorites framework as necessary (change occured with 0.8.4) - if(newversion || newrelease){ - LUtils::upgradeFavorites(oldversion); - } - //Convert from the old desktop numbering system to the new one (change occured with 1.0.1) - if(oldversion<=1000001){ - QStringList DS = LUtils::readFile(dset); - QList screens = QApplication::screens(); - for(int i=0; i=0 && ok && num< screens.length()){ - //This one needs to be converted - DS[i] = "[desktop-"+screens[num]->name()+"]"; - } - }else if(DS[i].startsWith("[panel")){ - bool ok = false; - int num = DS[i].section("panel",-1).section(".",0,0).toInt(&ok); - if(num>=0 && ok && num< screens.length()){ - //This one needs to be converted - QString rest = DS[i].section(".",1,-1); //everything after the desktop number in the current setting - DS[i] = "[panel_"+screens[num]->name()+"."+rest; - } - } - } - LUtils::writeFile(dset, DS, true); - } - - //Check the fluxbox configuration files - dset = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/"; - if(!QFile::exists(dset+"fluxbox-init")){ - firstrun = true; - } - bool fluxcopy = false; - if(!QFile::exists(dset+"fluxbox-init")){ fluxcopy=true; } - else if(!QFile::exists(dset+"fluxbox-keys")){fluxcopy=true; } - else if(oldversion < 60){ fluxcopy=true; qDebug() << "Current fluxbox settings obsolete: Re-implementing defaults"; } - if(fluxcopy){ - qDebug() << "Copying default fluxbox configuration files"; - if(QFile::exists(dset+"fluxbox-init")){ QFile::remove(dset+"fluxbox-init"); } - if(QFile::exists(dset+"fluxbox-keys")){ QFile::remove(dset+"fluxbox-keys"); } - QString finit = LUtils::readFile(LOS::LuminaShare()+"fluxbox-init-rc").join("\n"); - finit.replace("${XDG_CONFIG_HOME}", QString(getenv("XDG_CONFIG_HOME"))); - LUtils::writeFile(dset+"fluxbox-init", finit.split("\n")); - QFile::copy(LOS::LuminaShare()+"fluxbox-keys", dset+"fluxbox-keys"); - QFile::setPermissions(dset+"fluxbox-init", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); - QFile::setPermissions(dset+"fluxbox-keys", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); - } - - if(firstrun){ qDebug() << "First time using Lumina!!"; } - return (firstrun || newversion || newrelease); -} - -int LUtils::VersionStringToNumber(QString version){ - version = version.section("-",0,0); //trim any extra labels off the end - int maj, mid, min; //major/middle/minor version numbers (..) - maj = mid = min = 0; - bool ok = true; - maj = version.section(".",0,0).toInt(&ok); - if(ok){ mid = version.section(".",1,1).toInt(&ok); }else{ maj = 0; } - if(ok){ min = version.section(".",2,2).toInt(&ok); }else{ mid = 0; } - if(!ok){ min = 0; } - //Now assemble the number - //NOTE: This format allows numbers to be anywhere from 0->999 without conflict - return (maj*1000000 + mid*1000 + min); -} - -// ======================= -// RESIZEMENU CLASS -// ======================= -/*ResizeMenu::ResizeMenu(QWidget *parent) : QMenu(parent){ - this->setContentsMargins(1,1,1,1); - this->setMouseTracking(true); - resizeSide = NONE; - cAct = new QWidgetAction(this); - contents = 0; - connect(this, SIGNAL(aboutToShow()), this, SLOT(clearFlags()) ); - connect(this, SIGNAL(aboutToHide()), this, SLOT(clearFlags()) ); - connect(cAct, SIGNAL(hovered()), this, SLOT(clearFlags()) ); -} - -ResizeMenu::~ResizeMenu(){ - -} - -void ResizeMenu::setContents(QWidget *con){ - this->clear(); - cAct->setDefaultWidget(con); - this->addAction(cAct); - contents = con; //save for later - contents->setCursor(Qt::ArrowCursor); -} - -void ResizeMenu::mouseMoveEvent(QMouseEvent *ev){ - QRect geom = this->geometry(); - //Note: The exact position does not matter as much as the size - // since the window will be moved again the next time it is shown - // The "-2" in the sizing below accounts for the menu margins - QPoint gpos = this->mapToGlobal(ev->pos()); - bool handled = false; - switch(resizeSide){ - case TOP: - if(gpos.y() >= geom.bottom()-1){ break; } - geom.setTop(gpos.y()); - this->setGeometry(geom); - if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} - handled = true; - break; - case BOTTOM: - if(gpos.y() <= geom.top()+1){ break; } - geom.setBottom( gpos.y()); - this->setGeometry(geom); - if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} - handled = true; - break; - case LEFT: - if(gpos.x() >= geom.right()-1){ break; } - geom.setLeft(gpos.x()); - this->setGeometry(geom); - if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} - handled = true; - break; - case RIGHT: - if(gpos.x() <= geom.left()+1){ break; } - geom.setRight(gpos.x()); - this->setGeometry(geom); - if(contents!=0){ contents->setFixedSize(QSize(geom.width()-2, geom.height()-2));} - handled = true; - break; - default: //NONE - //qDebug() << " - Mouse At:" << ev->pos(); - //Just adjust the mouse cursor which is shown - if(ev->pos().x()<=1 && ev->pos().x() >= -1){ this->setCursor(Qt::SizeHorCursor); } - else if(ev->pos().x() >= this->width()-1 && ev->pos().x() <= this->width()+1){ this->setCursor(Qt::SizeHorCursor); } - else if(ev->pos().y()<=1 && ev->pos().y() >= -1){ this->setCursor(Qt::SizeVerCursor); } - else if(ev->pos().y() >= this->height()-1 && ev->pos().y() <= this->height()+1){ this->setCursor(Qt::SizeVerCursor); } - else{ this->setCursor(Qt::ArrowCursor); } - } - if(!handled){ QMenu::mouseMoveEvent(ev); } //do normal processing as well -} - -void ResizeMenu::mousePressEvent(QMouseEvent *ev){ - bool used = false; - if(ev->buttons().testFlag(Qt::LeftButton) && resizeSide==NONE){ - //qDebug() << "Mouse Press Event:" << ev->pos() << resizeSide; - if(ev->pos().x()<=1 && ev->pos().x() >= -1){resizeSide = LEFT; used = true;} - else if(ev->pos().x() >= this->width()-1 && ev->pos().x() <= this->width()+1){ resizeSide = RIGHT; used = true;} - else if(ev->pos().y()<=1 && ev->pos().y() >= -1){ resizeSide = TOP; used = true; } - else if(ev->pos().y() >= this->height()-1 && ev->pos().y() <= this->height()+1){ resizeSide = BOTTOM; used = true; } - } - if(used){ ev->accept(); this->grabMouse(); } - else{ QMenu::mousePressEvent(ev); } //do normal processing -} - -void ResizeMenu::mouseReleaseEvent(QMouseEvent *ev){ - this->releaseMouse(); - if(ev->button() == Qt::LeftButton && resizeSide!=NONE ){ - //qDebug() << "Mouse Release Event:" << ev->pos() << resizeSide; - resizeSide = NONE; - emit MenuResized(contents->size()); - ev->accept(); - }else{ - QMenu::mouseReleaseEvent(ev); //do normal processing - } -}*/ diff --git a/src-qt5/core/libLumina/LuminaUtils.h b/src-qt5/core/libLumina/LuminaUtils.h deleted file mode 100644 index 4a0a19af..00000000 --- a/src-qt5/core/libLumina/LuminaUtils.h +++ /dev/null @@ -1,131 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2012-2015, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#ifndef _LUMINA_LIBRARY_UTILS_H -#define _LUMINA_LIBRARY_UTILS_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include - -class LUtils{ -public: - //Get the current version/build of the Lumina desktop - static QString LuminaDesktopVersion(); - static QString LuminaDesktopBuildDate(); - - //Run an external command and return the exit code - static int runCmd(QString cmd, QStringList args = QStringList()); - //Run an external command and return any text output (one line per entry) - static QStringList getCmdOutput(QString cmd, QStringList args = QStringList()); - - //Read a text file - static QStringList readFile(QString filepath); - //Write a text file - static bool writeFile(QString filepath, QStringList contents, bool overwrite=false); - - //Check whether a file/path is a valid binary - static bool isValidBinary(QString& bin); //full path or name only - static bool isValidBinary(const char *bin){ - QString bins(bin); - return isValidBinary(bins); //overload for a "junk" binary variable input - } - - //Create the exec string to open a terminal in a particular directory - static QString GenerateOpenTerminalExec(QString term, QString dirpath); - - //List all the sub-directories of a parent dir (recursive) - static QStringList listSubDirectories(QString dir, bool recursive = true); - - //Convert an input file/dir path to an absolute file path - static QString PathToAbsolute(QString path); //This is primarily for CLI usage (relative paths) - static QString AppToAbsolute(QString path); //This is for looking up a binary/ *.desktop path - - //Get the list of all file extensions which Qt can read (lowercase) - static QStringList imageExtensions(bool wildcards = false); - - //Load a translation file for a Lumina Project - static QTranslator* LoadTranslation(QApplication *app, QString appname, QString locale = "", QTranslator *cTrans = 0); - //Other localization shortcuts - static QStringList knownLocales(); //Note: This only lists locales known to Lumina (so the i18n files need to be installed) - static void setLocaleEnv(QString lang, QString msg="", QString time="", QString num="" ,QString money="",QString collate="", QString ctype=""); - static QString currentLocale(); - - //Number format conversions - static double DisplaySizeToBytes(QString num); //Turn a display size (like 50M or 50KB) into a double for calculations (bytes) - static QString BytesToDisplaySize(qint64 bytes); //convert into a readable size (like 50M or 50KB) - - static QString SecondsToDisplay(int secs); //convert into a readable time - - //Various function for finding valid QtQuick plugins on the system - static bool validQuickPlugin(QString ID); - static QString findQuickPluginFile(QString ID); - static QStringList listQuickPlugins(); //List of valid ID's - static QStringList infoQuickPlugin(QString ID); //Returns: [Name, Description, Icon] - - //Various functions for the favorites sub-system - // Formatting Note: "::::[dir/app/]::::" - // the field might not be used for "app" flagged entries - static QStringList listFavorites(); - static bool saveFavorites(QStringList); - static bool isFavorite(QString path); - static bool addFavorite(QString path, QString name = ""); - static void removeFavorite(QString path); - static void upgradeFavorites(int fromoldversionnumber); - - //Load the default setup for the system - static void LoadSystemDefaults(bool skipOS = false); - static bool checkUserFiles(QString lastversion); //returns true if something changed - static int VersionStringToNumber(QString version); //convert the lumina version string to a number for comparisons - -}; - -//Special subclass for a menu which the user can grab the edges and resize as necessary -// Note: Make sure that you don't set 0pixel contents margins on this menu -// - it needs at least 1 pixel margins for the user to be able to grab it -/*class ResizeMenu : public QMenu{ - Q_OBJECT -public: - ResizeMenu(QWidget *parent = 0); - virtual ~ResizeMenu(); - - void setContents(QWidget *con); - -private: - enum SideFlag{NONE, TOP, BOTTOM, LEFT, RIGHT}; - SideFlag resizeSide; - QWidget *contents; - QWidgetAction *cAct; - -private slots: - void clearFlags(){ - resizeSide=NONE; - } - -protected: - virtual void mouseMoveEvent(QMouseEvent *ev); - virtual void mousePressEvent(QMouseEvent *ev); - virtual void mouseReleaseEvent(QMouseEvent *ev); - -signals: - void MenuResized(QSize); //Emitted when the menu is manually resized by the user - -};*/ - -#endif diff --git a/src-qt5/core/libLumina/LuminaX11.pri b/src-qt5/core/libLumina/LuminaX11.pri new file mode 100644 index 00000000..0e472dd4 --- /dev/null +++ b/src-qt5/core/libLumina/LuminaX11.pri @@ -0,0 +1,13 @@ + +QT *= x11extras + +LIBS *= -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage + +#LUtils Files +SOURCES *= $${PWD}/LuminaX11.cpp +HEADERS *= $${PWD}/LuminaX11.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index b0d2edd9..d6342269 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -6,7 +6,7 @@ //=========================================== #include "LuminaXDG.h" #include "LuminaOS.h" -#include "LuminaUtils.h" +#include "LUtils.h" #include #include #include diff --git a/src-qt5/core/libLumina/LuminaXDG.pri b/src-qt5/core/libLumina/LuminaXDG.pri new file mode 100644 index 00000000..6f3a2b7c --- /dev/null +++ b/src-qt5/core/libLumina/LuminaXDG.pri @@ -0,0 +1,10 @@ +QT *= multimedia svg + +#LUtils Files +SOURCES *= $${PWD}/LuminaXDG.cpp +HEADERS *= $${PWD}/LuminaXDG.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +include(LUtils.pri) diff --git a/src-qt5/core/libLumina/colors/Black.qss.colors b/src-qt5/core/libLumina/colors/Black.qss.colors deleted file mode 100644 index b6269188..00000000 --- a/src-qt5/core/libLumina/colors/Black.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(204,204,204,200) -ACCENTDISABLECOLOR=rgba(204,204,204,100) -ALTBASECOLOR=rgb(37,37,37) -BASECOLOR=rgb(36,36,36) -HIGHLIGHTCOLOR=rgba(218,222,226,170) -HIGHLIGHTDISABLECOLOR=rgba(218,222,226,160) -PRIMARYCOLOR=rgba(0,0,4,250) -PRIMARYDISABLECOLOR=rgba(0,0,0,180) -SECONDARYCOLOR=rgba(192,192,192,200) -SECONDARYDISABLECOLOR=rgba(192,192,192,100) -TEXTCOLOR=white -TEXTDISABLECOLOR=darkgrey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Blue-Light.qss.colors b/src-qt5/core/libLumina/colors/Blue-Light.qss.colors deleted file mode 100644 index 5bcb85f6..00000000 --- a/src-qt5/core/libLumina/colors/Blue-Light.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(157,161,165,200) -ACCENTDISABLECOLOR=rgba(156,156,157,200) -ALTBASECOLOR=rgb(239,247,255) -BASECOLOR=rgb(165,210,255) -HIGHLIGHTCOLOR=rgb(110,158,208) -HIGHLIGHTDISABLECOLOR=rgba(110,158,208,150) -PRIMARYCOLOR=rgba(181,212,238,200) -PRIMARYDISABLECOLOR=rgba(234,237,238,100) -SECONDARYCOLOR=rgba(200,222,243,200) -SECONDARYDISABLECOLOR=rgba(200,222,243,100) -TEXTCOLOR=black -TEXTDISABLECOLOR=grey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Grey-Dark.qss.colors b/src-qt5/core/libLumina/colors/Grey-Dark.qss.colors deleted file mode 100644 index 207edd04..00000000 --- a/src-qt5/core/libLumina/colors/Grey-Dark.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(43,43,45,200) -ACCENTDISABLECOLOR=rgba(43,43,45,100) -ALTBASECOLOR=rgb(63,61,61) -BASECOLOR=rgb(93,92,92) -HIGHLIGHTCOLOR=rgba(218,222,226,170) -HIGHLIGHTDISABLECOLOR=rgba(218,222,226,160) -PRIMARYCOLOR=rgba(75,77,80,240) -PRIMARYDISABLECOLOR=rgba(75,77,80,180) -SECONDARYCOLOR=rgba(144,140,142,200) -SECONDARYDISABLECOLOR=rgba(144,140,142,100) -TEXTCOLOR=white -TEXTDISABLECOLOR=darkgrey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors deleted file mode 100644 index 89534aaa..00000000 --- a/src-qt5/core/libLumina/colors/Lumina-Glass.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(255,252,234,100) -ACCENTDISABLECOLOR=rgba(0,0,0,100) -ALTBASECOLOR=rgba(255,255,255,125) -BASECOLOR=rgb(247,246,244) -HIGHLIGHTCOLOR=rgba(212,212,212,170) -HIGHLIGHTDISABLECOLOR=rgba(184,184,184,100) -PRIMARYCOLOR=rgba(235,242,242,200) -PRIMARYDISABLECOLOR=rgba(214,220,220,200) -SECONDARYCOLOR=rgba(100,100,100,200) -SECONDARYDISABLECOLOR=rgba(100,100,100,100) -TEXTCOLOR=black -TEXTDISABLECOLOR=grey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Lumina-Gold.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Gold.qss.colors deleted file mode 100644 index cfad7069..00000000 --- a/src-qt5/core/libLumina/colors/Lumina-Gold.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(149,144,122,200) -ACCENTDISABLECOLOR=rgba(74,71,60,200) -ALTBASECOLOR=rgb(230,227,204) -BASECOLOR=rgb(247,247,240) -HIGHLIGHTCOLOR=rgba(252,237,149,170) -HIGHLIGHTDISABLECOLOR=rgba(252,237,149,100) -PRIMARYCOLOR=rgba(238,234,226,200) -PRIMARYDISABLECOLOR=rgba(238,235,224,100) -SECONDARYCOLOR=rgba(247,209,112,200) -SECONDARYDISABLECOLOR=rgba(234,198,106,150) -TEXTCOLOR=black -TEXTDISABLECOLOR=grey -TEXTHIGHLIGHTCOLOR=black \ No newline at end of file diff --git a/src-qt5/core/libLumina/colors/Lumina-Green.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Green.qss.colors deleted file mode 100644 index 99f16acb..00000000 --- a/src-qt5/core/libLumina/colors/Lumina-Green.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(149,144,122,200) -ACCENTDISABLECOLOR=rgba(74,71,60,200) -ALTBASECOLOR=rgb(230,230,230) -BASECOLOR=rgb(247,246,244) -HIGHLIGHTCOLOR=rgba(66,153,76,170) -HIGHLIGHTDISABLECOLOR=rgba(66,153,76,100) -PRIMARYCOLOR=rgba(229,231,238,200) -PRIMARYDISABLECOLOR=rgba(229,231,238,100) -SECONDARYCOLOR=rgba(76,197,84,200) -SECONDARYDISABLECOLOR=rgba(76,197,84,150) -TEXTCOLOR=black -TEXTDISABLECOLOR=grey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Lumina-Purple.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Purple.qss.colors deleted file mode 100644 index f2ba7e05..00000000 --- a/src-qt5/core/libLumina/colors/Lumina-Purple.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(247,231,255,200) -ACCENTDISABLECOLOR=rgba(167,166,166,200) -ALTBASECOLOR=rgb(63,61,61) -BASECOLOR=rgb(93,92,92) -HIGHLIGHTCOLOR=rgba(76,38,171,170) -HIGHLIGHTDISABLECOLOR=rgba(57,19,139,170) -PRIMARYCOLOR=rgba(65,67,80,240) -PRIMARYDISABLECOLOR=rgba(65,67,80,180) -SECONDARYCOLOR=rgba(74,65,120,200) -SECONDARYDISABLECOLOR=rgba(71,65,120,100) -TEXTCOLOR=white -TEXTDISABLECOLOR=darkgrey -TEXTHIGHLIGHTCOLOR=white \ No newline at end of file diff --git a/src-qt5/core/libLumina/colors/Lumina-Red.qss.colors b/src-qt5/core/libLumina/colors/Lumina-Red.qss.colors deleted file mode 100644 index f73bdb75..00000000 --- a/src-qt5/core/libLumina/colors/Lumina-Red.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(255,244,245,200) -ACCENTDISABLECOLOR=rgba(167,166,166,200) -ALTBASECOLOR=rgb(63,61,61) -BASECOLOR=rgb(93,92,92) -HIGHLIGHTCOLOR=rgba(175,9,9,170) -HIGHLIGHTDISABLECOLOR=rgba(154,20,20,170) -PRIMARYCOLOR=rgba(80,66,66,240) -PRIMARYDISABLECOLOR=rgba(80,66,66,180) -SECONDARYCOLOR=rgba(120,22,23,200) -SECONDARYDISABLECOLOR=rgba(120,22,23,100) -TEXTCOLOR=white -TEXTDISABLECOLOR=darkgrey -TEXTHIGHLIGHTCOLOR=white \ No newline at end of file diff --git a/src-qt5/core/libLumina/colors/PCBSD10-Default.qss.colors b/src-qt5/core/libLumina/colors/PCBSD10-Default.qss.colors deleted file mode 100644 index efcea51d..00000000 --- a/src-qt5/core/libLumina/colors/PCBSD10-Default.qss.colors +++ /dev/null @@ -1,13 +0,0 @@ -ACCENTCOLOR=rgba(182,186,191,200) -ACCENTDISABLECOLOR=rgba(190,190,191,200) -ALTBASECOLOR=rgb(241,241,241) -BASECOLOR=rgb(247,246,244) -HIGHLIGHTCOLOR=rgb(129,184,243) -HIGHLIGHTDISABLECOLOR=rgba(129,184,243,150) -PRIMARYCOLOR=rgba(224,236,238,200) -PRIMARYDISABLECOLOR=rgba(234,237,238,100) -SECONDARYCOLOR=rgba(200,222,243,200) -SECONDARYDISABLECOLOR=rgba(200,222,243,100) -TEXTCOLOR=black -TEXTDISABLECOLOR=grey -TEXTHIGHLIGHTCOLOR=black diff --git a/src-qt5/core/libLumina/colors/Solarized-Dark.qss.colors b/src-qt5/core/libLumina/colors/Solarized-Dark.qss.colors deleted file mode 100644 index d4f0f1c9..00000000 --- a/src-qt5/core/libLumina/colors/Solarized-Dark.qss.colors +++ /dev/null @@ -1,16 +0,0 @@ -# Solarized is a theme created by Ethan Schoonover -# See the project site at http://ethanschoonover.com/solarized -# Or see the source at https://github.com/altercation/solarized -ACCENTCOLOR=rgb(181,137,0) -ACCENTDISABLECOLOR=rgb(181,137,0) -ALTBASECOLOR=rgb(0,43,54) -BASECOLOR=rgb(0,43,54) -HIGHLIGHTCOLOR=rgb(7,54,66) -HIGHLIGHTDISABLECOLOR=rgb(7,53,66) -PRIMARYCOLOR=rgb(0,43,54) -PRIMARYDISABLECOLOR=rgb(7,54,66) -SECONDARYCOLOR=rgb(0,43,54) -SECONDARYDISABLECOLOR=rgb(7,54,66) -TEXTCOLOR=rgb(131,148,150) -TEXTDISABLECOLOR=rgb(88,110,117) -TEXTHIGHLIGHTCOLOR=rgb(147,161,161) diff --git a/src-qt5/core/libLumina/colors/Solarized-Light.qss.colors b/src-qt5/core/libLumina/colors/Solarized-Light.qss.colors deleted file mode 100644 index fead1915..00000000 --- a/src-qt5/core/libLumina/colors/Solarized-Light.qss.colors +++ /dev/null @@ -1,16 +0,0 @@ -# Solarized is a theme created by Ethan Schoonover -# See the project site at http://ethanschoonover.com/solarized -# Or see the source at https://github.com/altercation/solarized -ACCENTCOLOR=rgb(38,139,210) -ACCENTDISABLECOLOR=rgb(38,139,210) -ALTBASECOLOR=rgb(253,246,227) -BASECOLOR=rgb(253,246,227) -HIGHLIGHTCOLOR=rgb(238,232,213) -HIGHLIGHTDISABLECOLOR=rgb(238,232,213) -PRIMARYCOLOR=rgb(253,246,227) -PRIMARYDISABLECOLOR=rgb(238,232,213) -SECONDARYCOLOR=rgb(253,246,227) -SECONDARYDISABLECOLOR=rgb(238,232,213) -TEXTCOLOR=rgb(131,148,150) -TEXTDISABLECOLOR=rgb(147,161,161) -TEXTHIGHLIGHTCOLOR=rgb(88,110,117) diff --git a/src-qt5/core/libLumina/libLumina.pro b/src-qt5/core/libLumina/libLumina.pro index 2786b875..a7dc160a 100644 --- a/src-qt5/core/libLumina/libLumina.pro +++ b/src-qt5/core/libLumina/libLumina.pro @@ -1,57 +1,57 @@ -include("$${PWD}/../../OS-detect.pri") +#include("$${PWD}/../../OS-detect.pri") -QT += core network widgets x11extras multimedia concurrent svg +#QT += core network widgets x11extras multimedia concurrent svg -define +#define #Setup any special defines (qmake -> C++) -GIT_VERSION=$$system(git describe --always) -!isEmpty(GIT_VERSION){ - DEFINES += GIT_VERSION='"\\\"$${GIT_VERSION}\\\""' -} -DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""' +#GIT_VERSION=$$system(git describe --always) +#!isEmpty(GIT_VERSION){ +# DEFINES += GIT_VERSION='"\\\"$${GIT_VERSION}\\\""' +#} +#DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""' -TARGET=LuminaUtils +#TARGET=LuminaUtils -target.path = $${L_LIBDIR} +#target.path = $${L_LIBDIR} -DESTDIR= $$_PRO_FILE_PWD_/ +#DESTDIR= $$_PRO_FILE_PWD_/ -TEMPLATE = lib -LANGUAGE = C++ -VERSION = 1 +#TEMPLATE = lib +#LANGUAGE = C++ +#VERSION = 1 -HEADERS += LuminaXDG.h \ - LuminaUtils.h \ - LuminaX11.h \ - LuminaThemes.h \ - LuminaOS.h \ - LuminaSingleApplication.h +#HEADERS += LuminaXDG.h \ +# LuminaUtils.h \ +# LuminaX11.h \ +# LuminaThemes.h \ +# LuminaOS.h \ +# LuminaSingleApplication.h -SOURCES += LuminaXDG.cpp \ - LuminaUtils.cpp \ - LuminaX11.cpp \ - LuminaThemes.cpp \ - LuminaSingleApplication.cpp +#SOURCES += LuminaXDG.cpp \ +# LuminaUtils.cpp \ +# LuminaX11.cpp \ +# LuminaThemes.cpp \ +# LuminaSingleApplication.cpp # Also load the OS template as available for # LuminaOS support functions (or fall back to generic one) -exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ - SOURCES += LuminaOS-$${LINUX_DISTRO}.cpp -}else:exists($${PWD}/LuminaOS-$${OS}.cpp){ - SOURCES += LuminaOS-$${OS}.cpp -}else{ - SOURCES += LuminaOS-template.cpp -} - -LIBS += -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage - -include.path=$${L_INCLUDEDIR} -include.files=LuminaXDG.h \ - LuminaUtils.h \ - LuminaX11.h \ - LuminaThemes.h \ - LuminaOS.h \ - LuminaSingleApplication.h +#exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ +# SOURCES += LuminaOS-$${LINUX_DISTRO}.cpp +#}else:exists($${PWD}/LuminaOS-$${OS}.cpp){ +# SOURCES += LuminaOS-$${OS}.cpp +#}else{ +# SOURCES += LuminaOS-template.cpp +#} + +#LIBS += -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage + +#include.path=$${L_INCLUDEDIR} +#include.files=LuminaXDG.h \ +# LuminaUtils.h \ +# LuminaX11.h \ +# LuminaThemes.h \ +# LuminaOS.h \ +# LuminaSingleApplication.h colors.path=$${L_SHAREDIR}/lumina-desktop/colors colors.files=colors/*.qss.colors @@ -65,4 +65,4 @@ themes.files=themes/*.qss.template globs.path=$${L_SHAREDIR}/lumina-desktop globs.files=xtrafiles/globs2 -INSTALLS += target include colors themes globs +INSTALLS += colors themes globs diff --git a/src-qt5/core/libLumina/quickplugins/quick-sample.qml b/src-qt5/core/libLumina/quickplugins/quick-sample.qml deleted file mode 100644 index 18b10d77..00000000 --- a/src-qt5/core/libLumina/quickplugins/quick-sample.qml +++ /dev/null @@ -1,12 +0,0 @@ -// Plugin-Name=Sample -// Plugin-Description=A simple example for QtQuick/QML plugins -// Plugin-Icon=preferences-plugin -// Created: Ken Moore (ken@pcbsd.org) May 2015 - -import QtQuick.Controls 1.3 - -Label { - text: "Sample" - color: "blue" - font.bold: true -} \ No newline at end of file diff --git a/src-qt5/core/libLumina/themes/Glass.qss.template b/src-qt5/core/libLumina/themes/Glass.qss.template deleted file mode 100644 index d594d25e..00000000 --- a/src-qt5/core/libLumina/themes/Glass.qss.template +++ /dev/null @@ -1,539 +0,0 @@ -/* ALL THE TEMPLATE WIDGETS */ -INHERITS=None - -/* ALL THE WIDGETS WITH THE BASE COLOR */ -QMainWindow, QMenu, QDialog, QMessageBox{ - background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 %%BASECOLOR%%, stop:1 %%ALTBASECOLOR%%); - color: %%TEXTCOLOR%%; - border: 1px solid %%ACCENTDISABLECOLOR%%; - border-radius: 3px; -} - -/* ALL THE WIDGETS WITH AN ALTERNATE BASE COLOR */ -QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{ - background: %%ALTBASECOLOR%%; - color: %%TEXTCOLOR%%; - border-color: %%ACCENTDISABLECOLOR%%; - selection-background-color: %%HIGHLIGHTCOLOR%%; - selection-color: %%TEXTHIGHLIGHTCOLOR%%; -} - -/* PAGES OF CONTAINER WIDGETS */ -QStackedWidget .QWidget{ - background: transparent; - color: %%TEXTCOLOR%%; - border: none; -} - -QToolBox::tab{ - color: %%TEXTCOLOR%%; -} - -/* MENU WIDGETS */ -QMenuBar, QMenuBar::item,QToolBar{ - background: transparent; - border: none; - color: %%TEXTCOLOR%%; -} - -QStatusBar{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%); - border: none; - color: %%TEXTCOLOR%%; -} -QToolBar:top{ - border-bottom: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:bottom{ - border-top: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:left{ - border-right: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:right{ - border-left: 1px solid %%ACCENTCOLOR%%; -} - -QMenuBar::item{ - background: transparent; /*Use the menu bar color*/ - padding-left: 4px; - padding-right: 2px; -} - -QMenuBar::item:selected, QMenuBar::item:pressed, QMenu::item:selected{ -background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); -color: %%TEXTHIGHLIGHTCOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -} -QMenuBar::item:disabled{ - color: %%TEXTDISABLECOLOR%%; -} - -/*QMenu::item{ - border: 2px solid #808080; -}*/ - -QMenu::item{ - background: transparent; - border: 1px solid transparent; - color: %%TEXTCOLOR%%; - padding: 4px 30px 4px 20px; - margin-left: 3px; - margin-right: 3px; -} - -/* TAB WIDGETS */ -/*QTabBar{ - Custom Font settings need to be here and NOT in the ::tab fields, - otherwise it will break auto-scaling of the tab sizes to fit the text -}*/ -/* Transparency does not work on main pages within tabwidgets*/ -QTabWidget QStackedWidget .QWidget{ - background: rgb(230,230,230); - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; -} -QTabWidget{ - color: black; - border: none; -} -QTabWidget QLabel{ - color: black; -} -QTabBar::tab { - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%ALTBASECOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - padding: 2px; - color: %%TEXTCOLOR%%; -} -QTabBar::tab:top{ - border-top-left-radius: 4px; - border-top-right-radius: 4px; - max-width: 100em; - min-width: 0em; -} -QTabBar::tab:bottom{ - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - max-width: 100em; - min-width: 0em; -} -/* left/right tab indicators appear to be reversed in Qt*/ -QTabBar::tab:right{ - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - max-height: 100em; - min-height: 0em; -} -QTabBar::tab:left{ - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - max-height: 100em; - min-height: 0em; -} -QTabBar::tab:selected{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 rgb(230,230,230)); - border-bottom: none; -} -QTabBar::tab:hover { - background: %%HIGHLIGHTCOLOR%%; - border: 1px solid %%ACCENTDISABLECOLOR%%; - } - -QTabBar::tab:!selected:top { - margin-top: 4px; -} -QTabBar::tab:!selected:bottom{ - margin-bottom: 4px; -} -QTabBar::tab:!selected:right{ - margin-left: 4px; -} -QTabBar::tab:!selected:left{ - margin-right: 4px; -} - -/* FRAME WIDGETS */ -QToolTip{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%ALTBASECOLOR%%); - border-radius: 3px; - border: 1px solid %%ACCENTCOLOR%%; - padding: 1px; - color: %%TEXTCOLOR%%; -} - -QLabel{ - background: transparent; - border: none; - color: %%TEXTCOLOR%%; -} -QAbstractButton::disabled{ - color: %%TEXTDISABLECOLOR%%; -} - -/* GROUP BOX */ -QGroupBox{ - background-color: transparent; - border-color: %%ACCENTCOLOR%%; - border-radius: 5px; - margin-top: 2ex; - font-weight: bold; -} -QGroupBox::title{ - subcontrol-origin: margin; - subcontrol-position: top center; - padding: 0 3px; - background: transparent; - /*border: none;*/ - color: %%TEXTCOLOR%%; -} - -/* COMBO BOX */ -QComboBox{ - /*border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - padding: 1px 18px 1px 3px;*/ - color: %%TEXTCOLOR%%; - background: %%ALTBASECOLOR%%; - selection-background-color: %%HIGHLIGHTCOLOR%%; - } - - -/* VIEW WIDGETS */ -QTreeView, QListView{ - background: %%ALTBASECOLOR%%; - alternate-background-color: %%BASECOLOR%%; - /*selection-background-color: %%SECONDARYCOLOR%%;*/ - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - /*show-decoration-selected: 1;*/ - color: %%TEXTCOLOR%%; - selection-color: %%TEXTCOLOR%%; -} - -QTreeView:focus, QListView:focus{ - border: 1px solid %%HIGHLIGHTDISABLECOLOR%%; -} - -/* -QTreeView::item and QListView::item unneccessary: -Already set though parentage and causes usage errors if set manually -*/ - -/*QTreeView::item:selected, QListView::item:selected{ - background: %%SECONDARYDISABLECOLOR%%; - border-color: %%ACCENTCOLOR%%; - color: %%TEXTCOLOR%%; -}*/ - -QTreeView::item:hover, QListView::item:hover{ - background: %%HIGHLIGHTDISABLECOLOR%%; -} -QTreeView::item:selected:hover, QListView::item:selected:hover{ - background: %%HIGHLIGHTDISABLECOLOR%%; -} -QTreeView::item:selected, QListView::item:selected{ - background: %%SECONDARYDISABLECOLOR%%; -} -QTreeView::item:selected:focus, QListView::item:selected:focus{ - background: %%SECONDARYCOLOR%%; -} -QHeaderView{ - background: %%HIGHLIGHTDISABLECOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; - border: none; - border-top-left-radius: 3px; /*match the list/tree view widgets*/ - border-top-right-radius: 3px; /*match the list/tree view widgets*/ -} -QHeaderView::section{ - background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/ - color: %%TEXTHIGHLIGHTCOLOR%%; - border-color: %%ACCENTCOLOR%%; - padding: 1px; - padding-left: 4px; -} -QHeaderView::section:hover{ - background: %%PRIMARYCOLOR%%; - border-color: %%ACCENTDISABLECOLOR%%; - color: %%TEXTCOLOR%%; -} - -/* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/ -QScrollBar{ - background:%%ALTBASECOLOR%%; -} -QScrollBar:horizontal{ - margin: 0px 0px 0px 0px; -} -QScrollBar:vertical{ - margin: 0px 0px 0px 0px; -} -QScrollBar::handle{ - background: %%SECONDARYCOLOR%%; - border: 1px solid transparent; - border-radius: 7px; -} -QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{ - background: %%SECONDARYDISABLECOLOR%%; -} -QScrollBar::add-line{ -subcontrol-origin: none; -} -QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{ -height: 0px; -} -QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{ -width: 0px; -} -QScrollBar::sub-line{ -subcontrol-origin: none; -} - -/* SLIDERS */ -QSlider::groove:horizontal { -border: 1px solid %%ACCENTCOLOR%%; -background: %%ALTBASECOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::groove:vertical { -border: 1px solid %%ACCENTCOLOR%%; -background: %%ALTBASECOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::sub-page:horizontal { -background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, - stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); -border: 1px solid %%ACCENTCOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::sub-page:vertical { -background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, - stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); -border: 1px solid %%ACCENTCOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::add-page:horizontal{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::add-page:vertical{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::handle:horizontal{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -width: 13px; -border-radius: 4px; -} -QSlider::handle:vertical{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -height: 13px; -border-radius: 4px; -} -QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{ -border: 1px solid %%ACCENTDISABLECOLOR%%; -/*background: %%HIGHLIGHTCOLOR%%;*/ -} - -QSlider::sub-page:horizontal:disabled { -background: %%ACCENTDISABLECOLOR%%; -border-color: %%ACCENTCOLOR%%; -} - -QSlider::add-page:horizontal:disabled { -background: %%ACCENTDISABLECOLOR%%; -border-color: %%ACCENTCOLOR%%; -} - -QSlider::handle:horizontal:disabled { -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -} - -/* BUTTONS */ -QPushButton{ - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); - padding: 2px; - padding-right: 4px; - color: %%TEXTCOLOR%%; - } - -QToolButton{ /* Assume a flat button for every toolbutton by default*/ - color: %%TEXTCOLOR%%; - border: 1px solid transparent; - border-radius: 3px; - background-color: transparent; - padding: 1px; -} - - QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{ - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - margin-top: 2px; - } - -QPushButton:flat, QToolButton:flat{ - background-color: transparent; - border: 1px solid transparent; /* no border for a flat button */ -} - -QPushButton:hover, QToolButton:hover{ - border: 1px solid %%ACCENTCOLOR%%; - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - color: %%TEXTHIGHLIGHTCOLOR%%; -} -QRadioButton, QCheckBox{ - padding: 2px; - border: 1px solid transparent; - border-radius: 3px; - color: %%TEXTCOLOR%%; -} -QRadioButton::hover, QCheckBox:hover{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; -} -QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{ - border: 1px solid %%TEXTCOLOR%%; -} -QRadioButton::indicator{ - border-radius: 7px; -} -QRadioButton::indicator:checked{ - background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent); -} -QCheckBox::indicator:checked, QGroupBox::indicator:checked{ - padding: 1px; - background-origin: content; - background-clip: content; - background: %%TEXTCOLOR%%; -} -QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{ - padding: 1px; - background-origin: content; - background-clip: content; - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%); -} - -/* PROGRESSBAR */ -QProgressBar{ - background-color: %%ALTBASECOLOR%%; - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 5px; - color: %%TEXTCOLOR%%; - text-align: center; - padding: 1px; -} - QProgressBar::chunk { - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); - /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/ - border-radius: 5px; - } -QProgressBar::chunk:vertical{ - margin-left: 2px; - margin-right: 2px; -} -QProgressBar::chunk:horizontal{ - margin-top: 2px; - margin-bottom: 2px; -} - -QWidget#LuminaBootSplash{ - background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 30), stop:1 rgba(229, 229, 229, 70)); - border-radius: 5px; -} - -LDPlugin#applauncher{ - background-color: transparent; - border: none; -} -LDPlugin#applauncher QToolButton, LDPlugin, LDPlugin#desktopview QListWidget::item{ - background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 30), stop:1 rgba(229, 229, 229, 70)); - border-width: 3px; - border-style: solid; - border-radius: 5px; - border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - color: white; -} - -LDPlugin#applauncher QToolButton:hover, LDPlugin#desktopview QListWidget::item:hover{ - background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 100), stop:1 rgba(229, 229, 229, 150)); - border-width: 3px; - border-style: solid; - border-radius: 5px; - border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - color: %%TEXTHIGHLIGHTCOLOR%%; -} -QWidget#LuminaPanelColor{ - background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 60), stop:1 rgba(229, 229, 229, 110)); - border-radius: 3px; -} -/*Special taskmanager window buttons: based on window state*/ -LTBWidget{ - border: 1px solid transparent; - border-radius: 3px; -} -LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/ -LTBWidget#WindowVisible{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%PRIMARYCOLOR%%, stop: 1 transparent); -} -LTBWidget#WindowInvisible{ - background: transparent; -} -LTBWidget#WindowActive{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent); -} -LTBWidget#WindowAttention{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); -} -LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover, QToolButton:hover{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); - color: %%TEXTHIGHLIGHTCOLOR%%; - border-width: 1px; - border-style: solid; - border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); - border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); -} -/* CALENDER WIDGET */ - /* (This is a special hack since there is no official support for stylesheets for this widget) */ - QCalendarWidget QWidget#qt_calendar_navigationbar{ - background-color: %%ALTBASECOLOR%%; - } -QCalendarWidget QWidget{ - background-color: %%BASECOLOR%%; - alternate-background-color: rgba(255, 255, 255, 50); - color: %%TEXTCOLOR%%; -} -QCalendarWidget QAbstractButton{ - background-color: transparent; -} -QCalendarWidget QAbstractButton::menu-indicator{ - image: none; -} -QCalendarWidget QAbstractItemView{ - selection-background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 20), stop:1 rgba(229, 229, 229, 100)); - selection-color: %%TEXTHIGHLIGHTCOLOR%%; -} -QCalendarWidget QWidget#qt_calendar_calendarview{ - background-color: rgb(220,220,220); - border: none; -} diff --git a/src-qt5/core/libLumina/themes/Lumina-default.qss.template b/src-qt5/core/libLumina/themes/Lumina-default.qss.template deleted file mode 100644 index 9f03d4ae..00000000 --- a/src-qt5/core/libLumina/themes/Lumina-default.qss.template +++ /dev/null @@ -1,494 +0,0 @@ -/* ALL THE TEMPLATE WIDGETS */ -INHERITS=None - -/* ALL THE WIDGETS WITH THE BASE COLOR */ -QMainWindow, QMenu, QDialog, QMessageBox{ - background: %%BASECOLOR%%; - color: %%TEXTCOLOR%%; -} - -/* ALL THE WIDGETS WITH AN ALTERNATE BASE COLOR */ -QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{ - background: %%ALTBASECOLOR%%; - color: %%TEXTCOLOR%%; - border-color: %%ACCENTDISABLECOLOR%%; - selection-background-color: %%HIGHLIGHTCOLOR%%; - selection-color: %%TEXTHIGHLIGHTCOLOR%%; - -} - -/* PAGES OF CONTAINER WIDGETS */ -QStackedWidget .QWidget, QTabWidget .QWidget{ - background: %%ALTBASECOLOR%%; - color: %%TEXTCOLOR%%; - border: none; -} -QToolBox::tab{ - color: %%TEXTCOLOR%%; -} - -/* MENU WIDGETS */ -QMenuBar, QMenuBar::item,QToolBar{ - background: %%SECONDARYCOLOR%%; - border: none; - color: %%TEXTCOLOR%%; -} - -QStatusBar{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%); - border: none; - color: %%TEXTCOLOR%%; -} -QToolBar:top{ - border-bottom: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:bottom{ - border-top: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:left{ - border-right: 1px solid %%ACCENTCOLOR%%; -} -QToolBar:right{ - border-left: 1px solid %%ACCENTCOLOR%%; -} - -QMenuBar::item{ - background: transparent; /*Use the menu bar color*/ - padding-left: 4px; - padding-right: 2px; -} - -QMenuBar::item:selected, QMenuBar::item:pressed, QMenu::item:selected{ -background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); -color: %%TEXTHIGHLIGHTCOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -} -QMenuBar::item:disabled{ - color: %%TEXTDISABLECOLOR%%; -} - -QMenu::item{ - border: 2px solid #808080; -} - -QMenu::item{ - background: transparent; - border: 1px solid transparent; - color: %%TEXTCOLOR%%; - padding: 4px 30px 4px 20px; - margin-left: 3px; - margin-right: 3px; -} - -/* TAB WIDGETS */ -/*QTabBar{ - Custom Font settings need to be here and NOT in the ::tab fields, - otherwise it will break auto-scaling of the tab sizes to fit the text -}*/ -QTabBar::tab { - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - padding: 2px; - color: %%TEXTCOLOR%%; -} -QTabBar::tab:top{ - border-top-left-radius: 4px; - border-top-right-radius: 4px; - max-width: 100em; - min-width: 0em; -} -QTabBar::tab:bottom{ - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - max-width: 100em; - min-width: 0em; -} -/* left/right tab indicators appear to be reversed in Qt*/ -QTabBar::tab:right{ - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - max-height: 100em; - min-height: 0em; -} -QTabBar::tab:left{ - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - max-height: 100em; - min-height: 0em; -} -QTabBar::tab:selected{ - background: %%HIGHLIGHTDISABLECOLOR%%; -} -QTabBar::tab:hover { - background: %%HIGHLIGHTCOLOR%%; - border: 1px solid %%ACCENTDISABLECOLOR%%; - } - -QTabBar::tab:!selected:top { - margin-top: 4px; -} -QTabBar::tab:!selected:bottom{ - margin-bottom: 4px; -} -QTabBar::tab:!selected:right{ - margin-left: 4px; -} -QTabBar::tab:!selected:left{ - margin-right: 4px; -} - -/* FRAME WIDGETS */ -QToolTip{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%ALTBASECOLOR%%); - border-radius: 3px; - border: 1px solid %%ACCENTCOLOR%%; - padding: 1px; - color: %%TEXTCOLOR%%; -} - -QLabel{ - background: transparent; - border: none; - color: %%TEXTCOLOR%%; -} -QAbstractButton::disabled{ - color: %%TEXTDISABLECOLOR%%; -} - -/* GROUP BOX */ -QGroupBox{ - background-color: transparent; - border-color: %%ACCENTCOLOR%%; - border-radius: 5px; - margin-top: 2ex; - font-weight: bold; -} -QGroupBox::title{ - subcontrol-origin: margin; - subcontrol-position: top center; - padding: 0 3px; - background: transparent; - /*border: none;*/ - color: %%TEXTCOLOR%%; -} - -/* COMBO BOX */ -QComboBox{ - /*border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - padding: 1px 18px 1px 3px;*/ - color: %%TEXTCOLOR%%; - background: %%ALTBASECOLOR%%; - selection-background-color: %%HIGHLIGHTCOLOR%%; - } - - -/* VIEW WIDGETS */ -QTreeView, QListView{ - background: %%ALTBASECOLOR%%; - alternate-background-color: %%BASECOLOR%%; - /*selection-background-color: %%SECONDARYCOLOR%%;*/ - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - /*show-decoration-selected: 1;*/ - color: %%TEXTCOLOR%%; - selection-color: %%TEXTCOLOR%%; -} - -QTreeView:focus, QListView:focus{ - border: 1px solid %%HIGHLIGHTDISABLECOLOR%%; -} - -/* -QTreeView::item and QListView::item unneccessary: -Already set though parentage and causes usage errors if set manually -*/ - -/*QTreeView::item:selected, QListView::item:selected{ - background: %%SECONDARYDISABLECOLOR%%; - border-color: %%ACCENTCOLOR%%; - color: %%TEXTCOLOR%%; -}*/ - -QTreeView::item:hover, QListView::item:hover{ - background: %%HIGHLIGHTDISABLECOLOR%%; -} -QTreeView::item:selected:hover, QListView::item:selected:hover{ - background: %%HIGHLIGHTDISABLECOLOR%%; -} -QTreeView::item:selected, QListView::item:selected{ - background: %%SECONDARYDISABLECOLOR%%; -} -QTreeView::item:selected:focus, QListView::item:selected:focus{ - background: %%SECONDARYCOLOR%%; -} -QHeaderView{ - background: %%HIGHLIGHTDISABLECOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; - border: none; - border-top-left-radius: 3px; /*match the list/tree view widgets*/ - border-top-right-radius: 3px; /*match the list/tree view widgets*/ -} -QHeaderView::section{ - background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/ - color: %%TEXTHIGHLIGHTCOLOR%%; - border-color: %%ACCENTCOLOR%%; - padding: 1px; - padding-left: 4px; -} -QHeaderView::section:hover{ - background: %%PRIMARYCOLOR%%; - border-color: %%ACCENTDISABLECOLOR%%; - color: %%TEXTCOLOR%%; -} - -/* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/ -QScrollBar{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); - /*border: 1px solid %%ACCENTCOLOR%%;*/ -} -QScrollBar:horizontal{ - margin: 0px 20px 0px 20px; -} -QScrollBar:vertical{ - margin: 20px 0px 20px 0px; -} -QScrollBar::sub-page, QScrollBar::add-page{ - background: %%BASECOLOR%%; - border: 1px solid %%ACCENTCOLOR%%; -} -QScrollBar::sub-page:vertical{ - border-bottom: none; -} -QScrollBar::add-page:vertical{ - border-top: none; -} -QScrollBar::sub-page:horizontal{ - border-right: none; -} -QScrollBar::add-page:horizontal{ - border-left: none; -} -QScrollBar::handle{ - background: QLinearGradient(x1: 0, y1: -0.3, x2: 0, y2: 1.3, stop: 0 %%BASECOLOR%%, stop: 0.5 %%SECONDARYCOLOR%%, stop: 1 %%BASECOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; -} -QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{ - background: %%HIGHLIGHTCOLOR%%; -} -QScrollBar::add-line{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; -subcontrol-position: bottom right; -subcontrol-origin: margin; -} -QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{ -height: 20px; -} -QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{ -width: 20px; -} -QScrollBar::sub-line{ - background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; -subcontrol-position: top left; -subcontrol-origin: margin; -height: 20px; -} -/* SLIDERS */ -QSlider::groove:horizontal { -border: 1px solid %%ACCENTCOLOR%%; -background: %%ALTBASECOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::groove:vertical { -border: 1px solid %%ACCENTCOLOR%%; -background: %%ALTBASECOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::sub-page:horizontal { -background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, - stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); -border: 1px solid %%ACCENTCOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::sub-page:vertical { -background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, - stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); -border: 1px solid %%ACCENTCOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::add-page:horizontal{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -height: 10px; -border-radius: 3px; -} -QSlider::add-page:vertical{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -width: 10px; -border-radius: 3px; -} -QSlider::handle:horizontal{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -width: 13px; -border-radius: 4px; -} -QSlider::handle:vertical{ -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -height: 13px; -border-radius: 4px; -} -QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{ -border: 1px solid %%ACCENTDISABLECOLOR%%; -/*background: %%HIGHLIGHTCOLOR%%;*/ -} - -QSlider::sub-page:horizontal:disabled { -background: %%ACCENTDISABLECOLOR%%; -border-color: %%ACCENTCOLOR%%; -} - -QSlider::add-page:horizontal:disabled { -background: %%ACCENTDISABLECOLOR%%; -border-color: %%ACCENTCOLOR%%; -} - -QSlider::handle:horizontal:disabled { -background: %%ALTBASECOLOR%%; -border: 1px solid %%ACCENTCOLOR%%; -} - -/* BUTTONS */ -QPushButton{ - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); - padding: 2px; - padding-right: 4px; - color: %%TEXTCOLOR%%; - } - -QToolButton{ /* Assume a flat button for every toolbutton by default*/ - color: %%TEXTCOLOR%%; - border: 1px solid transparent; - border-radius: 3px; - background-color: transparent; - padding: 1px; -} - - QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{ - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - margin-top: 2px; - } - -QPushButton:flat, QToolButton:flat{ - background-color: transparent; - border: 1px solid transparent; /* no border for a flat button */ -} - -QPushButton:hover, QToolButton:hover{ - border: 1px solid %%ACCENTCOLOR%%; - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - color: %%TEXTHIGHLIGHTCOLOR%%; -} -QRadioButton, QCheckBox{ - padding: 2px; - border: 1px solid transparent; - border-radius: 3px; - color: %%TEXTCOLOR%%; -} -QRadioButton::hover, QCheckBox:hover{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); - border: 1px solid %%ACCENTCOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; -} -QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{ - border: 1px solid %%TEXTCOLOR%%; -} -QRadioButton::indicator{ - border-radius: 7px; -} -QRadioButton::indicator:checked{ - background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent); -} -QCheckBox::indicator:checked, QGroupBox::indicator:checked{ - padding: 1px; - background-origin: content; - background-clip: content; - background: %%TEXTCOLOR%%; -} -QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{ - padding: 1px; - background-origin: content; - background-clip: content; - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%); -} - -/* PROGRESSBAR */ -QProgressBar{ - background-color: %%ALTBASECOLOR%%; - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 5px; - color: %%TEXTCOLOR%%; - text-align: center; - padding: 1px; -} - QProgressBar::chunk { - background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); - /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/ - border-radius: 5px; - } -QProgressBar::chunk:vertical{ - margin-left: 2px; - margin-right: 2px; -} -QProgressBar::chunk:horizontal{ - margin-top: 2px; - margin-bottom: 2px; -} - - /* SPINBOX */ -/*QAbstractSpinBox{ - background-color: %%ALTBASECOLOR%%; - border: 1px solid %%ACCENTCOLOR%%; - border-radius: 3px; -} -QAbstractSpinBox:disabled{ - color: %%ACCENTDISABLECOLOR%%; -}*/ -/*QAbstractSpinBox::down-button{ - subcontrol-origin: border; - subcontrol-position: left; - width: 16px; - border-width: 1px; -} -QAbstractSpinBox::up-button{ - subcontrol-origin: border; - subcontrol-position: right; - width: 16px; - border-width: 1px; -}*/ -/* -QAbstractSpinBox::down-arrow{ - border-image: url(":/trolltech/styles/commonstyle/images/left-16.png"); - width: 16px; - height: 16px; -} -QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::down-arrow:off, QAbstractSpinBox::up-arrow:off{ - border-image: url(:/none); -} -QAbstractSpinBox::up-arrow{ - border-image: url(":/trolltech/styles/commonstyle/images/right-16.png"); - width: 16px; - height: 16px; -}*/ diff --git a/src-qt5/core/libLumina/themes/None.qss.template b/src-qt5/core/libLumina/themes/None.qss.template deleted file mode 100644 index 7d923b1e..00000000 --- a/src-qt5/core/libLumina/themes/None.qss.template +++ /dev/null @@ -1,118 +0,0 @@ -/* This is a blank stylesheet to disable the Lumina Themes almost entirely*/ -QWidget{ - font-family: %%FONT%%; - font-size: %%FONTSIZE%%; -} -/* Set the panel appearance for this theme (unless manually customized) */ -QWidget#LuminaPanelColor{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%); - border-radius: 5px; -} -QWidget#LuminaBootSplash{ - background: %%BASECOLOR%%; - border-radius: 5px; -} - -/* Set the default canvas appearance for Lumina desktop plugins*/ -/* Default to a non-transparent background for all desktop plugins*/ -LDPlugin{ - background: %%BASECOLOR%%; - border-radius: 5px; -} -/* Now specify which plugins should have a transparent background */ -LDPlugin#applauncher, LDPlugin#desktopview{ - background: transparent; - border-radius: 5px; -} - -LDPlugin#applauncher QToolButton{ -background: transparent; - border: none; - border-radius: 5px; - color: white; -} -LDPlugin#applauncher QToolButton:hover{ - background: %%PRIMARYDISABLECOLOR%%; - border: none; - border-radius: 5px; - color: %%TEXTHIGHLIGHTCOLOR%%; -} - -LDPlugin#desktopview QListWidget{ - background: transparent; - border: 1px solid transparent; -} -LDPlugin#desktopview QListWidget::item{ - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 transparent, - stop: 0.7 transparent, - stop: 1.0 %%PRIMARYDISABLECOLOR%%); - border-radius: 5px; - color: %%TEXTCOLOR%%; -} - -LDPlugin#desktopview QListWidget::item:hover{ - background: %%PRIMARYDISABLECOLOR%%; - border-radius: 5px; - color: %%TEXTHIGHLIGHTCOLOR%%; -} -/*For the special widgets on the user button*/ -UserItemWidget, ItemWidget{ - background: transparent; - border-radius: 3px; -} -UserItemWidget:hover, ItemWidget:hover{ - background: %%HIGHLIGHTCOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; -} - -/*Special taskmanager window buttons: based on window state*/ -LTBWidget{ - border: 1px solid transparent; - border-radius: 3px; -} -LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/ -LTBWidget#WindowVisible{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%SECONDARYCOLOR%%, stop: 1 transparent); -} -LTBWidget#WindowInvisible{ - /* Primary color is used for the panel appearance, so use that to make it disappear*/ - background: transparent; -} -LTBWidget#WindowActive{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent); -} -LTBWidget#WindowAttention{ - background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); -} -LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover{ - background: %%HIGHLIGHTCOLOR%%; - color: %%TEXTHIGHLIGHTCOLOR%%; - border: 1px solid %%ACCENTCOLOR%%; -} - -/* CALENDER WIDGET */ - /* (This is a special hack since there is no official support for stylesheets for this widget) */ - QCalendarWidget QWidget#qt_calendar_navigationbar{ - background-color: %%ALTBASECOLOR%%; - } -QCalendarWidget QWidget{ - background-color: %%BASECOLOR%%; - alternate-background-color: %%HIGHLIGHTDISABLECOLOR%%; - color: %%TEXTCOLOR%%; -} -QCalendarWidget QAbstractButton{ - background-color: transparent; -} -QCalendarWidget QAbstractButton::menu-indicator{ - image: none; -} -QCalendarWidget QAbstractItemView{ - background-color: %%SECONDARYCOLOR%%; - selection-background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);; - selection-color: %%TEXTHIGHLIGHTCOLOR%%; -} -QCalendarWidget QWidget#qt_calendar_calendarview{ - background-color: %%ALTBASECOLOR%%; - border: none; -} \ No newline at end of file diff --git a/src-qt5/core/libLumina/xtrafiles/globs2 b/src-qt5/core/libLumina/xtrafiles/globs2 deleted file mode 100644 index 0a783316..00000000 --- a/src-qt5/core/libLumina/xtrafiles/globs2 +++ /dev/null @@ -1,991 +0,0 @@ -# Fallback "globs2" file from the FreeDesktop mimetype database (9/23/16) -# This is only used if the official database cannot be found on the system -80:application/x-cd-image:*.iso -80:application/x-doom-wad:*.wad -50:text/x-vala:*.vala -50:application/x-nes-rom:*.nez -50:audio/ac3:*.ac3 -50:application/x-mswrite:*.wri -50:application/smil+xml:*.smil -50:text/x-verilog:*.v -50:application/x-qpress:*.qp -50:image/x-exr:*.exr -50:application/x-compress:*.z -50:image/x-jng:*.jng -50:application/oda:*.oda -50:application/vnd.oasis.opendocument.database:*.odb -50:application/vnd.sun.xml.base:*.odb -50:application/vnd.oasis.opendocument.chart:*.odc -50:text/vtt:*.vtt -50:application/x-xz-compressed-tar:*.txz -50:application/vnd.oasis.opendocument.formula:*.odf -50:application/vnd.oasis.opendocument.formula:*.odf -50:application/vnd.oasis.opendocument.graphics:*.odg -50:application/vnd.oasis.opendocument.graphics:*.odg -50:text/x-ldif:*.ldif -50:application/vnd.oasis.opendocument.image:*.odi -50:image/jp2:*.jp2 -50:application/x-oleo:*.oleo -50:application/oxps:*.xps -50:application/vnd.oasis.opendocument.text-master:*.odm -50:application/vnd.oasis.opendocument.text-master:*.odm -50:application/x-ruby:*.rb -50:audio/vnd.rn-realaudio:*.ra -50:application/x-mimearchive:*.mht -50:application/vnd.oasis.opendocument.presentation:*.odp -50:application/vnd.oasis.opendocument.presentation:*.odp -50:application/x-raw-disk-image-xz-compressed:*.raw-disk-image.xz -50:application/vnd.oasis.opendocument.spreadsheet:*.ods -50:application/vnd.oasis.opendocument.spreadsheet:*.ods -50:application/vnd.oasis.opendocument.text:*.odt -50:application/vnd.oasis.opendocument.text:*.odt -50:image/x-portable-bitmap:*.pbm -50:application/x-egon:*.egon -50:application/x-font-pcf:*.pcf.z -50:application/x-xliff:*.xliff -50:application/vnd.rn-realmedia:*.rm -50:application/x-abiword:*.abw -50:image/vnd.rn-realpix:*.rp -50:image/x-sigma-x3f:*.x3f -50:video/webm:*.webm -50:text/rust:*.rs -50:text/vnd.rn-realtext:*.rt -50:image/webp:*.webp -50:application/x-cpio:*.cpio -50:audio/midi:*.mid -50:application/x-mif:*.mif -50:video/vnd.rn-realvideo:*.rv -50:application/vnd.google-earth.kml+xml:*.kml -50:image/x-3ds:*.3ds -50:image/x-photo-cd:*.pcd -50:application/x-pc-engine-rom:*.pce -50:application/x-font-pcf:*.pcf -50:application/x-cisco-vpn-settings:*.pcf -50:model/vrml:*.wrl -50:text/x-fortran:*.f95 -50:text/plain:*.txt -50:image/x-xpixmap:*.xpm -50:application/vnd.hp-pcl:*.pcl -50:application/x-trash:*.bak -50:application/vnd.openxmlformats-officedocument.presentationml.template:*.potx -50:application/vnd.openxmlformats-officedocument.presentationml.template:*.potx -50:application/x-sms-rom:*.sg -50:application/x-shellscript:*.sh -50:model/vrml:*.vrml -50:text/vcard:*.vcard -50:image/x-skencil:*.sk -50:image/x-pict:*.pct -50:video/3gpp2:*.3g2 -50:text/x-vala:*.vapi -50:application/x-sharedlib:*.so -50:application/x-tzo:*.tzo -50:video/x-javafx:*.fxm -50:image/jpeg:*.jpe -50:audio/x-aifc:*.aifc -50:application/x-lzma-compressed-tar:*.tar.lzma -50:x-epoc/x-sisx-app:*.sisx -50:audio/x-aiff:*.aiff -50:audio/x-aifc:*.aiffc -50:image/jp2:*.jpf -50:application/x-hdf:*.hdf4 -50:application/x-hdf:*.hdf5 -50:application/x-aportisdoc:*.pdb -50:application/vnd.palm:*.pdb -50:application/x-aportisdoc:*.pdc -50:application/x-profile:gmon.out -50:application/x-jbuilder-project:*.jpr -50:application/pdf:*.pdf -50:application/x-bzpdf:*.pdf.bz2 -50:application/x-theme:*.theme -50:image/jpeg:*.jpg -50:application/x-raw-disk-image-xz-compressed:*.img.xz -50:application/x-jbuilder-project:*.jpx -50:image/jp2:*.jpx -50:text/x-svsrc:*.sv -50:image/x-quicktime:*.qtif -50:image/x-kodak-k25:*.k25 -50:text/x-scheme:*.ss -50:application/vnd.openxmlformats-officedocument.presentationml.presentation:*.pptx -50:application/vnd.openxmlformats-officedocument.presentationml.presentation:*.pptx -50:application/x-ace:*.ace -50:image/vnd.zbrush.pcx:*.pcx -50:text/x-adasrc:*.ads -50:text/x-tcl:*.tk -50:text/x-changelog:changelog -50:audio/flac:*.flac -50:text/x-adasrc:*.adb -50:text/html:*.htm -50:text/x-google-video-pointer:*.gvp -50:text/troff:*.tr -50:audio/x-matroska:*.mka -50:text/vnd.trolltech.linguist:*.ts -50:video/mp2t:*.ts -50:application/x-cb7:*.cb7 -50:text/x-vhdl:*.vhdl -50:audio/ogg:*.oga -50:audio/x-vorbis+ogg:*.oga -50:audio/x-flac+ogg:*.oga -50:audio/x-speex+ogg:*.oga -50:application/xslt+xml:*.xsl -50:application/x-saturn-rom:*.iso -50:application/x-wii-rom:*.iso -50:application/x-gamecube-rom:*.iso -50:application/atom+xml:*.atom -50:video/3gpp:*.3ga -50:application/x-kontour:*.kon -50:audio/ogg:*.ogg -50:video/ogg:*.ogg -50:audio/x-vorbis+ogg:*.ogg -50:audio/x-flac+ogg:*.ogg -50:audio/x-speex+ogg:*.ogg -50:video/x-theora+ogg:*.ogg -50:image/x-pentax-pef:*.pef -50:application/vnd.ms-cab-compressed:*.cab -50:text/markdown:*.mkd -50:application/rdf+xml:*.rdfs -50:application/x-zoo:*.zoo -50:video/x-ogm+ogg:*.ogm -50:text/x-rpm-spec:*.spec -50:application/x-x509-ca-cert:*.pem -50:video/3gpp2:*.3gp2 -50:application/x-xpinstall:*.xpi -50:video/x-matroska:*.mkv -50:application/ram:*.ram -50:application/x-designer:*.ui -50:application/x-gtk-builder:*.ui -50:audio/x-wavpack-correction:*.wvc -50:video/ogg:*.ogv -50:application/vnd.tcpdump.pcap:*.cap -50:application/ogg:*.ogx -50:application/x-rar:*.rar -50:application/x-xbel:*.xbel -50:application/jrd+json:*.jrd -50:application/vnd.ms-tnef:*.tnef -50:image/x-panasonic-raw:*.raw -50:video/3gpp:*.3gp -50:audio/vnd.rn-realaudio:*.rax -50:text/x-python:*.wsgi -50:application/x-7z-compressed:*.7z -50:audio/x-wavpack:*.wvp -50:image/x-cmu-raster:*.ras -50:application/x-font-type1:*.pfa -50:application/x-font-type1:*.pfb -50:application/x-kpovmodeler:*.kpm -50:text/x-ocaml:*.mli -50:image/x-fuji-raf:*.raf -50:application/ld+json:*.jsonld -50:audio/x-ms-asx:*.wvx -50:application/x-kpresenter:*.kpr -50:application/x-font-bdf:*.bdf -50:application/x-cd-image:*.iso9660 -50:application/x-kpresenter:*.kpt -50:text/x-eiffel:*.e -50:application/x-font-afm:*.afm -50:text/x-nfo:*.nfo -50:image/x-compressed-xcf:*.xcf.bz2 -50:text/x-cobol:*.cbl -50:video/mp2t:*.bdm -50:video/quicktime:*.moov -50:text/x-texinfo:*.texi -50:application/x-wwf:*.wwf -50:application/x-cbr:*.cbr -50:application/pkcs12:*.pfx -50:application/metalink+xml:*.metalink -50:application/x-cbt:*.cbt -50:video/mpeg:[0-9][0-9][0-9].vdr -50:application/x-perl:*.perl -50:application/vnd.mozilla.xul+xml:*.xul -50:application/x-cbz:*.cbz -50:text/x-log:*.log -50:application/x-smaf:*.mmf -50:application/javascript:*.jsm -50:text/x-meson:meson_options.txt -50:application/x-gba-rom:*.agb -50:application/x-hwt:*.hwt -50:text/x-iptables:*.iptables -50:application/mathml+xml:*.mml -50:application/oxps:*.oxps -50:video/mp2t:*.bdmv -50:video/3gpp:*.3gpp -50:application/x-docbook+xml:*.docbook -50:audio/x-mod:*.m15 -50:application/x-chess-pgn:*.pgn -50:audio/x-mo3:*.mo3 -50:application/x-bcpio:*.bcpio -50:application/pgp-encrypted:*.pgp -50:application/pgp-keys:*.pgp -50:application/pgp-signature:*.pgp -50:application/x-bzip-compressed-tar:*.tar.bz -50:application/x-amipro:*.sam -50:application/vnd.google-earth.kmz:*.kmz -50:video/quicktime:*.qt -50:image/x-portable-graymap:*.pgm -50:application/x-krita:*.kra -50:application/x-dar:*.dar -50:application/vnd.wordperfect:*.wp -50:image/vnd.wap.wbmp:*.wbmp -50:application/x-spss-sav:*.sav -50:text/x-scons:sconstruct -50:video/x-msvideo:*.divx -50:audio/x-wavpack:*.wv -50:application/xhtml+xml:*.xhtml -50:video/x-mng:*.mng -50:text/x-uuencode:*.uue -50:image/x-pict:*.pict1 -50:image/x-pict:*.pict2 -50:image/x-bzeps:*.eps.bz2 -50:application/x-n64-rom:*.z64 -50:audio/x-musepack:*.mp+ -50:text/x-c++hdr:*.hxx -50:application/rdf+xml:*.rdf -50:application/x-netcdf:*.cdf -50:application/vnd.rn-realmedia:*.rmvb -50:application/x-dbf:*.dbf -50:audio/mp2:*.mp2 -50:video/mpeg:*.mp2 -50:application/vnd.lotus-1-2-3:*.123 -50:application/x-php:*.php -50:application/x-font-pcf:*.pcf.gz -50:audio/mpeg:*.mp3 -50:video/mp4:*.mp4 -50:text/x-python:*.py -50:audio/x-minipsf:*.minipsf -50:audio/x-xm:*.xm -50:application/vnd.corel-draw:*.cdr -50:audio/x-xi:*.xi -50:image/x-xwindowdump:*.xwd -50:application/x-desktop:*.desktop -50:application/x-bzip-compressed-tar:*.tb2 -50:text/x-tex:*.latex -50:text/x-moc:*.moc -50:audio/x-mod:*.mod -50:application/vnd.openxmlformats-officedocument.presentationml.slideshow:*.ppsx -50:application/x-docbook+xml:*.dbk -50:text/x-mof:*.mof -50:application/x-xz:*.xz -50:application/vnd.ms-excel.sheet.binary.macroEnabled.12:*.xlsb -50:application/vnd.ms-excel.sheet.binary.macroenabled.12:*.xlsb -50:application/x-kspread:*.ksp -50:audio/x-aiff:*.aif -50:text/markdown:*.markdown -50:text/vcard:*.gcrd -50:application/x-php:*.php3 -50:application/x-php:*.php4 -50:application/x-php:*.php5 -50:text/x-reject:*.rej -50:application/vnd.ms-excel.sheet.macroEnabled.12:*.xlsm -50:application/vnd.ms-excel.sheet.macroenabled.12:*.xlsm -50:video/mp2t:*.m2ts -50:text/x-ms-regedit:*.reg -50:application/vnd.openxmlformats-officedocument.wordprocessingml.document:*.docx -50:application/vnd.openxmlformats-officedocument.wordprocessingml.document:*.docx -50:text/x-dcl:*.dcl -50:application/dicom:*.dcm -50:video/vnd.mpegurl:*.m1u -50:text/x-scheme:*.scm -50:application/x-qtiplot:*.qti.gz -50:application/pkix-cert:*.cer -50:image/x-kodak-dcr:*.dcr -50:application/x-tar:*.tar -50:text/x-patch:*.patch -50:text/x-scala:*.scala -50:image/vnd.djvu:*.djvu -50:audio/x-musepack:*.mpc -50:video/quicktime:*.mov -50:video/mpeg:*.mpe -50:application/x-tarz:*.taz -50:application/x-trash:*.old -50:video/mpeg:*.mpg -50:video/mp2t:*.mpl -50:application/vnd.stardivision.draw:*.sda -50:application/vnd.stardivision.calc:*.sdc -50:text/x-mrml:*.mrml -50:application/vnd.stardivision.impress:*.sdd -50:audio/x-musepack:*.mpp -50:application/vnd.ms-excel.template.macroEnabled.12:*.xltm -50:application/vnd.ms-excel.template.macroenabled.12:*.xltm -50:video/mp4:*.lrv -50:video/mp2t:*.m2t -50:image/x-gzeps:*.epsf.gz -50:application/x-lrzip:*.lrz -50:video/3gpp2:*.3gpp2 -50:image/jpeg:*.jpeg -50:application/mbox:*.mbox -50:application/vnd.stardivision.impress:*.sdp -50:application/sdp:*.sdp -50:audio/x-mpegurl:*.m3u8 -50:application/vnd.apple.mpegurl:*.m3u8 -50:application/vnd.stardivision.chart:*.sds -50:image/x-dds:*.dds -50:application/x-kugar:*.kud -50:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:*.xlsx -50:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:*.xlsx -50:application/vnd.stardivision.writer:*.sdw -50:application/x-fictionbook+xml:*.fb2 -50:application/x-xzpdf:*.pdf.xz -50:text/x-copying:copying -50:application/x-bzip-compressed-tar:*.tbz -50:application/zlib:*.zz -50:application/x-lrzip-compressed-tar:*.tar.lrz -50:text/x-bibtex:*.bib -50:image/x-rgb:*.rgb -50:application/x-gzpostscript:*.ps.gz -50:application/x-gameboy-rom:*.cgb -50:application/x-php:*.phps -50:application/vnd.debian.binary-package:*.deb -50:application/x-qw:*.qif -50:image/x-quicktime:*.qif -50:audio/x-mpegurl:*.m3u -50:application/vnd.apple.mpegurl:*.m3u -50:application/vnd.openxmlformats-officedocument.spreadsheetml.template:*.xltx -50:application/vnd.openxmlformats-officedocument.spreadsheetml.template:*.xltx -50:text/x-c++src:*.c++ -50:application/x-ccmx:*.ccmx -50:application/vnd.coffeescript:*.coffee -50:application/octet-stream:*.bin -50:application/x-saturn-rom:*.bin -50:application/smil+xml:*.kino -50:application/pgp-keys:*.pkr -50:application/vnd.ms-visio.stencil.macroEnabled.main+xml:*.vssm -50:image/cgm:*.cgm -50:text/x-mup:*.not -50:text/x-tcl:*.tcl -50:audio/mp4:*.m4a -50:application/x-x509-ca-cert:*.der -50:audio/x-m4b:*.m4b -50:application/x-pagemaker:*.pm6 -50:text/x-meson:meson.build -50:application/x-sami:*.sami -50:application/vnd.ms-visio.stencil.main+xml:*.vssx -50:audio/x-iriver-pla:*.pla -50:text/x-mrml:*.mrl -50:application/vnd.nintendo.snes.rom:*.sfc -50:application/xml:*.xsd -50:video/mp4:*.m4v -50:video/mp2t:*.mpls -50:application/x-planperfect:*.pln -50:text/x-tex:*.ltx -50:image/x-minolta-mrw:*.mrw -50:application/metalink4+xml:*.meta4 -50:application/vnd.ms-powerpoint.addin.macroEnabled.12:*.ppam -50:application/vnd.ms-visio.template.macroEnabled.main+xml:*.vstm -50:application/x-compressed-tar:*.tar.gz -50:audio/x-scpls:*.pls -50:application/vnd.ms-htmlhelp:*.chm -50:application/x-hwp:*.hwp -50:application/x-abiword:*.abw.gz -50:application/x-alz:*.alz -50:application/x-kword:*.kwd -50:text/x-lua:*.lua -50:application/vnd.ms-visio.template.main+xml:*.vstx -50:video/vnd.mpegurl:*.m4u -50:text/x-ooc:*.ooc -50:application/x-msi:*.msi -50:application/x-kexiproject-sqlite2:*.kexi -50:application/x-kexiproject-sqlite3:*.kexi -50:video/x-anim:*.anim[1-9j] -50:application/x-pagemaker:*.pmd -50:application/x-abiword:*.zabw -50:application/x-gameboy-rom:*.sgb -50:application/x-kword:*.kwt -50:application/x-go-sgf:*.sgf -50:application/pkcs10:*.p10 -50:image/x-sgi:*.sgi -50:application/pkcs12:*.p12 -50:application/x-blender:*.blender -50:application/vnd.stardivision.writer:*.sgl -50:application/x-msx-rom:*.msx -50:application/x-dia-shape:*.shape -50:application/x-blender:*.blend -50:application/x-blender:*.blend -50:application/x-mimearchive:*.mhtml -50:audio/midi:*.midi -50:application/x-java-jnlp-file:*.jnlp -50:text/x-cmake:cmakelists.txt -50:audio/x-amzxml:*.amz -50:image/x-tga:*.tpic -50:audio/AMR:*.amr -50:text/x-makefile:makefile -50:text/x-scons:sconscript.* -50:text/x-tex:*.tex -50:application/vnd.oasis.opendocument.graphics-flat-xml:*.fodg -50:application/vnd.oasis.opendocument.graphics-flat-xml:*.fodg -50:text/sgml:*.sgm -50:application/x-amiga-disk-format:*.adf -50:image/x-msod:*.msod -50:audio/x-mod:*.mtm -50:image/png:*.png -50:application/vnd.oasis.opendocument.presentation-flat-xml:*.fodp -50:application/vnd.oasis.opendocument.presentation-flat-xml:*.fodp -50:application/x-navi-animation:*.ani -50:application/vnd.oasis.opendocument.spreadsheet-flat-xml:*.fods -50:application/vnd.oasis.opendocument.spreadsheet-flat-xml:*.fods -50:application/vnd.oasis.opendocument.text-flat-xml:*.fodt -50:application/vnd.oasis.opendocument.text-flat-xml:*.fodt -50:application/x-n64-rom:*.n64 -50:application/x-ustar:*.ustar -50:application/x-gameboy-rom:*.gbc -50:application/x-gba-rom:*.gba -50:application/x-java-pack200:*.pack -50:application/dicom:dicomdir -50:application/x-shar:*.shar -50:application/x-shorten:*.shn -50:application/x-genesis-rom:*.32x -50:image/x-portable-anymap:*.pnm -50:application/x-gzdvi:*.dvi.gz -50:application/annodex:*.anx -50:text/html:*.html -50:video/mp2t:*.mts -50:text/x-authors:authors -50:text/x-install:install -50:application/x-quattropro:*.wb1 -50:application/x-quattropro:*.wb2 -50:application/x-quattropro:*.wb3 -50:application/x-gnucash:*.gnucash -50:application/x-perl:*.pod -50:application/x-source-rpm:*.src.rpm -50:image/x-lwo:*.lwo -50:application/x-dia-diagram:*.dia -50:application/vnd.lotus-wordpro:*.lwp -50:application/x-lrzip-compressed-tar:*.tlrz -50:application/x-partial-download:*.wkdownload -50:application/x-glade:*.glade -50:application/pgp-signature:*.sig -50:text/x-qml:*.qml -50:image/x-tga:*.tga -50:audio/prs.sid:*.sid -50:application/x-trash:*.sik -50:application/x-spss-por:*.por -50:application/x-wii-wad:*.wad -50:application/vnd.ms-powerpoint:*.pot -50:text/x-gettext-translation-template:*.pot -50:image/x-lws:*.lws -50:application/x-zip-compressed-fb2:*.fb2.zip -50:text/vcard:*.vcf -50:application/vnd.symbian.install:*.sis -50:application/x-stuffit:*.sit -50:application/x-e-theme:*.etheme -50:application/sieve:*.siv -50:image/bmp:*.bmp -50:application/x-nes-rom:*.unif -50:image/x-skencil:*.sk1 -50:image/openraster:*.ora -50:text/vcard:*.vct -50:application/x-compressed-tar:*.tgz -50:application/x-netshow-channel:*.nsc -50:audio/x-wav:*.wav -50:image/x-olympus-orf:*.orf -50:audio/x-ms-asx:*.wax -50:audio/x-ape:*.ape -50:image/x-lwo:*.lwob -50:text/calendar:*.vcs -50:image/rle:*.rle -50:application/x-siag:*.siag -50:application/vnd.android.package-archive:*.apk -50:image/x-portable-pixmap:*.ppm -50:application/x-lz4:*.lz4 -50:image/x-applix-graphics:*.ag -50:application/illustrator:*.ai -50:application/vnd.ms-powerpoint:*.pps -50:application/vnd.ms-powerpoint:*.ppt -50:application/vnd.ms-powerpoint:*.ppt -50:video/x-nsv:*.nsv -50:application/x-perl:*.al -50:image/x-tga:*.vda -50:text/x-tex:*.cls -50:application/x-archive:*.ar -50:application/vnd.ms-powerpoint:*.ppz -50:application/x-applix-spreadsheet:*.as -50:application/vnd.tcpdump.pcap:*.pcap -50:audio/basic:*.au -50:application/x-applix-word:*.aw -50:image/vnd.djvu:*.djv -50:application/vnd.palm:*.pqa -50:application/xslt+xml:*.xslt -50:application/x-bittorrent:*.torrent -50:image/x-bzeps:*.epsi.bz2 -50:video/quicktime:*.qtvr -50:text/x-mup:*.mup -50:application/x-t602:*.602 -50:application/vnd.rn-realmedia:*.rmj -50:image/tiff:*.tif -50:application/x-lyx:*.lyx -50:application/x-gedcom:*.ged -50:application/vnd.rn-realmedia:*.rmm -50:application/x-gnucash:*.xac -50:text/x-eiffel:*.eif -50:application/x-sv4cpio:*.sv4cpio -50:application/vnd.rn-realmedia:*.rms -50:application/pgp-keys:*.skr -50:application/x-tar:*.gem -50:application/x-genesis-rom:*.gen -50:application/vnd.ms-works:*.wcm -50:application/x-yaml:*.yaml -50:application/vnd.ms-word.template.macroEnabled.12:*.dotm -50:application/vnd.ms-word.template.macroenabled.12:*.dotm -50:application/x-lha:*.lzh -50:application/mxf:*.mxf -50:application/vnd.oasis.opendocument.chart-template:*.otc -50:application/x-mobipocket-ebook:*.prc -50:application/vnd.palm:*.prc -50:application/vnd.oasis.opendocument.formula-template:*.otf -50:application/x-font-otf:*.otf -50:application/vnd.oasis.opendocument.graphics-template:*.otg -50:application/vnd.oasis.opendocument.graphics-template:*.otg -50:application/vnd.oasis.opendocument.text-web:*.oth -50:application/vnd.oasis.opendocument.text-web:*.oth -50:application/relax-ng-compact-syntax:*.rnc -50:application/x-lzop:*.lzo -50:text/x-makefile:gnumakefile -50:application/x-bzip:*.bz -50:application/x-arj:*.arj -50:application/x-spss-sav:*.zsav -50:text/x-c++src:*.cc -50:application/vnd.oasis.opendocument.presentation-template:*.otp -50:application/vnd.oasis.opendocument.presentation-template:*.otp -50:image/fits:*.fits -50:application/vnd.ms-works:*.wdb -50:application/vnd.oasis.opendocument.spreadsheet-template:*.ots -50:application/vnd.oasis.opendocument.spreadsheet-template:*.ots -50:application/vnd.oasis.opendocument.text-template:*.ott -50:application/vnd.oasis.opendocument.text-template:*.ott -50:application/x-partial-download:*.crdownload -50:application/x-tzo:*.tar.lzo -50:application/x-hdf:*.hdf -50:application/x-tarz:*.tar.z -50:application/vnd.rn-realmedia:*.rmx -50:image/x-sony-arw:*.arw -50:image/svg+xml-compressed:*.svgz -50:text/x-csharp:*.cs -50:text/spreadsheet:*.slk -50:image/x-icns:*.icns -50:image/x-xbitmap:*.xbm -50:video/vnd.mpegurl:*.mxu -50:application/xml:*.xbl -50:application/xml:*.rng -50:application/x-pagemaker:*.p65 -50:text/x-opml+xml:*.opml -50:text/plain:*.asc -50:image/vnd.adobe.photoshop:*.psd -50:application/x-font-linux-psf:*.psf -50:audio/x-psf:*.psf -50:text/x-cobol:*.cob -50:application/vnd.ms-asf:*.asf -50:application/vnd.nintendo.snes.rom:*.smc -50:application/vnd.stardivision.mail:*.smd -50:application/x-genesis-rom:*.smd -50:application/x-dc-rom:*.dc -50:application/vnd.stardivision.math:*.smf -50:application/x-apple-diskimage:*.dmg -50:application/smil+xml:*.smi -50:application/x-sami:*.smi -50:text/x-dsrc:*.di -50:application/x-asp:*.asp -50:application/x-gedcom:*.gedcom -50:application/smil+xml:*.sml -50:text/x-ssa:*.ass -50:image/x-xfig:*.fig -50:image/x-tga:*.icb -50:application/vnd.tcpdump.pcap:*.dmp -50:application/x-pocket-word:*.psw -50:application/x-sms-rom:*.sms -50:audio/x-ms-asx:*.asx -50:image/x-xcf:*.xcf -50:text/vnd.sun.j2me.app-descriptor:*.jad -50:video/dv:*.dv -50:application/vnd.openxmlformats-officedocument.wordprocessingml.template:*.dotx -50:application/vnd.openxmlformats-officedocument.wordprocessingml.template:*.dotx -50:image/vnd.microsoft.icon:*.ico -50:application/x-ica:*.ica -50:application/vnd.iccprofile:*.icc -50:text/calendar:*.ics -50:application/x-java-archive:*.jar -50:application/x-gnumeric:*.gnumeric -50:application/vnd.iccprofile:*.icm -50:application/x-sv4crc:*.sv4crc -50:audio/basic:*.snd -50:application/x-lzma:*.lzma -50:application/x-x509-ca-cert:*.cert -50:image/x-adobe-dng:*.dng -50:video/mp2t:*.cpi -50:text/x-vhdl:*.vhd -50:application/x-rpm:*.rpm -50:application/x-bzpostscript:*.ps.bz2 -50:text/x-emacs-lisp:*.el -50:application/xspf+xml:*.xspf -50:text/x-c++src:*.cpp -50:application/vnd.oasis.opendocument.text-master-template:*.otm -50:image/x-canon-cr2:*.cr2 -50:application/x-gnuplot:*.gnuplot -50:application/ecmascript:*.es -50:image/fax-g3:*.g3 -50:text/x-idl:*.idl -50:application/x-pkcs7-certificates:*.p7b -50:application/pkcs7-mime:*.p7c -50:application/andrew-inset:*.ez -50:application/x-desktop:*.kdelnk -50:application/x-lzma-compressed-tar:*.tlz -50:application/vnd.ms-publisher:*.pub -50:text/x-xslfo:*.xslfo -50:application/x-core:core:cs -50:application/x-core:core -50:application/x-trig:*.trig -50:application/pkcs7-mime:*.p7m -50:application/msword:*.doc -50:application/msword:*.doc -50:application/vnd.ms-word:*.doc -50:application/rdf+xml:*.owl -50:text/cache-manifest:*.manifest -50:application/pkcs7-signature:*.p7s -50:image/x-emf:*.emf -50:application/x-fluid:*.fl -50:image/gif:*.gif -50:message/rfc822:*.eml -50:application/owl+xml:*.owx -50:image/ief:*.ief -50:text/x-c++hdr:*.h++ -50:text/x-xslfo:*.fo -50:application/vnd.emusic-emusic_package:*.emp -50:application/msword-template:*.dot -50:text/vnd.graphviz:*.dot -50:application/x-hdf:*.h4 -50:application/x-hdf:*.h5 -50:application/x-nzb:*.nzb -50:text/x-uil:*.uil -50:video/vnd.vivo:*.viv -50:application/vnd.debian.binary-package:*.udeb -50:audio/midi:*.kar -50:video/x-msvideo:*.avf -50:text/csv-schema:*.csvs -50:application/x-pkcs7-certificates:*.spc -50:application/x-font-speedo:*.spd -50:application/x-qtiplot:*.qti -50:application/vnd.ms-excel.addin.macroEnabled.12:*.xlam -50:application/x-tex-gf:*.gf -50:application/vnd.ms-tnef:*.tnf -50:application/x-quicktime-media-link:*.qtl -50:text/x-patch:*.diff -50:application/pkix-crl:*.crl -50:application/vnd.openofficeorg.extension:*.oxt -50:application/vnd.openofficeorg.extension:*.oxt -50:application/x-source-rpm:*.spm -50:application/x-sms-rom:*.gg -50:application/vnd.adobe.flash.movie:*.spl -50:application/x-bzdvi:*.dvi.bz2 -50:application/x-gnuplot:*.gp -50:application/x-gameboy-rom:*.gb -50:application/x-x509-ca-cert:*.crt -50:image/x-sony-sr2:*.sr2 -50:application/x-gz-font-linux-psf:*.psf.gz -50:image/x-canon-crw:*.crw -50:image/x-ilbm:*.iff -50:audio/x-speex:*.spx -50:audio/x-mod:*.ult -50:audio/x-mod:*.669 -50:video/x-flv:*.flv -50:application/x-kivio:*.flw -50:text/vnd.graphviz:*.gv -50:application/gzip:*.gz -50:application/pkix-pkipath:*.pkipath -50:application/vnd.palm:*.oprc -50:audio/AMR-WB:*.awb -50:text/x-genie:*.gs:cs -50:text/x-genie:*.gs -50:video/x-flic:*.flc -50:text/x-go:*.go -50:application/x-cdrdao-toc:*.toc -50:application/x-awk:*.awk -50:application/x-csh:*.csh -50:audio/x-s3m:*.s3m -50:text/x-c++hdr:*.hh -50:application/xml-external-parsed-entity:*.ent -50:application/sql:*.sql -50:image/x-gzeps:*.eps.gz -50:text/x-texinfo:*.texinfo -50:video/x-msvideo:*.avi -50:application/rss+xml:*.rss -50:application/x-ufraw:*.ufraw -50:text/css:*.css -50:text/x-c++hdr:*.hp -50:application/x-ms-wim:*.wim -50:text/csv:*.csv -50:text/x-haskell:*.hs -50:application/x-mobipocket-ebook:*.mobi -50:application/vnd.lotus-1-2-3:*.wk1 -50:audio/annodex:*.axa -50:application/vnd.lotus-1-2-3:*.wk3 -50:application/vnd.lotus-1-2-3:*.wk4 -50:application/x-wais-source:*.src -50:application/rtf:*.rtf -50:image/x-sony-srf:*.srf -50:image/x-ilbm:*.ilbm -50:audio/x-mpegurl:*.vlc -50:application/x-nes-rom:*.unf -50:application/x-smaf:*.smaf -50:audio/x-mod:*.uni -50:video/x-flic:*.fli -50:text/sgml:*.sgml -50:video/annodex:*.axv -50:image/x-kodak-kdc:*.kdc -50:text/x-txt2tags:*.t2t -50:application/x-subrip:*.srt -50:audio/x-it:*.it -50:image/x-eps:*.eps -50:application/x-gzpdf:*.pdf.gz -50:image/x-eps:*.epsf -50:text/richtext:*.rtx -50:image/x-eps:*.epsi -50:application/x-java-jce-keystore:*.jceks -50:application/x-python-bytecode:*.pyc -50:image/x-ilbm:*.lbm -50:video/vnd.vivo:*.vivo -50:text/x-ssa:*.ssa -50:application/x-cue:*.cue -50:audio/vnd.dts.hd:*.dtshd -50:application/x-python-bytecode:*.pyo -50:application/x-windows-themepack:*.themepack -50:video/x-sgi-movie:*.movie -50:text/x-cmake:*.cmake -50:text/x-dsl:*.dsl -50:application/x-trash:*% -50:application/vnd.ms-powerpoint.slide.macroEnabled.12:*.sldm -50:image/x-panasonic-raw2:*.rw2 -50:application/gml+xml:*.gml -50:application/javascript:*.js -50:application/x-markaby:*.mab -50:application/x-gettext-translation:*.gmo -50:image/x-win-bitmap:*.cur -50:text/x-fortran:*.for -50:application/vnd.lotus-1-2-3:*.wks -50:application/vnd.ms-works:*.wks -50:text/x-python:*.pyx -50:application/vnd.openxmlformats-officedocument.presentationml.slide:*.sldx -50:text/x-makefile:*.mak -50:application/x-troff-man:*.man -50:message/x-gnu-rmail:rmail -50:application/vnd.sun.xml.calc.template:*.stc -50:application/vnd.sun.xml.calc.template:*.stc -50:application/vnd.sun.xml.draw.template:*.std -50:application/vnd.sun.xml.draw.template:*.std -50:application/xml-dtd:*.dtd -50:application/x-iwork-keynote-sffkey:*.key -50:application/vnd.sun.xml.impress.template:*.sti -50:application/vnd.sun.xml.impress.template:*.sti -50:application/x-gnucash:*.gnc -50:application/x-abiword:*.abw.crashed -50:application/x-kchart:*.chrt -50:audio/prs.sid:*.psid -50:application/gnunet-directory:*.gnd -50:audio/ogg:*.opus -50:audio/x-opus+ogg:*.opus -50:audio/x-stm:*.stm -50:application/x-bzip:*.bz2 -50:text/x-erlang:*.erl -50:application/epub+zip:*.epub -50:application/x-java-keystore:*.ks -50:video/vnd.rn-realvideo:*.rvx -50:application/x-m4:*.m4 -50:application/vnd.sun.xml.writer.template:*.stw -50:application/vnd.sun.xml.writer.template:*.stw -50:text/x-tex:*.sty -50:audio/vnd.dts:*.dts -50:application/json:*.json -50:text/x-tex:*.dtx -50:application/x-kformula:*.kfo -50:application/json-patch+json:*.json-patch -50:application/x-bzip-compressed-tar:*.tar.bz2 -50:application/x-java:*.class -50:application/x-shared-library-la:*.la -50:text/x-microdvd:*.sub -50:text/x-mpsub:*.sub -50:text/x-subviewer:*.sub -50:application/font-woff:*.woff -50:image/x-macpaint:*.pntg -50:application/winhlp:*.hlp -50:image/tiff:*.tiff -50:audio/x-ms-wma:*.wma -50:text/x-qml:*.qmlproject -50:video/mpeg:*.vob -50:application/vnd.ms-visio.drawing.macroEnabled.main+xml:*.vsdm -50:text/troff:*.roff -50:image/x-sun-raster:*.sun -50:audio/x-voc:*.voc -50:image/x-wmf:*.wmf -50:text/x-scons:sconscript -50:application/x-tar:*.gtar -50:text/vnd.wap.wml:*.wml -50:application/x-par2:*.par2 -50:application/x-par2:*.par2 -50:application/x-cpio-compressed:*.cpio.gz -50:application/vnd.ms-visio.drawing.main+xml:*.vsdx -50:application/vnd.stardivision.writer:*.vor -50:image/x-compressed-xcf:*.xcf.gz -50:text/x-lilypond:*.ly -50:application/x-lzip:*.lz -50:audio/x-psflib:*.psflib -50:video/x-ms-wmv:*.wmv -50:audio/x-ms-asx:*.wmx -50:application/x-it87:*.it87 -50:text/tab-separated-values:*.tsv -50:audio/mp4:*.f4a -50:audio/x-m4b:*.f4b -50:audio/x-tta:*.tta -50:application/x-trash:*~ -50:application/x-font-ttf:*.ttc -50:image/svg+xml:*.svg -50:application/x-kexi-connectiondata:*.kexic -50:application/x-font-ttf:*.ttf -50:application/x-dvi:*.dvi -50:application/vnd.ms-excel:*.xla -50:text/x-java:*.java -50:application/vnd.ms-excel:*.xlc -50:application/vnd.ms-excel:*.xld -50:application/pgp-encrypted:*.gpg -50:application/pgp-keys:*.gpg -50:application/pgp-signature:*.gpg -50:application/x-xliff:*.xlf -50:application/x-gettext-translation:*.mo -50:text/x-modelica:*.mo -50:text/x-svhdr:*.svh -50:application/x-mswinurl:*.url -50:image/x-gzeps:*.epsi.gz -50:application/vnd.ms-access:*.mdb -50:application/vnd.ms-excel:*.xll -50:application/vnd.ms-excel:*.xlm -50:application/vnd.ms-tnef:winmail.dat -50:application/x-kexiproject-shortcut:*.kexis -50:application/x-font-ttx:*.ttx -50:application/x-raw-disk-image:*.raw-disk-image -50:application/vnd.ms-works:*.xlr -50:application/vnd.ms-excel:*.xls -50:application/vnd.ms-excel:*.xls -50:application/vnd.wordperfect:*.wp4 -50:application/vnd.wordperfect:*.wp5 -50:application/vnd.wordperfect:*.wp6 -50:application/vnd.ms-excel:*.xlt -50:application/vnd.ms-excel:*.xlw -50:text/turtle:*.ttl -50:application/mathematica:*.nb -50:application/x-netcdf:*.nc -50:video/mp4:*.f4v -50:application/vnd.adobe.flash.movie:*.swf -50:text/x-makefile:*.mk -50:image/vnd.dwg:*.dwg -50:text/x-setext:*.etx -50:application/x-genesis-rom:*.mdx -50:application/vnd.ms-powerpoint.template.macroEnabled.12:*.potm -50:application/vnd.ms-powerpoint.template.macroenabled.12:*.potm -50:application/x-xz-compressed-tar:*.tar.xz -50:application/x-ms-wim:*.swm -50:video/mpeg:*.mpeg -50:text/x-credits:credits -50:text/x-iMelody:*.ime -50:audio/x-xmf:*.xmf -50:application/x-raw-disk-image:*.img -50:text/x-xmi:*.xmi -50:text/spreadsheet:*.sylk -50:application/x-partial-download:*.part -50:application/xml:*.xml -50:audio/x-mod:*.med -50:text/vnd.wap.wmlscript:*.wmls -50:image/x-bzeps:*.epsf.bz2 -50:application/x-killustrator:*.kil -50:application/pkcs8:*.p8 -50:application/zip:*.zip -50:image/vnd.ms-modi:*.mdi -50:application/x-java-keystore:*.jks -50:text/x-c++src:*.cxx -50:text/x-iMelody:*.imy -50:application/vnd.sun.xml.calc:*.sxc -50:application/vnd.sun.xml.calc:*.sxc -50:application/vnd.sun.xml.draw:*.sxd -50:application/vnd.sun.xml.draw:*.sxd -50:application/x-java-keystore:cacerts -50:application/vnd.sun.xml.writer.global:*.sxg -50:application/vnd.sun.xml.writer.global:*.sxg -50:application/x-graphite:*.gra -50:application/vnd.sun.xml.impress:*.sxi -50:application/vnd.sun.xml.impress:*.sxi -50:video/x-matroska-3d:*.mk3d -50:application/vnd.wordperfect:*.wpd -50:application/vnd.sun.xml.math:*.sxm -50:application/vnd.sun.xml.math:*.sxm -50:application/vnd.ms-powerpoint.slideshow.macroEnabled.12:*.ppsm -50:application/x-wpg:*.wpg -50:application/x-gnuplot:*.gplt -50:image/vnd.dxf:*.dxf -50:application/x-lha:*.lha -50:model/vrml:*.vrm -50:application/vnd.ms-wpl:*.wpl -50:audio/mpeg:*.mpga -50:application/vnd.sun.xml.writer:*.sxw -50:application/vnd.sun.xml.writer:*.sxw -50:application/vnd.wordperfect:*.wpp -50:application/x-n64-rom:*.v64 -50:text/x-c++hdr:*.hpp -50:application/vnd.ms-works:*.wps -50:text/plain:*,v -50:text/markdown:*.md -50:text/x-tex:*.ins -50:text/x-troff-ms:*.ms -50:application/x-tgif:*.obj -50:text/x-c++src:*.C:cs -50:text/x-c++src:*.C -50:text/x-literate-haskell:*.lhs -50:image/x-pict:*.pict -50:text/x-ocaml:*.ml -50:text/x-troff-mm:*.mm -50:application/x-nintendo-ds-rom:*.nds -50:application/x-bzip-compressed-tar:*.tbz2 -50:text/x-qml:*.qmltypes -50:application/x-lhz:*.lhz -50:application/vnd.visio:*.vsd -50:application/x-tex-pk:*.pk -50:application/x-font-type1:*.gsf -50:application/x-perl:*.pl -50:application/x-perl:*.pl -50:application/x-perl:*.pm -50:application/x-pagemaker:*.pm -50:application/vnd.ms-powerpoint.presentation.macroEnabled.12:*.pptm -50:application/vnd.ms-powerpoint.presentation.macroenabled.12:*.pptm -50:text/x-gettext-translation:*.po -50:application/vnd.hp-hpgl:*.hpgl -50:audio/x-gsm:*.gsm -50:application/postscript:*.ps -50:text/x-fortran:*.f90 -50:application/vnd.ms-word.document.macroEnabled.12:*.docm -50:application/vnd.ms-word.document.macroenabled.12:*.docm -50:application/x-yaml:*.yml -50:application/vnd.visio:*.vss -50:application/vnd.visio:*.vst -50:image/x-tga:*.vst -50:application/x-karbon:*.karbon -50:image/x-nikon-nef:*.nef -50:application/vnd.visio:*.vsw -50:application/x-archive:*.a -50:audio/aac:*.aac -50:text/x-csrc:*.c:cs -50:text/x-csrc:*.c -50:application/x-pw:*.pw -50:application/x-magicpoint:*.mgp -50:text/x-ocl:*.ocl -50:application/x-pak:*.pak -50:text/x-chdr:*.h -50:text/x-dsrc:*.d -50:application/x-nes-rom:*.nes -50:application/x-ms-dos-executable:*.exe -50:text/x-objcsrc:*.m -50:text/x-matlab:*.m -50:text/x-troff-me:*.me -50:application/x-object:*.o -50:text/x-fortran:*.f -50:text/x-pascal:*.p -50:text/x-pascal:*.pas -50:video/mp2t:*.clpi -10:application/x-perl:*.t -10:text/troff:*.t -10:text/x-readme:readme* -10:application/pgp-encrypted:*.asc -10:application/pgp-keys:*.asc -10:application/pgp-signature:*.asc -10:text/x-makefile:makefile.* diff --git a/src-qt5/core/lumina-desktop/Globals.h b/src-qt5/core/lumina-desktop/Globals.h index 479fe4ad..14dfd93f 100644 --- a/src-qt5/core/lumina-desktop/Globals.h +++ b/src-qt5/core/lumina-desktop/Globals.h @@ -7,7 +7,8 @@ #ifndef _LUMINA_DESKTOP_GLOBALS_H #define _LUMINA_DESKTOP_GLOBALS_H -#include +#include +#include //#include "../global.h" #include diff --git a/src-qt5/core/lumina-desktop/JsonMenu.h b/src-qt5/core/lumina-desktop/JsonMenu.h index 87377a73..5a6b2237 100644 --- a/src-qt5/core/lumina-desktop/JsonMenu.h +++ b/src-qt5/core/lumina-desktop/JsonMenu.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "LSession.h" diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 87f270ea..f383c163 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -15,7 +15,7 @@ //LibLumina X11 class #include -#include +#include #include //for usleep() usage @@ -29,7 +29,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu if(this->isPrimaryProcess()){ connect(this, SIGNAL(InputsAvailable(QStringList)), this, SLOT(NewCommunication(QStringList)) ); this->setApplicationName("Lumina Desktop Environment"); - this->setApplicationVersion( LUtils::LuminaDesktopVersion() ); + this->setApplicationVersion( LDesktopUtils::LuminaDesktopVersion() ); this->setOrganizationName("LuminaDesktopEnvironment"); this->setQuitOnLastWindowClosed(false); //since the LDesktop's are not necessarily "window"s //Enabled a few of the simple effects by default @@ -372,7 +372,7 @@ void LSession::checkUserFiles(){ //internal version conversion examples: // [1.0.0 -> 1000000], [1.2.3 -> 1002003], [0.6.1 -> 6001] QString OVS = sessionsettings->value("DesktopVersion","0").toString(); //Old Version String - bool changed = LUtils::checkUserFiles(OVS); + bool changed = LDesktopUtils::checkUserFiles(OVS); if(changed){ //Save the current version of the session to the settings file (for next time) sessionsettings->setValue("DesktopVersion", this->applicationVersion()); diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp index 435a57c2..a2549acf 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp @@ -2,7 +2,7 @@ #include #include "LSession.h" -#include +#include #include #include #include diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h b/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h index 4ba74133..d6039ac0 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h +++ b/src-qt5/core/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h @@ -13,7 +13,7 @@ #include #include "../LDPlugin.h" -#include +#include class QuickDPlugin : public LDPlugin{ Q_OBJECT diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp index 23c1ca01..8dc58e0a 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp @@ -9,7 +9,7 @@ #include #include "LSession.h" -#include +#include #include #include #include diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index effa0508..4b725288 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -4,16 +4,23 @@ QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia concurrent svg + TARGET = lumina-desktop target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../libLumina/ResizeMenu.pri) +include(../libLumina/LDesktopUtils.pri) #includes LUtils and LOS +include(../libLumina/LuminaXDG.pri) +include(../libLumina/LuminaX11.pri) +include(../libLumina/LuminaSingleApplication.pri) +include(../libLumina/LuminaThemes.pri) -LIBS += -lLuminaUtils -lxcb -lxcb-damage -DEPENDPATH += ../libLumina +#LIBS += -lLuminaUtils -lxcb -lxcb-damage +#DEPENDPATH += ../libLumina TEMPLATE = app - SOURCES += main.cpp \ WMProcess.cpp \ LXcbEventFilter.cpp \ @@ -53,8 +60,6 @@ HEADERS += Globals.h \ FORMS += SystemWindow.ui \ BootSplash.ui -#include all the special classes from the Lumina tree -include(../libLumina/ResizeMenu.pri) #Now include all the files for the various plugins include(panel-plugins/panel-plugins.pri) diff --git a/src-qt5/core/lumina-desktop/main.cpp b/src-qt5/core/lumina-desktop/main.cpp index 35561073..b42a3816 100644 --- a/src-qt5/core/lumina-desktop/main.cpp +++ b/src-qt5/core/lumina-desktop/main.cpp @@ -22,7 +22,8 @@ #include //from libLuminaUtils #include #include -#include +#include +#include #define DEBUG 0 @@ -58,7 +59,7 @@ int main(int argc, char ** argv) { if (argc > 1) { if (QString(argv[1]) == QString("--version")){ - qDebug() << LUtils::LuminaDesktopVersion(); + qDebug() << LDesktopUtils::LuminaDesktopVersion(); return 0; } } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.h b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.h index 3d31faad..29562d5d 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/src-qt5/core/lumina-desktop/panel-plugins/battery/NOTES b/src-qt5/core/lumina-desktop/panel-plugins/battery/NOTES index 3ea07778..3d93267e 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/NOTES +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/NOTES @@ -22,7 +22,7 @@ apm -l apm -t Zeigt die verbleibende Zeit in Sekunden -Aufruf Systemfunktionen: LuminaUtils.h +Aufruf Systemfunktionen: LUtils.h mit der Methode: QStringList LUtils::getCmdOutput(QString cmd, QStringList args) diff --git a/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp b/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp index 9903d4fd..90d942de 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp @@ -102,7 +102,7 @@ void LDeskBarPlugin::filechanged(QString file){ } void LDeskBarPlugin::updateFiles(){ QFileInfoList homefiles = LSession::handle()->DesktopFiles(); - QStringList favitems = LUtils::listFavorites(); + QStringList favitems = LDesktopUtils::listFavorites(); //Remember for format for favorites: ::::[app/dir/]:::: for(int i=0; i #include -#include +#include #include #include diff --git a/src-qt5/core/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h b/src-qt5/core/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h index e160c2b3..6f61c4d5 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h @@ -13,7 +13,7 @@ #include #include "../LPPlugin.h" -#include +#include #include class QuickPPlugin : public LPPlugin{ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp index 15b9c72c..ea074a59 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/ItemWidget.cpp @@ -5,7 +5,7 @@ // See the LICENSE file for full details //=========================================== #include "ItemWidget.h" -#include +#include #include #include "../../LSession.h" @@ -73,7 +73,7 @@ ItemWidget::ItemWidget(QWidget *parent, QString itemPath, QString type, bool gob icon->setWhatsThis(itemPath); if(!goback){ this->setWhatsThis(name->text()); } isDirectory = (type=="dir"); //save this for later - if(LUtils::isFavorite(itemPath)){ + if(LDesktopUtils::isFavorite(itemPath)){ linkPath = itemPath; isShortcut=true; }else if( inHome ){//|| itemPath.section("/",0,-2)==QDir::homePath()+"/Desktop" ){ @@ -93,7 +93,7 @@ ItemWidget::ItemWidget(QWidget *parent, XDGDesktop *item) : QFrame(parent){ createWidget(); if(item==0){ gooditem = false; return; } isDirectory = false; - if(LUtils::isFavorite(item->filePath)){ + if(LDesktopUtils::isFavorite(item->filePath)){ linkPath = item->filePath; isShortcut=true; }else if( item->filePath.section("/",0,-2)==QDir::homePath()+"/Desktop" ){ @@ -177,7 +177,7 @@ void ItemWidget::setupContextMenu(){ contextMenu->addAction( LXDG::findIcon("preferences-desktop-icons",""), tr("Pin to Desktop"), this, SLOT(PinToDesktop()) ); } //Favorite Item - if( LUtils::isFavorite(icon->whatsThis()) ){ //Favorite Item - can always remove this + if( LDesktopUtils::isFavorite(icon->whatsThis()) ){ //Favorite Item - can always remove this contextMenu->addAction( LXDG::findIcon("edit-delete",""), tr("Remove from Favorites"), this, SLOT(RemoveFavorite()) ); }else{ //This file does not have a shortcut yet -- allow the user to add it @@ -242,13 +242,13 @@ void ItemWidget::PinToDesktop(){ } void ItemWidget::RemoveFavorite(){ - LUtils::removeFavorite(icon->whatsThis()); + LDesktopUtils::removeFavorite(icon->whatsThis()); linkPath.clear(); emit RemovedShortcut(); } void ItemWidget::AddFavorite(){ - if( LUtils::addFavorite(icon->whatsThis()) ){ + if( LDesktopUtils::addFavorite(icon->whatsThis()) ){ linkPath = icon->whatsThis(); emit NewShortcut(); } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp index 0a396464..f44add77 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.cpp @@ -8,7 +8,7 @@ #include "../../LSession.h" #include -#include //This contains the "ResizeMenu" class +#include //This contains the "ResizeMenu" class LStartButtonPlugin::LStartButtonPlugin(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal){ button = new QToolButton(this); diff --git a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h index 22742bc5..d46bb1be 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/LStartButton.h @@ -24,7 +24,7 @@ // libLumina includes #include -#include +#include #include #include "StartMenu.h" 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 bfac46c0..260215ec 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp @@ -411,7 +411,7 @@ void StartMenu::UpdateApps(){ void StartMenu::UpdateFavs(){ //SYNTAX NOTE: (per-line) "::::[dir/app/]::::" - QStringList newfavs = LUtils::listFavorites(); + QStringList newfavs = LDesktopUtils::listFavorites(); if(favs == newfavs){ return; } //nothing to do - same as before favs = newfavs; ClearScrollArea(ui->scroll_favs); diff --git a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserItemWidget.cpp b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserItemWidget.cpp index a1dfe956..8d7dab7a 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserItemWidget.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserItemWidget.cpp @@ -5,7 +5,8 @@ // See the LICENSE file for full details //=========================================== #include "UserItemWidget.h" -#include +#include +#include #include #define TEXTCUTOFF 165 @@ -50,7 +51,7 @@ UserItemWidget::UserItemWidget(QWidget *parent, QString itemPath, QString type, icon->setWhatsThis(itemPath); if(!goback){ this->setWhatsThis(name->text()); } isDirectory = (type=="dir"); //save this for later - if(LUtils::isFavorite(itemPath)){ + if(LDesktopUtils::isFavorite(itemPath)){ linkPath = itemPath; isShortcut=true; }else if( inHome ){//|| itemPath.section("/",0,-2)==QDir::homePath()+"/Desktop" ){ @@ -66,7 +67,7 @@ UserItemWidget::UserItemWidget(QWidget *parent, XDGDesktop *item) : QFrame(paren if(item==0){ return; } createWidget(); isDirectory = false; - if(LUtils::isFavorite(item->filePath)){ + if(LDesktopUtils::isFavorite(item->filePath)){ linkPath = item->filePath; isShortcut=true; }else if( item->filePath.section("/",0,-2)==QDir::homePath()+"/Desktop" ){ @@ -171,7 +172,7 @@ void UserItemWidget::setupActions(XDGDesktop *app){ void UserItemWidget::buttonClicked(){ button->setVisible(false); if(button->whatsThis()=="add"){ - LUtils::addFavorite(icon->whatsThis()); + LDesktopUtils::addFavorite(icon->whatsThis()); //QFile::link(icon->whatsThis(), QDir::homePath()+"/.lumina/favorites/"+icon->whatsThis().section("/",-1) ); emit NewShortcut(); }else if(button->whatsThis()=="remove"){ @@ -184,7 +185,7 @@ void UserItemWidget::buttonClicked(){ } //Don't emit the RemovedShortcut signal here - the automatic ~/Desktop watcher will see the change when finished }else{ - LUtils::removeFavorite(icon->whatsThis()); //This is a favorite + LDesktopUtils::removeFavorite(icon->whatsThis()); //This is a favorite emit RemovedShortcut(); } } diff --git a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp index fb58c7f6..a0ba8996 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp @@ -221,7 +221,7 @@ void UserWidget::updateFavItems(bool newfilter){ if(updatingfavs){ return; } updatingfavs = true; //qDebug() << "Updating User Favorite Items"; - QStringList newfavs = LUtils::listFavorites(); + QStringList newfavs = LDesktopUtils::listFavorites(); //qDebug() << "Favorites:" << newfavs; if(lastHomeUpdate.isNull() || (QFileInfo(QDir::homePath()+"/Desktop").lastModified() > lastHomeUpdate) || newfavs!=favs ){ favs = newfavs; diff --git a/src-qt5/core/lumina-info/MainUI.cpp b/src-qt5/core/lumina-info/MainUI.cpp index 98a4c160..7e6a3630 100644 --- a/src-qt5/core/lumina-info/MainUI.cpp +++ b/src-qt5/core/lumina-info/MainUI.cpp @@ -8,7 +8,8 @@ #include "ui_MainUI.h" #include -#include +#include +#include #include #include @@ -38,7 +39,7 @@ void MainUI::updateUI(){ ui->tool_website->setIcon( LXDG::findIcon("go-home","")); connect(ui->push_close, SIGNAL(clicked()), this, SLOT(close()) ); //General Tab - ui->label_version->setText( LUtils::LuminaDesktopVersion() ); + ui->label_version->setText( LDesktopUtils::LuminaDesktopVersion() ); ui->label_OS->setText( LOS::OSName() ); connect(ui->tool_aboutQt, SIGNAL(clicked()), this, SLOT(showQtInfo()) ); //License Tab diff --git a/src-qt5/core/lumina-info/lumina-info.pro b/src-qt5/core/lumina-info/lumina-info.pro index 9ced275b..3ba1f527 100644 --- a/src-qt5/core/lumina-info/lumina-info.pro +++ b/src-qt5/core/lumina-info/lumina-info.pro @@ -8,6 +8,12 @@ target.path = $${L_BINDIR} TEMPLATE = app +#include all the special classes from the Lumina tree +include(../libLumina/LDesktopUtils.pri) #includes LUtils +include(../libLumina/LuminaXDG.pri) +include(../libLumina/LuminaSingleApplication.pri) +include(../libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ MainUI.cpp @@ -17,9 +23,9 @@ FORMS += MainUI.ui RESOURCES+= lumina-info.qrc -LIBS += -lLuminaUtils +#LIBS += -lLuminaUtils -DEPENDPATH += ../libLumina +#DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-info_af.ts \ i18n/lumina-info_ar.ts \ diff --git a/src-qt5/core/lumina-info/main.cpp b/src-qt5/core/lumina-info/main.cpp index 8fe6a183..e30911c5 100644 --- a/src-qt5/core/lumina-info/main.cpp +++ b/src-qt5/core/lumina-info/main.cpp @@ -6,7 +6,7 @@ #include "MainUI.h" #include #include -#include +#include #include int main(int argc, char ** argv) diff --git a/src-qt5/core/lumina-open/LFileDialog.h b/src-qt5/core/lumina-open/LFileDialog.h index 95e117fa..b81cde05 100644 --- a/src-qt5/core/lumina-open/LFileDialog.h +++ b/src-qt5/core/lumina-open/LFileDialog.h @@ -22,7 +22,7 @@ #include #include //From libLuminaUtils -#include +#include namespace Ui{ class LFileDialog; diff --git a/src-qt5/core/lumina-open/lumina-open.pro b/src-qt5/core/lumina-open/lumina-open.pro index 3240b2d3..96d879bd 100644 --- a/src-qt5/core/lumina-open/lumina-open.pro +++ b/src-qt5/core/lumina-open/lumina-open.pro @@ -9,6 +9,9 @@ target.path = $${L_BINDIR} TEMPLATE = app +include(../libLumina/LuminaXDG.pri) +include(../libLumina/LuminaThemes.pri) + SOURCES += main.cpp \ LFileDialog.cpp @@ -18,10 +21,6 @@ FORMS += LFileDialog.ui RESOURCES+= lumina-open.qrc -LIBS += -lLuminaUtils - -DEPENDPATH += ../libLumina - TRANSLATIONS = i18n/lumina-open_af.ts \ i18n/lumina-open_ar.ts \ diff --git a/src-qt5/core/lumina-open/main.cpp b/src-qt5/core/lumina-open/main.cpp index b411394c..279f7c1b 100644 --- a/src-qt5/core/lumina-open/main.cpp +++ b/src-qt5/core/lumina-open/main.cpp @@ -25,7 +25,7 @@ #include "LFileDialog.h" #include -#include +#include #include #include diff --git a/src-qt5/core/lumina-session/lumina-session.pro b/src-qt5/core/lumina-session/lumina-session.pro index 91a5f891..dc697a34 100644 --- a/src-qt5/core/lumina-session/lumina-session.pro +++ b/src-qt5/core/lumina-session/lumina-session.pro @@ -6,9 +6,9 @@ QT = core widgets TARGET = start-lumina-desktop target.path = $${L_BINDIR} - -LIBS += -lLuminaUtils -DEPENDPATH += ../libLumina +include(../libLumina/LDesktopUtils.pri) +include(../libLumina/LuminaXDG.pri) +include(../libLumina/LuminaThemes.pri) SOURCES += main.cpp \ session.cpp diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 77e553d4..73af45f9 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -10,7 +10,8 @@ #include #include "session.h" -#include +#include +#include #include #include #include @@ -21,7 +22,7 @@ int main(int argc, char ** argv) { if (argc > 1) { if (QString(argv[1]) == QString("--version")){ - qDebug() << LUtils::LuminaDesktopVersion(); + qDebug() << LDesktopUtils::LuminaDesktopVersion(); return 0; } } diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index c689c9a3..10953f12 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include void LSession::stopall(){ diff --git a/src-qt5/core/quickplugins/quick-sample.qml b/src-qt5/core/quickplugins/quick-sample.qml new file mode 100644 index 00000000..18b10d77 --- /dev/null +++ b/src-qt5/core/quickplugins/quick-sample.qml @@ -0,0 +1,12 @@ +// Plugin-Name=Sample +// Plugin-Description=A simple example for QtQuick/QML plugins +// Plugin-Icon=preferences-plugin +// Created: Ken Moore (ken@pcbsd.org) May 2015 + +import QtQuick.Controls 1.3 + +Label { + text: "Sample" + color: "blue" + font.bold: true +} \ No newline at end of file diff --git a/src-qt5/core/themes/Glass.qss.template b/src-qt5/core/themes/Glass.qss.template new file mode 100644 index 00000000..d594d25e --- /dev/null +++ b/src-qt5/core/themes/Glass.qss.template @@ -0,0 +1,539 @@ +/* ALL THE TEMPLATE WIDGETS */ +INHERITS=None + +/* ALL THE WIDGETS WITH THE BASE COLOR */ +QMainWindow, QMenu, QDialog, QMessageBox{ + background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 %%BASECOLOR%%, stop:1 %%ALTBASECOLOR%%); + color: %%TEXTCOLOR%%; + border: 1px solid %%ACCENTDISABLECOLOR%%; + border-radius: 3px; +} + +/* ALL THE WIDGETS WITH AN ALTERNATE BASE COLOR */ +QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{ + background: %%ALTBASECOLOR%%; + color: %%TEXTCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + selection-color: %%TEXTHIGHLIGHTCOLOR%%; +} + +/* PAGES OF CONTAINER WIDGETS */ +QStackedWidget .QWidget{ + background: transparent; + color: %%TEXTCOLOR%%; + border: none; +} + +QToolBox::tab{ + color: %%TEXTCOLOR%%; +} + +/* MENU WIDGETS */ +QMenuBar, QMenuBar::item,QToolBar{ + background: transparent; + border: none; + color: %%TEXTCOLOR%%; +} + +QStatusBar{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%); + border: none; + color: %%TEXTCOLOR%%; +} +QToolBar:top{ + border-bottom: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:bottom{ + border-top: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:left{ + border-right: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:right{ + border-left: 1px solid %%ACCENTCOLOR%%; +} + +QMenuBar::item{ + background: transparent; /*Use the menu bar color*/ + padding-left: 4px; + padding-right: 2px; +} + +QMenuBar::item:selected, QMenuBar::item:pressed, QMenu::item:selected{ +background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); +color: %%TEXTHIGHLIGHTCOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} +QMenuBar::item:disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +/*QMenu::item{ + border: 2px solid #808080; +}*/ + +QMenu::item{ + background: transparent; + border: 1px solid transparent; + color: %%TEXTCOLOR%%; + padding: 4px 30px 4px 20px; + margin-left: 3px; + margin-right: 3px; +} + +/* TAB WIDGETS */ +/*QTabBar{ + Custom Font settings need to be here and NOT in the ::tab fields, + otherwise it will break auto-scaling of the tab sizes to fit the text +}*/ +/* Transparency does not work on main pages within tabwidgets*/ +QTabWidget QStackedWidget .QWidget{ + background: rgb(230,230,230); + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} +QTabWidget{ + color: black; + border: none; +} +QTabWidget QLabel{ + color: black; +} +QTabBar::tab { + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%ALTBASECOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + padding: 2px; + color: %%TEXTCOLOR%%; +} +QTabBar::tab:top{ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +QTabBar::tab:bottom{ + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +/* left/right tab indicators appear to be reversed in Qt*/ +QTabBar::tab:right{ + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:left{ + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:selected{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 rgb(230,230,230)); + border-bottom: none; +} +QTabBar::tab:hover { + background: %%HIGHLIGHTCOLOR%%; + border: 1px solid %%ACCENTDISABLECOLOR%%; + } + +QTabBar::tab:!selected:top { + margin-top: 4px; +} +QTabBar::tab:!selected:bottom{ + margin-bottom: 4px; +} +QTabBar::tab:!selected:right{ + margin-left: 4px; +} +QTabBar::tab:!selected:left{ + margin-right: 4px; +} + +/* FRAME WIDGETS */ +QToolTip{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%ALTBASECOLOR%%); + border-radius: 3px; + border: 1px solid %%ACCENTCOLOR%%; + padding: 1px; + color: %%TEXTCOLOR%%; +} + +QLabel{ + background: transparent; + border: none; + color: %%TEXTCOLOR%%; +} +QAbstractButton::disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +/* GROUP BOX */ +QGroupBox{ + background-color: transparent; + border-color: %%ACCENTCOLOR%%; + border-radius: 5px; + margin-top: 2ex; + font-weight: bold; +} +QGroupBox::title{ + subcontrol-origin: margin; + subcontrol-position: top center; + padding: 0 3px; + background: transparent; + /*border: none;*/ + color: %%TEXTCOLOR%%; +} + +/* COMBO BOX */ +QComboBox{ + /*border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + padding: 1px 18px 1px 3px;*/ + color: %%TEXTCOLOR%%; + background: %%ALTBASECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + } + + +/* VIEW WIDGETS */ +QTreeView, QListView{ + background: %%ALTBASECOLOR%%; + alternate-background-color: %%BASECOLOR%%; + /*selection-background-color: %%SECONDARYCOLOR%%;*/ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + /*show-decoration-selected: 1;*/ + color: %%TEXTCOLOR%%; + selection-color: %%TEXTCOLOR%%; +} + +QTreeView:focus, QListView:focus{ + border: 1px solid %%HIGHLIGHTDISABLECOLOR%%; +} + +/* +QTreeView::item and QListView::item unneccessary: +Already set though parentage and causes usage errors if set manually +*/ + +/*QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; + border-color: %%ACCENTCOLOR%%; + color: %%TEXTCOLOR%%; +}*/ + +QTreeView::item:hover, QListView::item:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected:hover, QListView::item:selected:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; +} +QTreeView::item:selected:focus, QListView::item:selected:focus{ + background: %%SECONDARYCOLOR%%; +} +QHeaderView{ + background: %%HIGHLIGHTDISABLECOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; + border: none; + border-top-left-radius: 3px; /*match the list/tree view widgets*/ + border-top-right-radius: 3px; /*match the list/tree view widgets*/ +} +QHeaderView::section{ + background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/ + color: %%TEXTHIGHLIGHTCOLOR%%; + border-color: %%ACCENTCOLOR%%; + padding: 1px; + padding-left: 4px; +} +QHeaderView::section:hover{ + background: %%PRIMARYCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + color: %%TEXTCOLOR%%; +} + +/* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/ +QScrollBar{ + background:%%ALTBASECOLOR%%; +} +QScrollBar:horizontal{ + margin: 0px 0px 0px 0px; +} +QScrollBar:vertical{ + margin: 0px 0px 0px 0px; +} +QScrollBar::handle{ + background: %%SECONDARYCOLOR%%; + border: 1px solid transparent; + border-radius: 7px; +} +QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{ + background: %%SECONDARYDISABLECOLOR%%; +} +QScrollBar::add-line{ +subcontrol-origin: none; +} +QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{ +height: 0px; +} +QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{ +width: 0px; +} +QScrollBar::sub-line{ +subcontrol-origin: none; +} + +/* SLIDERS */ +QSlider::groove:horizontal { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::groove:vertical { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::sub-page:horizontal { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::sub-page:vertical { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::add-page:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::add-page:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::handle:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 13px; +border-radius: 4px; +} +QSlider::handle:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 13px; +border-radius: 4px; +} +QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{ +border: 1px solid %%ACCENTDISABLECOLOR%%; +/*background: %%HIGHLIGHTCOLOR%%;*/ +} + +QSlider::sub-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::add-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::handle:horizontal:disabled { +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} + +/* BUTTONS */ +QPushButton{ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + padding: 2px; + padding-right: 4px; + color: %%TEXTCOLOR%%; + } + +QToolButton{ /* Assume a flat button for every toolbutton by default*/ + color: %%TEXTCOLOR%%; + border: 1px solid transparent; + border-radius: 3px; + background-color: transparent; + padding: 1px; +} + + QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{ + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + margin-top: 2px; + } + +QPushButton:flat, QToolButton:flat{ + background-color: transparent; + border: 1px solid transparent; /* no border for a flat button */ +} + +QPushButton:hover, QToolButton:hover{ + border: 1px solid %%ACCENTCOLOR%%; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton, QCheckBox{ + padding: 2px; + border: 1px solid transparent; + border-radius: 3px; + color: %%TEXTCOLOR%%; +} +QRadioButton::hover, QCheckBox:hover{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{ + border: 1px solid %%TEXTCOLOR%%; +} +QRadioButton::indicator{ + border-radius: 7px; +} +QRadioButton::indicator:checked{ + background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent); +} +QCheckBox::indicator:checked, QGroupBox::indicator:checked{ + padding: 1px; + background-origin: content; + background-clip: content; + background: %%TEXTCOLOR%%; +} +QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{ + padding: 1px; + background-origin: content; + background-clip: content; + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%); +} + +/* PROGRESSBAR */ +QProgressBar{ + background-color: %%ALTBASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 5px; + color: %%TEXTCOLOR%%; + text-align: center; + padding: 1px; +} + QProgressBar::chunk { + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); + /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/ + border-radius: 5px; + } +QProgressBar::chunk:vertical{ + margin-left: 2px; + margin-right: 2px; +} +QProgressBar::chunk:horizontal{ + margin-top: 2px; + margin-bottom: 2px; +} + +QWidget#LuminaBootSplash{ + background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 30), stop:1 rgba(229, 229, 229, 70)); + border-radius: 5px; +} + +LDPlugin#applauncher{ + background-color: transparent; + border: none; +} +LDPlugin#applauncher QToolButton, LDPlugin, LDPlugin#desktopview QListWidget::item{ + background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 30), stop:1 rgba(229, 229, 229, 70)); + border-width: 3px; + border-style: solid; + border-radius: 5px; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + color: white; +} + +LDPlugin#applauncher QToolButton:hover, LDPlugin#desktopview QListWidget::item:hover{ + background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 100), stop:1 rgba(229, 229, 229, 150)); + border-width: 3px; + border-style: solid; + border-radius: 5px; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QWidget#LuminaPanelColor{ + background: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 60), stop:1 rgba(229, 229, 229, 110)); + border-radius: 3px; +} +/*Special taskmanager window buttons: based on window state*/ +LTBWidget{ + border: 1px solid transparent; + border-radius: 3px; +} +LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/ +LTBWidget#WindowVisible{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%PRIMARYCOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowInvisible{ + background: transparent; +} +LTBWidget#WindowActive{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowAttention{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); +} +LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover, QToolButton:hover{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.1 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); + color: %%TEXTHIGHLIGHTCOLOR%%; + border-width: 1px; + border-style: solid; + border-top-color: qradialgradient(spread:pad, cx:0.5, cy:1, radius:0.5, fx:0.5, fy:1, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-bottom-color: qradialgradient(spread:pad, cx:0.5, cy:0, radius:0.5, fx:0.5, fy:0, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-left-color: qradialgradient(spread:pad, cx:1, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); + border-right-color: qradialgradient(spread:pad, cx:0, cy:0.5, radius:0.5, fx:1, fy:0.5, stop:0 rgba(255, 255, 255, 30), stop:0.724868 rgba(255, 255, 255, 60), stop:1 rgba(255, 255, 255, 10)); +} +/* CALENDER WIDGET */ + /* (This is a special hack since there is no official support for stylesheets for this widget) */ + QCalendarWidget QWidget#qt_calendar_navigationbar{ + background-color: %%ALTBASECOLOR%%; + } +QCalendarWidget QWidget{ + background-color: %%BASECOLOR%%; + alternate-background-color: rgba(255, 255, 255, 50); + color: %%TEXTCOLOR%%; +} +QCalendarWidget QAbstractButton{ + background-color: transparent; +} +QCalendarWidget QAbstractButton::menu-indicator{ + image: none; +} +QCalendarWidget QAbstractItemView{ + selection-background-color: qradialgradient(spread:reflect, cx:0.113757, cy:0.875, radius:0.7, fx:0.045, fy:0.954545, stop:0 rgba(234, 236, 243, 20), stop:1 rgba(229, 229, 229, 100)); + selection-color: %%TEXTHIGHLIGHTCOLOR%%; +} +QCalendarWidget QWidget#qt_calendar_calendarview{ + background-color: rgb(220,220,220); + border: none; +} diff --git a/src-qt5/core/themes/Lumina-default.qss.template b/src-qt5/core/themes/Lumina-default.qss.template new file mode 100644 index 00000000..9f03d4ae --- /dev/null +++ b/src-qt5/core/themes/Lumina-default.qss.template @@ -0,0 +1,494 @@ +/* ALL THE TEMPLATE WIDGETS */ +INHERITS=None + +/* ALL THE WIDGETS WITH THE BASE COLOR */ +QMainWindow, QMenu, QDialog, QMessageBox{ + background: %%BASECOLOR%%; + color: %%TEXTCOLOR%%; +} + +/* ALL THE WIDGETS WITH AN ALTERNATE BASE COLOR */ +QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{ + background: %%ALTBASECOLOR%%; + color: %%TEXTCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + selection-color: %%TEXTHIGHLIGHTCOLOR%%; + +} + +/* PAGES OF CONTAINER WIDGETS */ +QStackedWidget .QWidget, QTabWidget .QWidget{ + background: %%ALTBASECOLOR%%; + color: %%TEXTCOLOR%%; + border: none; +} +QToolBox::tab{ + color: %%TEXTCOLOR%%; +} + +/* MENU WIDGETS */ +QMenuBar, QMenuBar::item,QToolBar{ + background: %%SECONDARYCOLOR%%; + border: none; + color: %%TEXTCOLOR%%; +} + +QStatusBar{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%); + border: none; + color: %%TEXTCOLOR%%; +} +QToolBar:top{ + border-bottom: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:bottom{ + border-top: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:left{ + border-right: 1px solid %%ACCENTCOLOR%%; +} +QToolBar:right{ + border-left: 1px solid %%ACCENTCOLOR%%; +} + +QMenuBar::item{ + background: transparent; /*Use the menu bar color*/ + padding-left: 4px; + padding-right: 2px; +} + +QMenuBar::item:selected, QMenuBar::item:pressed, QMenu::item:selected{ +background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); +color: %%TEXTHIGHLIGHTCOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} +QMenuBar::item:disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +QMenu::item{ + border: 2px solid #808080; +} + +QMenu::item{ + background: transparent; + border: 1px solid transparent; + color: %%TEXTCOLOR%%; + padding: 4px 30px 4px 20px; + margin-left: 3px; + margin-right: 3px; +} + +/* TAB WIDGETS */ +/*QTabBar{ + Custom Font settings need to be here and NOT in the ::tab fields, + otherwise it will break auto-scaling of the tab sizes to fit the text +}*/ +QTabBar::tab { + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + padding: 2px; + color: %%TEXTCOLOR%%; +} +QTabBar::tab:top{ + border-top-left-radius: 4px; + border-top-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +QTabBar::tab:bottom{ + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + max-width: 100em; + min-width: 0em; +} +/* left/right tab indicators appear to be reversed in Qt*/ +QTabBar::tab:right{ + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:left{ + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + max-height: 100em; + min-height: 0em; +} +QTabBar::tab:selected{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTabBar::tab:hover { + background: %%HIGHLIGHTCOLOR%%; + border: 1px solid %%ACCENTDISABLECOLOR%%; + } + +QTabBar::tab:!selected:top { + margin-top: 4px; +} +QTabBar::tab:!selected:bottom{ + margin-bottom: 4px; +} +QTabBar::tab:!selected:right{ + margin-left: 4px; +} +QTabBar::tab:!selected:left{ + margin-right: 4px; +} + +/* FRAME WIDGETS */ +QToolTip{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%ALTBASECOLOR%%); + border-radius: 3px; + border: 1px solid %%ACCENTCOLOR%%; + padding: 1px; + color: %%TEXTCOLOR%%; +} + +QLabel{ + background: transparent; + border: none; + color: %%TEXTCOLOR%%; +} +QAbstractButton::disabled{ + color: %%TEXTDISABLECOLOR%%; +} + +/* GROUP BOX */ +QGroupBox{ + background-color: transparent; + border-color: %%ACCENTCOLOR%%; + border-radius: 5px; + margin-top: 2ex; + font-weight: bold; +} +QGroupBox::title{ + subcontrol-origin: margin; + subcontrol-position: top center; + padding: 0 3px; + background: transparent; + /*border: none;*/ + color: %%TEXTCOLOR%%; +} + +/* COMBO BOX */ +QComboBox{ + /*border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + padding: 1px 18px 1px 3px;*/ + color: %%TEXTCOLOR%%; + background: %%ALTBASECOLOR%%; + selection-background-color: %%HIGHLIGHTCOLOR%%; + } + + +/* VIEW WIDGETS */ +QTreeView, QListView{ + background: %%ALTBASECOLOR%%; + alternate-background-color: %%BASECOLOR%%; + /*selection-background-color: %%SECONDARYCOLOR%%;*/ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + /*show-decoration-selected: 1;*/ + color: %%TEXTCOLOR%%; + selection-color: %%TEXTCOLOR%%; +} + +QTreeView:focus, QListView:focus{ + border: 1px solid %%HIGHLIGHTDISABLECOLOR%%; +} + +/* +QTreeView::item and QListView::item unneccessary: +Already set though parentage and causes usage errors if set manually +*/ + +/*QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; + border-color: %%ACCENTCOLOR%%; + color: %%TEXTCOLOR%%; +}*/ + +QTreeView::item:hover, QListView::item:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected:hover, QListView::item:selected:hover{ + background: %%HIGHLIGHTDISABLECOLOR%%; +} +QTreeView::item:selected, QListView::item:selected{ + background: %%SECONDARYDISABLECOLOR%%; +} +QTreeView::item:selected:focus, QListView::item:selected:focus{ + background: %%SECONDARYCOLOR%%; +} +QHeaderView{ + background: %%HIGHLIGHTDISABLECOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; + border: none; + border-top-left-radius: 3px; /*match the list/tree view widgets*/ + border-top-right-radius: 3px; /*match the list/tree view widgets*/ +} +QHeaderView::section{ + background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/ + color: %%TEXTHIGHLIGHTCOLOR%%; + border-color: %%ACCENTCOLOR%%; + padding: 1px; + padding-left: 4px; +} +QHeaderView::section:hover{ + background: %%PRIMARYCOLOR%%; + border-color: %%ACCENTDISABLECOLOR%%; + color: %%TEXTCOLOR%%; +} + +/* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/ +QScrollBar{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); + /*border: 1px solid %%ACCENTCOLOR%%;*/ +} +QScrollBar:horizontal{ + margin: 0px 20px 0px 20px; +} +QScrollBar:vertical{ + margin: 20px 0px 20px 0px; +} +QScrollBar::sub-page, QScrollBar::add-page{ + background: %%BASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; +} +QScrollBar::sub-page:vertical{ + border-bottom: none; +} +QScrollBar::add-page:vertical{ + border-top: none; +} +QScrollBar::sub-page:horizontal{ + border-right: none; +} +QScrollBar::add-page:horizontal{ + border-left: none; +} +QScrollBar::handle{ + background: QLinearGradient(x1: 0, y1: -0.3, x2: 0, y2: 1.3, stop: 0 %%BASECOLOR%%, stop: 0.5 %%SECONDARYCOLOR%%, stop: 1 %%BASECOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; +} +QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{ + background: %%HIGHLIGHTCOLOR%%; +} +QScrollBar::add-line{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; +subcontrol-position: bottom right; +subcontrol-origin: margin; +} +QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{ +height: 20px; +} +QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{ +width: 20px; +} +QScrollBar::sub-line{ + background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; +subcontrol-position: top left; +subcontrol-origin: margin; +height: 20px; +} +/* SLIDERS */ +QSlider::groove:horizontal { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::groove:vertical { +border: 1px solid %%ACCENTCOLOR%%; +background: %%ALTBASECOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::sub-page:horizontal { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::sub-page:vertical { +background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, + stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::add-page:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 10px; +border-radius: 3px; +} +QSlider::add-page:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 10px; +border-radius: 3px; +} +QSlider::handle:horizontal{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +width: 13px; +border-radius: 4px; +} +QSlider::handle:vertical{ +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +height: 13px; +border-radius: 4px; +} +QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{ +border: 1px solid %%ACCENTDISABLECOLOR%%; +/*background: %%HIGHLIGHTCOLOR%%;*/ +} + +QSlider::sub-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::add-page:horizontal:disabled { +background: %%ACCENTDISABLECOLOR%%; +border-color: %%ACCENTCOLOR%%; +} + +QSlider::handle:horizontal:disabled { +background: %%ALTBASECOLOR%%; +border: 1px solid %%ACCENTCOLOR%%; +} + +/* BUTTONS */ +QPushButton{ + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%); + padding: 2px; + padding-right: 4px; + color: %%TEXTCOLOR%%; + } + +QToolButton{ /* Assume a flat button for every toolbutton by default*/ + color: %%TEXTCOLOR%%; + border: 1px solid transparent; + border-radius: 3px; + background-color: transparent; + padding: 1px; +} + + QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{ + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + margin-top: 2px; + } + +QPushButton:flat, QToolButton:flat{ + background-color: transparent; + border: 1px solid transparent; /* no border for a flat button */ +} + +QPushButton:hover, QToolButton:hover{ + border: 1px solid %%ACCENTCOLOR%%; + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton, QCheckBox{ + padding: 2px; + border: 1px solid transparent; + border-radius: 3px; + color: %%TEXTCOLOR%%; +} +QRadioButton::hover, QCheckBox:hover{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%); + border: 1px solid %%ACCENTCOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; +} +QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{ + border: 1px solid %%TEXTCOLOR%%; +} +QRadioButton::indicator{ + border-radius: 7px; +} +QRadioButton::indicator:checked{ + background: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:1, fx:0.5, fy:0.5, stop:0 %%TEXTCOLOR%%, stop:0.25 %%TEXTCOLOR%%, stop:0.25001 transparent); +} +QCheckBox::indicator:checked, QGroupBox::indicator:checked{ + padding: 1px; + background-origin: content; + background-clip: content; + background: %%TEXTCOLOR%%; +} +QCheckBox::indicator:indeterminate, QGroupBox::indicator:indeterminate{ + padding: 1px; + background-origin: content; + background-clip: content; + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0.49 transparent, stop: 0.5 %%TEXTCOLOR%%); +} + +/* PROGRESSBAR */ +QProgressBar{ + background-color: %%ALTBASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 5px; + color: %%TEXTCOLOR%%; + text-align: center; + padding: 1px; +} + QProgressBar::chunk { + background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%); + /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/ + border-radius: 5px; + } +QProgressBar::chunk:vertical{ + margin-left: 2px; + margin-right: 2px; +} +QProgressBar::chunk:horizontal{ + margin-top: 2px; + margin-bottom: 2px; +} + + /* SPINBOX */ +/*QAbstractSpinBox{ + background-color: %%ALTBASECOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; + border-radius: 3px; +} +QAbstractSpinBox:disabled{ + color: %%ACCENTDISABLECOLOR%%; +}*/ +/*QAbstractSpinBox::down-button{ + subcontrol-origin: border; + subcontrol-position: left; + width: 16px; + border-width: 1px; +} +QAbstractSpinBox::up-button{ + subcontrol-origin: border; + subcontrol-position: right; + width: 16px; + border-width: 1px; +}*/ +/* +QAbstractSpinBox::down-arrow{ + border-image: url(":/trolltech/styles/commonstyle/images/left-16.png"); + width: 16px; + height: 16px; +} +QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::down-arrow:off, QAbstractSpinBox::up-arrow:off{ + border-image: url(:/none); +} +QAbstractSpinBox::up-arrow{ + border-image: url(":/trolltech/styles/commonstyle/images/right-16.png"); + width: 16px; + height: 16px; +}*/ diff --git a/src-qt5/core/themes/None.qss.template b/src-qt5/core/themes/None.qss.template new file mode 100644 index 00000000..7d923b1e --- /dev/null +++ b/src-qt5/core/themes/None.qss.template @@ -0,0 +1,118 @@ +/* This is a blank stylesheet to disable the Lumina Themes almost entirely*/ +QWidget{ + font-family: %%FONT%%; + font-size: %%FONTSIZE%%; +} +/* Set the panel appearance for this theme (unless manually customized) */ +QWidget#LuminaPanelColor{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%); + border-radius: 5px; +} +QWidget#LuminaBootSplash{ + background: %%BASECOLOR%%; + border-radius: 5px; +} + +/* Set the default canvas appearance for Lumina desktop plugins*/ +/* Default to a non-transparent background for all desktop plugins*/ +LDPlugin{ + background: %%BASECOLOR%%; + border-radius: 5px; +} +/* Now specify which plugins should have a transparent background */ +LDPlugin#applauncher, LDPlugin#desktopview{ + background: transparent; + border-radius: 5px; +} + +LDPlugin#applauncher QToolButton{ +background: transparent; + border: none; + border-radius: 5px; + color: white; +} +LDPlugin#applauncher QToolButton:hover{ + background: %%PRIMARYDISABLECOLOR%%; + border: none; + border-radius: 5px; + color: %%TEXTHIGHLIGHTCOLOR%%; +} + +LDPlugin#desktopview QListWidget{ + background: transparent; + border: 1px solid transparent; +} +LDPlugin#desktopview QListWidget::item{ + background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 transparent, + stop: 0.7 transparent, + stop: 1.0 %%PRIMARYDISABLECOLOR%%); + border-radius: 5px; + color: %%TEXTCOLOR%%; +} + +LDPlugin#desktopview QListWidget::item:hover{ + background: %%PRIMARYDISABLECOLOR%%; + border-radius: 5px; + color: %%TEXTHIGHLIGHTCOLOR%%; +} +/*For the special widgets on the user button*/ +UserItemWidget, ItemWidget{ + background: transparent; + border-radius: 3px; +} +UserItemWidget:hover, ItemWidget:hover{ + background: %%HIGHLIGHTCOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; +} + +/*Special taskmanager window buttons: based on window state*/ +LTBWidget{ + border: 1px solid transparent; + border-radius: 3px; +} +LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/ +LTBWidget#WindowVisible{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%SECONDARYCOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowInvisible{ + /* Primary color is used for the panel appearance, so use that to make it disappear*/ + background: transparent; +} +LTBWidget#WindowActive{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent); +} +LTBWidget#WindowAttention{ + background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTCOLOR%%, stop: 1 transparent); +} +LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover{ + background: %%HIGHLIGHTCOLOR%%; + color: %%TEXTHIGHLIGHTCOLOR%%; + border: 1px solid %%ACCENTCOLOR%%; +} + +/* CALENDER WIDGET */ + /* (This is a special hack since there is no official support for stylesheets for this widget) */ + QCalendarWidget QWidget#qt_calendar_navigationbar{ + background-color: %%ALTBASECOLOR%%; + } +QCalendarWidget QWidget{ + background-color: %%BASECOLOR%%; + alternate-background-color: %%HIGHLIGHTDISABLECOLOR%%; + color: %%TEXTCOLOR%%; +} +QCalendarWidget QAbstractButton{ + background-color: transparent; +} +QCalendarWidget QAbstractButton::menu-indicator{ + image: none; +} +QCalendarWidget QAbstractItemView{ + background-color: %%SECONDARYCOLOR%%; + selection-background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);; + selection-color: %%TEXTHIGHLIGHTCOLOR%%; +} +QCalendarWidget QWidget#qt_calendar_calendarview{ + background-color: %%ALTBASECOLOR%%; + border: none; +} \ No newline at end of file diff --git a/src-qt5/core/xtrafiles/globs2 b/src-qt5/core/xtrafiles/globs2 new file mode 100644 index 00000000..0a783316 --- /dev/null +++ b/src-qt5/core/xtrafiles/globs2 @@ -0,0 +1,991 @@ +# Fallback "globs2" file from the FreeDesktop mimetype database (9/23/16) +# This is only used if the official database cannot be found on the system +80:application/x-cd-image:*.iso +80:application/x-doom-wad:*.wad +50:text/x-vala:*.vala +50:application/x-nes-rom:*.nez +50:audio/ac3:*.ac3 +50:application/x-mswrite:*.wri +50:application/smil+xml:*.smil +50:text/x-verilog:*.v +50:application/x-qpress:*.qp +50:image/x-exr:*.exr +50:application/x-compress:*.z +50:image/x-jng:*.jng +50:application/oda:*.oda +50:application/vnd.oasis.opendocument.database:*.odb +50:application/vnd.sun.xml.base:*.odb +50:application/vnd.oasis.opendocument.chart:*.odc +50:text/vtt:*.vtt +50:application/x-xz-compressed-tar:*.txz +50:application/vnd.oasis.opendocument.formula:*.odf +50:application/vnd.oasis.opendocument.formula:*.odf +50:application/vnd.oasis.opendocument.graphics:*.odg +50:application/vnd.oasis.opendocument.graphics:*.odg +50:text/x-ldif:*.ldif +50:application/vnd.oasis.opendocument.image:*.odi +50:image/jp2:*.jp2 +50:application/x-oleo:*.oleo +50:application/oxps:*.xps +50:application/vnd.oasis.opendocument.text-master:*.odm +50:application/vnd.oasis.opendocument.text-master:*.odm +50:application/x-ruby:*.rb +50:audio/vnd.rn-realaudio:*.ra +50:application/x-mimearchive:*.mht +50:application/vnd.oasis.opendocument.presentation:*.odp +50:application/vnd.oasis.opendocument.presentation:*.odp +50:application/x-raw-disk-image-xz-compressed:*.raw-disk-image.xz +50:application/vnd.oasis.opendocument.spreadsheet:*.ods +50:application/vnd.oasis.opendocument.spreadsheet:*.ods +50:application/vnd.oasis.opendocument.text:*.odt +50:application/vnd.oasis.opendocument.text:*.odt +50:image/x-portable-bitmap:*.pbm +50:application/x-egon:*.egon +50:application/x-font-pcf:*.pcf.z +50:application/x-xliff:*.xliff +50:application/vnd.rn-realmedia:*.rm +50:application/x-abiword:*.abw +50:image/vnd.rn-realpix:*.rp +50:image/x-sigma-x3f:*.x3f +50:video/webm:*.webm +50:text/rust:*.rs +50:text/vnd.rn-realtext:*.rt +50:image/webp:*.webp +50:application/x-cpio:*.cpio +50:audio/midi:*.mid +50:application/x-mif:*.mif +50:video/vnd.rn-realvideo:*.rv +50:application/vnd.google-earth.kml+xml:*.kml +50:image/x-3ds:*.3ds +50:image/x-photo-cd:*.pcd +50:application/x-pc-engine-rom:*.pce +50:application/x-font-pcf:*.pcf +50:application/x-cisco-vpn-settings:*.pcf +50:model/vrml:*.wrl +50:text/x-fortran:*.f95 +50:text/plain:*.txt +50:image/x-xpixmap:*.xpm +50:application/vnd.hp-pcl:*.pcl +50:application/x-trash:*.bak +50:application/vnd.openxmlformats-officedocument.presentationml.template:*.potx +50:application/vnd.openxmlformats-officedocument.presentationml.template:*.potx +50:application/x-sms-rom:*.sg +50:application/x-shellscript:*.sh +50:model/vrml:*.vrml +50:text/vcard:*.vcard +50:image/x-skencil:*.sk +50:image/x-pict:*.pct +50:video/3gpp2:*.3g2 +50:text/x-vala:*.vapi +50:application/x-sharedlib:*.so +50:application/x-tzo:*.tzo +50:video/x-javafx:*.fxm +50:image/jpeg:*.jpe +50:audio/x-aifc:*.aifc +50:application/x-lzma-compressed-tar:*.tar.lzma +50:x-epoc/x-sisx-app:*.sisx +50:audio/x-aiff:*.aiff +50:audio/x-aifc:*.aiffc +50:image/jp2:*.jpf +50:application/x-hdf:*.hdf4 +50:application/x-hdf:*.hdf5 +50:application/x-aportisdoc:*.pdb +50:application/vnd.palm:*.pdb +50:application/x-aportisdoc:*.pdc +50:application/x-profile:gmon.out +50:application/x-jbuilder-project:*.jpr +50:application/pdf:*.pdf +50:application/x-bzpdf:*.pdf.bz2 +50:application/x-theme:*.theme +50:image/jpeg:*.jpg +50:application/x-raw-disk-image-xz-compressed:*.img.xz +50:application/x-jbuilder-project:*.jpx +50:image/jp2:*.jpx +50:text/x-svsrc:*.sv +50:image/x-quicktime:*.qtif +50:image/x-kodak-k25:*.k25 +50:text/x-scheme:*.ss +50:application/vnd.openxmlformats-officedocument.presentationml.presentation:*.pptx +50:application/vnd.openxmlformats-officedocument.presentationml.presentation:*.pptx +50:application/x-ace:*.ace +50:image/vnd.zbrush.pcx:*.pcx +50:text/x-adasrc:*.ads +50:text/x-tcl:*.tk +50:text/x-changelog:changelog +50:audio/flac:*.flac +50:text/x-adasrc:*.adb +50:text/html:*.htm +50:text/x-google-video-pointer:*.gvp +50:text/troff:*.tr +50:audio/x-matroska:*.mka +50:text/vnd.trolltech.linguist:*.ts +50:video/mp2t:*.ts +50:application/x-cb7:*.cb7 +50:text/x-vhdl:*.vhdl +50:audio/ogg:*.oga +50:audio/x-vorbis+ogg:*.oga +50:audio/x-flac+ogg:*.oga +50:audio/x-speex+ogg:*.oga +50:application/xslt+xml:*.xsl +50:application/x-saturn-rom:*.iso +50:application/x-wii-rom:*.iso +50:application/x-gamecube-rom:*.iso +50:application/atom+xml:*.atom +50:video/3gpp:*.3ga +50:application/x-kontour:*.kon +50:audio/ogg:*.ogg +50:video/ogg:*.ogg +50:audio/x-vorbis+ogg:*.ogg +50:audio/x-flac+ogg:*.ogg +50:audio/x-speex+ogg:*.ogg +50:video/x-theora+ogg:*.ogg +50:image/x-pentax-pef:*.pef +50:application/vnd.ms-cab-compressed:*.cab +50:text/markdown:*.mkd +50:application/rdf+xml:*.rdfs +50:application/x-zoo:*.zoo +50:video/x-ogm+ogg:*.ogm +50:text/x-rpm-spec:*.spec +50:application/x-x509-ca-cert:*.pem +50:video/3gpp2:*.3gp2 +50:application/x-xpinstall:*.xpi +50:video/x-matroska:*.mkv +50:application/ram:*.ram +50:application/x-designer:*.ui +50:application/x-gtk-builder:*.ui +50:audio/x-wavpack-correction:*.wvc +50:video/ogg:*.ogv +50:application/vnd.tcpdump.pcap:*.cap +50:application/ogg:*.ogx +50:application/x-rar:*.rar +50:application/x-xbel:*.xbel +50:application/jrd+json:*.jrd +50:application/vnd.ms-tnef:*.tnef +50:image/x-panasonic-raw:*.raw +50:video/3gpp:*.3gp +50:audio/vnd.rn-realaudio:*.rax +50:text/x-python:*.wsgi +50:application/x-7z-compressed:*.7z +50:audio/x-wavpack:*.wvp +50:image/x-cmu-raster:*.ras +50:application/x-font-type1:*.pfa +50:application/x-font-type1:*.pfb +50:application/x-kpovmodeler:*.kpm +50:text/x-ocaml:*.mli +50:image/x-fuji-raf:*.raf +50:application/ld+json:*.jsonld +50:audio/x-ms-asx:*.wvx +50:application/x-kpresenter:*.kpr +50:application/x-font-bdf:*.bdf +50:application/x-cd-image:*.iso9660 +50:application/x-kpresenter:*.kpt +50:text/x-eiffel:*.e +50:application/x-font-afm:*.afm +50:text/x-nfo:*.nfo +50:image/x-compressed-xcf:*.xcf.bz2 +50:text/x-cobol:*.cbl +50:video/mp2t:*.bdm +50:video/quicktime:*.moov +50:text/x-texinfo:*.texi +50:application/x-wwf:*.wwf +50:application/x-cbr:*.cbr +50:application/pkcs12:*.pfx +50:application/metalink+xml:*.metalink +50:application/x-cbt:*.cbt +50:video/mpeg:[0-9][0-9][0-9].vdr +50:application/x-perl:*.perl +50:application/vnd.mozilla.xul+xml:*.xul +50:application/x-cbz:*.cbz +50:text/x-log:*.log +50:application/x-smaf:*.mmf +50:application/javascript:*.jsm +50:text/x-meson:meson_options.txt +50:application/x-gba-rom:*.agb +50:application/x-hwt:*.hwt +50:text/x-iptables:*.iptables +50:application/mathml+xml:*.mml +50:application/oxps:*.oxps +50:video/mp2t:*.bdmv +50:video/3gpp:*.3gpp +50:application/x-docbook+xml:*.docbook +50:audio/x-mod:*.m15 +50:application/x-chess-pgn:*.pgn +50:audio/x-mo3:*.mo3 +50:application/x-bcpio:*.bcpio +50:application/pgp-encrypted:*.pgp +50:application/pgp-keys:*.pgp +50:application/pgp-signature:*.pgp +50:application/x-bzip-compressed-tar:*.tar.bz +50:application/x-amipro:*.sam +50:application/vnd.google-earth.kmz:*.kmz +50:video/quicktime:*.qt +50:image/x-portable-graymap:*.pgm +50:application/x-krita:*.kra +50:application/x-dar:*.dar +50:application/vnd.wordperfect:*.wp +50:image/vnd.wap.wbmp:*.wbmp +50:application/x-spss-sav:*.sav +50:text/x-scons:sconstruct +50:video/x-msvideo:*.divx +50:audio/x-wavpack:*.wv +50:application/xhtml+xml:*.xhtml +50:video/x-mng:*.mng +50:text/x-uuencode:*.uue +50:image/x-pict:*.pict1 +50:image/x-pict:*.pict2 +50:image/x-bzeps:*.eps.bz2 +50:application/x-n64-rom:*.z64 +50:audio/x-musepack:*.mp+ +50:text/x-c++hdr:*.hxx +50:application/rdf+xml:*.rdf +50:application/x-netcdf:*.cdf +50:application/vnd.rn-realmedia:*.rmvb +50:application/x-dbf:*.dbf +50:audio/mp2:*.mp2 +50:video/mpeg:*.mp2 +50:application/vnd.lotus-1-2-3:*.123 +50:application/x-php:*.php +50:application/x-font-pcf:*.pcf.gz +50:audio/mpeg:*.mp3 +50:video/mp4:*.mp4 +50:text/x-python:*.py +50:audio/x-minipsf:*.minipsf +50:audio/x-xm:*.xm +50:application/vnd.corel-draw:*.cdr +50:audio/x-xi:*.xi +50:image/x-xwindowdump:*.xwd +50:application/x-desktop:*.desktop +50:application/x-bzip-compressed-tar:*.tb2 +50:text/x-tex:*.latex +50:text/x-moc:*.moc +50:audio/x-mod:*.mod +50:application/vnd.openxmlformats-officedocument.presentationml.slideshow:*.ppsx +50:application/x-docbook+xml:*.dbk +50:text/x-mof:*.mof +50:application/x-xz:*.xz +50:application/vnd.ms-excel.sheet.binary.macroEnabled.12:*.xlsb +50:application/vnd.ms-excel.sheet.binary.macroenabled.12:*.xlsb +50:application/x-kspread:*.ksp +50:audio/x-aiff:*.aif +50:text/markdown:*.markdown +50:text/vcard:*.gcrd +50:application/x-php:*.php3 +50:application/x-php:*.php4 +50:application/x-php:*.php5 +50:text/x-reject:*.rej +50:application/vnd.ms-excel.sheet.macroEnabled.12:*.xlsm +50:application/vnd.ms-excel.sheet.macroenabled.12:*.xlsm +50:video/mp2t:*.m2ts +50:text/x-ms-regedit:*.reg +50:application/vnd.openxmlformats-officedocument.wordprocessingml.document:*.docx +50:application/vnd.openxmlformats-officedocument.wordprocessingml.document:*.docx +50:text/x-dcl:*.dcl +50:application/dicom:*.dcm +50:video/vnd.mpegurl:*.m1u +50:text/x-scheme:*.scm +50:application/x-qtiplot:*.qti.gz +50:application/pkix-cert:*.cer +50:image/x-kodak-dcr:*.dcr +50:application/x-tar:*.tar +50:text/x-patch:*.patch +50:text/x-scala:*.scala +50:image/vnd.djvu:*.djvu +50:audio/x-musepack:*.mpc +50:video/quicktime:*.mov +50:video/mpeg:*.mpe +50:application/x-tarz:*.taz +50:application/x-trash:*.old +50:video/mpeg:*.mpg +50:video/mp2t:*.mpl +50:application/vnd.stardivision.draw:*.sda +50:application/vnd.stardivision.calc:*.sdc +50:text/x-mrml:*.mrml +50:application/vnd.stardivision.impress:*.sdd +50:audio/x-musepack:*.mpp +50:application/vnd.ms-excel.template.macroEnabled.12:*.xltm +50:application/vnd.ms-excel.template.macroenabled.12:*.xltm +50:video/mp4:*.lrv +50:video/mp2t:*.m2t +50:image/x-gzeps:*.epsf.gz +50:application/x-lrzip:*.lrz +50:video/3gpp2:*.3gpp2 +50:image/jpeg:*.jpeg +50:application/mbox:*.mbox +50:application/vnd.stardivision.impress:*.sdp +50:application/sdp:*.sdp +50:audio/x-mpegurl:*.m3u8 +50:application/vnd.apple.mpegurl:*.m3u8 +50:application/vnd.stardivision.chart:*.sds +50:image/x-dds:*.dds +50:application/x-kugar:*.kud +50:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:*.xlsx +50:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:*.xlsx +50:application/vnd.stardivision.writer:*.sdw +50:application/x-fictionbook+xml:*.fb2 +50:application/x-xzpdf:*.pdf.xz +50:text/x-copying:copying +50:application/x-bzip-compressed-tar:*.tbz +50:application/zlib:*.zz +50:application/x-lrzip-compressed-tar:*.tar.lrz +50:text/x-bibtex:*.bib +50:image/x-rgb:*.rgb +50:application/x-gzpostscript:*.ps.gz +50:application/x-gameboy-rom:*.cgb +50:application/x-php:*.phps +50:application/vnd.debian.binary-package:*.deb +50:application/x-qw:*.qif +50:image/x-quicktime:*.qif +50:audio/x-mpegurl:*.m3u +50:application/vnd.apple.mpegurl:*.m3u +50:application/vnd.openxmlformats-officedocument.spreadsheetml.template:*.xltx +50:application/vnd.openxmlformats-officedocument.spreadsheetml.template:*.xltx +50:text/x-c++src:*.c++ +50:application/x-ccmx:*.ccmx +50:application/vnd.coffeescript:*.coffee +50:application/octet-stream:*.bin +50:application/x-saturn-rom:*.bin +50:application/smil+xml:*.kino +50:application/pgp-keys:*.pkr +50:application/vnd.ms-visio.stencil.macroEnabled.main+xml:*.vssm +50:image/cgm:*.cgm +50:text/x-mup:*.not +50:text/x-tcl:*.tcl +50:audio/mp4:*.m4a +50:application/x-x509-ca-cert:*.der +50:audio/x-m4b:*.m4b +50:application/x-pagemaker:*.pm6 +50:text/x-meson:meson.build +50:application/x-sami:*.sami +50:application/vnd.ms-visio.stencil.main+xml:*.vssx +50:audio/x-iriver-pla:*.pla +50:text/x-mrml:*.mrl +50:application/vnd.nintendo.snes.rom:*.sfc +50:application/xml:*.xsd +50:video/mp4:*.m4v +50:video/mp2t:*.mpls +50:application/x-planperfect:*.pln +50:text/x-tex:*.ltx +50:image/x-minolta-mrw:*.mrw +50:application/metalink4+xml:*.meta4 +50:application/vnd.ms-powerpoint.addin.macroEnabled.12:*.ppam +50:application/vnd.ms-visio.template.macroEnabled.main+xml:*.vstm +50:application/x-compressed-tar:*.tar.gz +50:audio/x-scpls:*.pls +50:application/vnd.ms-htmlhelp:*.chm +50:application/x-hwp:*.hwp +50:application/x-abiword:*.abw.gz +50:application/x-alz:*.alz +50:application/x-kword:*.kwd +50:text/x-lua:*.lua +50:application/vnd.ms-visio.template.main+xml:*.vstx +50:video/vnd.mpegurl:*.m4u +50:text/x-ooc:*.ooc +50:application/x-msi:*.msi +50:application/x-kexiproject-sqlite2:*.kexi +50:application/x-kexiproject-sqlite3:*.kexi +50:video/x-anim:*.anim[1-9j] +50:application/x-pagemaker:*.pmd +50:application/x-abiword:*.zabw +50:application/x-gameboy-rom:*.sgb +50:application/x-kword:*.kwt +50:application/x-go-sgf:*.sgf +50:application/pkcs10:*.p10 +50:image/x-sgi:*.sgi +50:application/pkcs12:*.p12 +50:application/x-blender:*.blender +50:application/vnd.stardivision.writer:*.sgl +50:application/x-msx-rom:*.msx +50:application/x-dia-shape:*.shape +50:application/x-blender:*.blend +50:application/x-blender:*.blend +50:application/x-mimearchive:*.mhtml +50:audio/midi:*.midi +50:application/x-java-jnlp-file:*.jnlp +50:text/x-cmake:cmakelists.txt +50:audio/x-amzxml:*.amz +50:image/x-tga:*.tpic +50:audio/AMR:*.amr +50:text/x-makefile:makefile +50:text/x-scons:sconscript.* +50:text/x-tex:*.tex +50:application/vnd.oasis.opendocument.graphics-flat-xml:*.fodg +50:application/vnd.oasis.opendocument.graphics-flat-xml:*.fodg +50:text/sgml:*.sgm +50:application/x-amiga-disk-format:*.adf +50:image/x-msod:*.msod +50:audio/x-mod:*.mtm +50:image/png:*.png +50:application/vnd.oasis.opendocument.presentation-flat-xml:*.fodp +50:application/vnd.oasis.opendocument.presentation-flat-xml:*.fodp +50:application/x-navi-animation:*.ani +50:application/vnd.oasis.opendocument.spreadsheet-flat-xml:*.fods +50:application/vnd.oasis.opendocument.spreadsheet-flat-xml:*.fods +50:application/vnd.oasis.opendocument.text-flat-xml:*.fodt +50:application/vnd.oasis.opendocument.text-flat-xml:*.fodt +50:application/x-n64-rom:*.n64 +50:application/x-ustar:*.ustar +50:application/x-gameboy-rom:*.gbc +50:application/x-gba-rom:*.gba +50:application/x-java-pack200:*.pack +50:application/dicom:dicomdir +50:application/x-shar:*.shar +50:application/x-shorten:*.shn +50:application/x-genesis-rom:*.32x +50:image/x-portable-anymap:*.pnm +50:application/x-gzdvi:*.dvi.gz +50:application/annodex:*.anx +50:text/html:*.html +50:video/mp2t:*.mts +50:text/x-authors:authors +50:text/x-install:install +50:application/x-quattropro:*.wb1 +50:application/x-quattropro:*.wb2 +50:application/x-quattropro:*.wb3 +50:application/x-gnucash:*.gnucash +50:application/x-perl:*.pod +50:application/x-source-rpm:*.src.rpm +50:image/x-lwo:*.lwo +50:application/x-dia-diagram:*.dia +50:application/vnd.lotus-wordpro:*.lwp +50:application/x-lrzip-compressed-tar:*.tlrz +50:application/x-partial-download:*.wkdownload +50:application/x-glade:*.glade +50:application/pgp-signature:*.sig +50:text/x-qml:*.qml +50:image/x-tga:*.tga +50:audio/prs.sid:*.sid +50:application/x-trash:*.sik +50:application/x-spss-por:*.por +50:application/x-wii-wad:*.wad +50:application/vnd.ms-powerpoint:*.pot +50:text/x-gettext-translation-template:*.pot +50:image/x-lws:*.lws +50:application/x-zip-compressed-fb2:*.fb2.zip +50:text/vcard:*.vcf +50:application/vnd.symbian.install:*.sis +50:application/x-stuffit:*.sit +50:application/x-e-theme:*.etheme +50:application/sieve:*.siv +50:image/bmp:*.bmp +50:application/x-nes-rom:*.unif +50:image/x-skencil:*.sk1 +50:image/openraster:*.ora +50:text/vcard:*.vct +50:application/x-compressed-tar:*.tgz +50:application/x-netshow-channel:*.nsc +50:audio/x-wav:*.wav +50:image/x-olympus-orf:*.orf +50:audio/x-ms-asx:*.wax +50:audio/x-ape:*.ape +50:image/x-lwo:*.lwob +50:text/calendar:*.vcs +50:image/rle:*.rle +50:application/x-siag:*.siag +50:application/vnd.android.package-archive:*.apk +50:image/x-portable-pixmap:*.ppm +50:application/x-lz4:*.lz4 +50:image/x-applix-graphics:*.ag +50:application/illustrator:*.ai +50:application/vnd.ms-powerpoint:*.pps +50:application/vnd.ms-powerpoint:*.ppt +50:application/vnd.ms-powerpoint:*.ppt +50:video/x-nsv:*.nsv +50:application/x-perl:*.al +50:image/x-tga:*.vda +50:text/x-tex:*.cls +50:application/x-archive:*.ar +50:application/vnd.ms-powerpoint:*.ppz +50:application/x-applix-spreadsheet:*.as +50:application/vnd.tcpdump.pcap:*.pcap +50:audio/basic:*.au +50:application/x-applix-word:*.aw +50:image/vnd.djvu:*.djv +50:application/vnd.palm:*.pqa +50:application/xslt+xml:*.xslt +50:application/x-bittorrent:*.torrent +50:image/x-bzeps:*.epsi.bz2 +50:video/quicktime:*.qtvr +50:text/x-mup:*.mup +50:application/x-t602:*.602 +50:application/vnd.rn-realmedia:*.rmj +50:image/tiff:*.tif +50:application/x-lyx:*.lyx +50:application/x-gedcom:*.ged +50:application/vnd.rn-realmedia:*.rmm +50:application/x-gnucash:*.xac +50:text/x-eiffel:*.eif +50:application/x-sv4cpio:*.sv4cpio +50:application/vnd.rn-realmedia:*.rms +50:application/pgp-keys:*.skr +50:application/x-tar:*.gem +50:application/x-genesis-rom:*.gen +50:application/vnd.ms-works:*.wcm +50:application/x-yaml:*.yaml +50:application/vnd.ms-word.template.macroEnabled.12:*.dotm +50:application/vnd.ms-word.template.macroenabled.12:*.dotm +50:application/x-lha:*.lzh +50:application/mxf:*.mxf +50:application/vnd.oasis.opendocument.chart-template:*.otc +50:application/x-mobipocket-ebook:*.prc +50:application/vnd.palm:*.prc +50:application/vnd.oasis.opendocument.formula-template:*.otf +50:application/x-font-otf:*.otf +50:application/vnd.oasis.opendocument.graphics-template:*.otg +50:application/vnd.oasis.opendocument.graphics-template:*.otg +50:application/vnd.oasis.opendocument.text-web:*.oth +50:application/vnd.oasis.opendocument.text-web:*.oth +50:application/relax-ng-compact-syntax:*.rnc +50:application/x-lzop:*.lzo +50:text/x-makefile:gnumakefile +50:application/x-bzip:*.bz +50:application/x-arj:*.arj +50:application/x-spss-sav:*.zsav +50:text/x-c++src:*.cc +50:application/vnd.oasis.opendocument.presentation-template:*.otp +50:application/vnd.oasis.opendocument.presentation-template:*.otp +50:image/fits:*.fits +50:application/vnd.ms-works:*.wdb +50:application/vnd.oasis.opendocument.spreadsheet-template:*.ots +50:application/vnd.oasis.opendocument.spreadsheet-template:*.ots +50:application/vnd.oasis.opendocument.text-template:*.ott +50:application/vnd.oasis.opendocument.text-template:*.ott +50:application/x-partial-download:*.crdownload +50:application/x-tzo:*.tar.lzo +50:application/x-hdf:*.hdf +50:application/x-tarz:*.tar.z +50:application/vnd.rn-realmedia:*.rmx +50:image/x-sony-arw:*.arw +50:image/svg+xml-compressed:*.svgz +50:text/x-csharp:*.cs +50:text/spreadsheet:*.slk +50:image/x-icns:*.icns +50:image/x-xbitmap:*.xbm +50:video/vnd.mpegurl:*.mxu +50:application/xml:*.xbl +50:application/xml:*.rng +50:application/x-pagemaker:*.p65 +50:text/x-opml+xml:*.opml +50:text/plain:*.asc +50:image/vnd.adobe.photoshop:*.psd +50:application/x-font-linux-psf:*.psf +50:audio/x-psf:*.psf +50:text/x-cobol:*.cob +50:application/vnd.ms-asf:*.asf +50:application/vnd.nintendo.snes.rom:*.smc +50:application/vnd.stardivision.mail:*.smd +50:application/x-genesis-rom:*.smd +50:application/x-dc-rom:*.dc +50:application/vnd.stardivision.math:*.smf +50:application/x-apple-diskimage:*.dmg +50:application/smil+xml:*.smi +50:application/x-sami:*.smi +50:text/x-dsrc:*.di +50:application/x-asp:*.asp +50:application/x-gedcom:*.gedcom +50:application/smil+xml:*.sml +50:text/x-ssa:*.ass +50:image/x-xfig:*.fig +50:image/x-tga:*.icb +50:application/vnd.tcpdump.pcap:*.dmp +50:application/x-pocket-word:*.psw +50:application/x-sms-rom:*.sms +50:audio/x-ms-asx:*.asx +50:image/x-xcf:*.xcf +50:text/vnd.sun.j2me.app-descriptor:*.jad +50:video/dv:*.dv +50:application/vnd.openxmlformats-officedocument.wordprocessingml.template:*.dotx +50:application/vnd.openxmlformats-officedocument.wordprocessingml.template:*.dotx +50:image/vnd.microsoft.icon:*.ico +50:application/x-ica:*.ica +50:application/vnd.iccprofile:*.icc +50:text/calendar:*.ics +50:application/x-java-archive:*.jar +50:application/x-gnumeric:*.gnumeric +50:application/vnd.iccprofile:*.icm +50:application/x-sv4crc:*.sv4crc +50:audio/basic:*.snd +50:application/x-lzma:*.lzma +50:application/x-x509-ca-cert:*.cert +50:image/x-adobe-dng:*.dng +50:video/mp2t:*.cpi +50:text/x-vhdl:*.vhd +50:application/x-rpm:*.rpm +50:application/x-bzpostscript:*.ps.bz2 +50:text/x-emacs-lisp:*.el +50:application/xspf+xml:*.xspf +50:text/x-c++src:*.cpp +50:application/vnd.oasis.opendocument.text-master-template:*.otm +50:image/x-canon-cr2:*.cr2 +50:application/x-gnuplot:*.gnuplot +50:application/ecmascript:*.es +50:image/fax-g3:*.g3 +50:text/x-idl:*.idl +50:application/x-pkcs7-certificates:*.p7b +50:application/pkcs7-mime:*.p7c +50:application/andrew-inset:*.ez +50:application/x-desktop:*.kdelnk +50:application/x-lzma-compressed-tar:*.tlz +50:application/vnd.ms-publisher:*.pub +50:text/x-xslfo:*.xslfo +50:application/x-core:core:cs +50:application/x-core:core +50:application/x-trig:*.trig +50:application/pkcs7-mime:*.p7m +50:application/msword:*.doc +50:application/msword:*.doc +50:application/vnd.ms-word:*.doc +50:application/rdf+xml:*.owl +50:text/cache-manifest:*.manifest +50:application/pkcs7-signature:*.p7s +50:image/x-emf:*.emf +50:application/x-fluid:*.fl +50:image/gif:*.gif +50:message/rfc822:*.eml +50:application/owl+xml:*.owx +50:image/ief:*.ief +50:text/x-c++hdr:*.h++ +50:text/x-xslfo:*.fo +50:application/vnd.emusic-emusic_package:*.emp +50:application/msword-template:*.dot +50:text/vnd.graphviz:*.dot +50:application/x-hdf:*.h4 +50:application/x-hdf:*.h5 +50:application/x-nzb:*.nzb +50:text/x-uil:*.uil +50:video/vnd.vivo:*.viv +50:application/vnd.debian.binary-package:*.udeb +50:audio/midi:*.kar +50:video/x-msvideo:*.avf +50:text/csv-schema:*.csvs +50:application/x-pkcs7-certificates:*.spc +50:application/x-font-speedo:*.spd +50:application/x-qtiplot:*.qti +50:application/vnd.ms-excel.addin.macroEnabled.12:*.xlam +50:application/x-tex-gf:*.gf +50:application/vnd.ms-tnef:*.tnf +50:application/x-quicktime-media-link:*.qtl +50:text/x-patch:*.diff +50:application/pkix-crl:*.crl +50:application/vnd.openofficeorg.extension:*.oxt +50:application/vnd.openofficeorg.extension:*.oxt +50:application/x-source-rpm:*.spm +50:application/x-sms-rom:*.gg +50:application/vnd.adobe.flash.movie:*.spl +50:application/x-bzdvi:*.dvi.bz2 +50:application/x-gnuplot:*.gp +50:application/x-gameboy-rom:*.gb +50:application/x-x509-ca-cert:*.crt +50:image/x-sony-sr2:*.sr2 +50:application/x-gz-font-linux-psf:*.psf.gz +50:image/x-canon-crw:*.crw +50:image/x-ilbm:*.iff +50:audio/x-speex:*.spx +50:audio/x-mod:*.ult +50:audio/x-mod:*.669 +50:video/x-flv:*.flv +50:application/x-kivio:*.flw +50:text/vnd.graphviz:*.gv +50:application/gzip:*.gz +50:application/pkix-pkipath:*.pkipath +50:application/vnd.palm:*.oprc +50:audio/AMR-WB:*.awb +50:text/x-genie:*.gs:cs +50:text/x-genie:*.gs +50:video/x-flic:*.flc +50:text/x-go:*.go +50:application/x-cdrdao-toc:*.toc +50:application/x-awk:*.awk +50:application/x-csh:*.csh +50:audio/x-s3m:*.s3m +50:text/x-c++hdr:*.hh +50:application/xml-external-parsed-entity:*.ent +50:application/sql:*.sql +50:image/x-gzeps:*.eps.gz +50:text/x-texinfo:*.texinfo +50:video/x-msvideo:*.avi +50:application/rss+xml:*.rss +50:application/x-ufraw:*.ufraw +50:text/css:*.css +50:text/x-c++hdr:*.hp +50:application/x-ms-wim:*.wim +50:text/csv:*.csv +50:text/x-haskell:*.hs +50:application/x-mobipocket-ebook:*.mobi +50:application/vnd.lotus-1-2-3:*.wk1 +50:audio/annodex:*.axa +50:application/vnd.lotus-1-2-3:*.wk3 +50:application/vnd.lotus-1-2-3:*.wk4 +50:application/x-wais-source:*.src +50:application/rtf:*.rtf +50:image/x-sony-srf:*.srf +50:image/x-ilbm:*.ilbm +50:audio/x-mpegurl:*.vlc +50:application/x-nes-rom:*.unf +50:application/x-smaf:*.smaf +50:audio/x-mod:*.uni +50:video/x-flic:*.fli +50:text/sgml:*.sgml +50:video/annodex:*.axv +50:image/x-kodak-kdc:*.kdc +50:text/x-txt2tags:*.t2t +50:application/x-subrip:*.srt +50:audio/x-it:*.it +50:image/x-eps:*.eps +50:application/x-gzpdf:*.pdf.gz +50:image/x-eps:*.epsf +50:text/richtext:*.rtx +50:image/x-eps:*.epsi +50:application/x-java-jce-keystore:*.jceks +50:application/x-python-bytecode:*.pyc +50:image/x-ilbm:*.lbm +50:video/vnd.vivo:*.vivo +50:text/x-ssa:*.ssa +50:application/x-cue:*.cue +50:audio/vnd.dts.hd:*.dtshd +50:application/x-python-bytecode:*.pyo +50:application/x-windows-themepack:*.themepack +50:video/x-sgi-movie:*.movie +50:text/x-cmake:*.cmake +50:text/x-dsl:*.dsl +50:application/x-trash:*% +50:application/vnd.ms-powerpoint.slide.macroEnabled.12:*.sldm +50:image/x-panasonic-raw2:*.rw2 +50:application/gml+xml:*.gml +50:application/javascript:*.js +50:application/x-markaby:*.mab +50:application/x-gettext-translation:*.gmo +50:image/x-win-bitmap:*.cur +50:text/x-fortran:*.for +50:application/vnd.lotus-1-2-3:*.wks +50:application/vnd.ms-works:*.wks +50:text/x-python:*.pyx +50:application/vnd.openxmlformats-officedocument.presentationml.slide:*.sldx +50:text/x-makefile:*.mak +50:application/x-troff-man:*.man +50:message/x-gnu-rmail:rmail +50:application/vnd.sun.xml.calc.template:*.stc +50:application/vnd.sun.xml.calc.template:*.stc +50:application/vnd.sun.xml.draw.template:*.std +50:application/vnd.sun.xml.draw.template:*.std +50:application/xml-dtd:*.dtd +50:application/x-iwork-keynote-sffkey:*.key +50:application/vnd.sun.xml.impress.template:*.sti +50:application/vnd.sun.xml.impress.template:*.sti +50:application/x-gnucash:*.gnc +50:application/x-abiword:*.abw.crashed +50:application/x-kchart:*.chrt +50:audio/prs.sid:*.psid +50:application/gnunet-directory:*.gnd +50:audio/ogg:*.opus +50:audio/x-opus+ogg:*.opus +50:audio/x-stm:*.stm +50:application/x-bzip:*.bz2 +50:text/x-erlang:*.erl +50:application/epub+zip:*.epub +50:application/x-java-keystore:*.ks +50:video/vnd.rn-realvideo:*.rvx +50:application/x-m4:*.m4 +50:application/vnd.sun.xml.writer.template:*.stw +50:application/vnd.sun.xml.writer.template:*.stw +50:text/x-tex:*.sty +50:audio/vnd.dts:*.dts +50:application/json:*.json +50:text/x-tex:*.dtx +50:application/x-kformula:*.kfo +50:application/json-patch+json:*.json-patch +50:application/x-bzip-compressed-tar:*.tar.bz2 +50:application/x-java:*.class +50:application/x-shared-library-la:*.la +50:text/x-microdvd:*.sub +50:text/x-mpsub:*.sub +50:text/x-subviewer:*.sub +50:application/font-woff:*.woff +50:image/x-macpaint:*.pntg +50:application/winhlp:*.hlp +50:image/tiff:*.tiff +50:audio/x-ms-wma:*.wma +50:text/x-qml:*.qmlproject +50:video/mpeg:*.vob +50:application/vnd.ms-visio.drawing.macroEnabled.main+xml:*.vsdm +50:text/troff:*.roff +50:image/x-sun-raster:*.sun +50:audio/x-voc:*.voc +50:image/x-wmf:*.wmf +50:text/x-scons:sconscript +50:application/x-tar:*.gtar +50:text/vnd.wap.wml:*.wml +50:application/x-par2:*.par2 +50:application/x-par2:*.par2 +50:application/x-cpio-compressed:*.cpio.gz +50:application/vnd.ms-visio.drawing.main+xml:*.vsdx +50:application/vnd.stardivision.writer:*.vor +50:image/x-compressed-xcf:*.xcf.gz +50:text/x-lilypond:*.ly +50:application/x-lzip:*.lz +50:audio/x-psflib:*.psflib +50:video/x-ms-wmv:*.wmv +50:audio/x-ms-asx:*.wmx +50:application/x-it87:*.it87 +50:text/tab-separated-values:*.tsv +50:audio/mp4:*.f4a +50:audio/x-m4b:*.f4b +50:audio/x-tta:*.tta +50:application/x-trash:*~ +50:application/x-font-ttf:*.ttc +50:image/svg+xml:*.svg +50:application/x-kexi-connectiondata:*.kexic +50:application/x-font-ttf:*.ttf +50:application/x-dvi:*.dvi +50:application/vnd.ms-excel:*.xla +50:text/x-java:*.java +50:application/vnd.ms-excel:*.xlc +50:application/vnd.ms-excel:*.xld +50:application/pgp-encrypted:*.gpg +50:application/pgp-keys:*.gpg +50:application/pgp-signature:*.gpg +50:application/x-xliff:*.xlf +50:application/x-gettext-translation:*.mo +50:text/x-modelica:*.mo +50:text/x-svhdr:*.svh +50:application/x-mswinurl:*.url +50:image/x-gzeps:*.epsi.gz +50:application/vnd.ms-access:*.mdb +50:application/vnd.ms-excel:*.xll +50:application/vnd.ms-excel:*.xlm +50:application/vnd.ms-tnef:winmail.dat +50:application/x-kexiproject-shortcut:*.kexis +50:application/x-font-ttx:*.ttx +50:application/x-raw-disk-image:*.raw-disk-image +50:application/vnd.ms-works:*.xlr +50:application/vnd.ms-excel:*.xls +50:application/vnd.ms-excel:*.xls +50:application/vnd.wordperfect:*.wp4 +50:application/vnd.wordperfect:*.wp5 +50:application/vnd.wordperfect:*.wp6 +50:application/vnd.ms-excel:*.xlt +50:application/vnd.ms-excel:*.xlw +50:text/turtle:*.ttl +50:application/mathematica:*.nb +50:application/x-netcdf:*.nc +50:video/mp4:*.f4v +50:application/vnd.adobe.flash.movie:*.swf +50:text/x-makefile:*.mk +50:image/vnd.dwg:*.dwg +50:text/x-setext:*.etx +50:application/x-genesis-rom:*.mdx +50:application/vnd.ms-powerpoint.template.macroEnabled.12:*.potm +50:application/vnd.ms-powerpoint.template.macroenabled.12:*.potm +50:application/x-xz-compressed-tar:*.tar.xz +50:application/x-ms-wim:*.swm +50:video/mpeg:*.mpeg +50:text/x-credits:credits +50:text/x-iMelody:*.ime +50:audio/x-xmf:*.xmf +50:application/x-raw-disk-image:*.img +50:text/x-xmi:*.xmi +50:text/spreadsheet:*.sylk +50:application/x-partial-download:*.part +50:application/xml:*.xml +50:audio/x-mod:*.med +50:text/vnd.wap.wmlscript:*.wmls +50:image/x-bzeps:*.epsf.bz2 +50:application/x-killustrator:*.kil +50:application/pkcs8:*.p8 +50:application/zip:*.zip +50:image/vnd.ms-modi:*.mdi +50:application/x-java-keystore:*.jks +50:text/x-c++src:*.cxx +50:text/x-iMelody:*.imy +50:application/vnd.sun.xml.calc:*.sxc +50:application/vnd.sun.xml.calc:*.sxc +50:application/vnd.sun.xml.draw:*.sxd +50:application/vnd.sun.xml.draw:*.sxd +50:application/x-java-keystore:cacerts +50:application/vnd.sun.xml.writer.global:*.sxg +50:application/vnd.sun.xml.writer.global:*.sxg +50:application/x-graphite:*.gra +50:application/vnd.sun.xml.impress:*.sxi +50:application/vnd.sun.xml.impress:*.sxi +50:video/x-matroska-3d:*.mk3d +50:application/vnd.wordperfect:*.wpd +50:application/vnd.sun.xml.math:*.sxm +50:application/vnd.sun.xml.math:*.sxm +50:application/vnd.ms-powerpoint.slideshow.macroEnabled.12:*.ppsm +50:application/x-wpg:*.wpg +50:application/x-gnuplot:*.gplt +50:image/vnd.dxf:*.dxf +50:application/x-lha:*.lha +50:model/vrml:*.vrm +50:application/vnd.ms-wpl:*.wpl +50:audio/mpeg:*.mpga +50:application/vnd.sun.xml.writer:*.sxw +50:application/vnd.sun.xml.writer:*.sxw +50:application/vnd.wordperfect:*.wpp +50:application/x-n64-rom:*.v64 +50:text/x-c++hdr:*.hpp +50:application/vnd.ms-works:*.wps +50:text/plain:*,v +50:text/markdown:*.md +50:text/x-tex:*.ins +50:text/x-troff-ms:*.ms +50:application/x-tgif:*.obj +50:text/x-c++src:*.C:cs +50:text/x-c++src:*.C +50:text/x-literate-haskell:*.lhs +50:image/x-pict:*.pict +50:text/x-ocaml:*.ml +50:text/x-troff-mm:*.mm +50:application/x-nintendo-ds-rom:*.nds +50:application/x-bzip-compressed-tar:*.tbz2 +50:text/x-qml:*.qmltypes +50:application/x-lhz:*.lhz +50:application/vnd.visio:*.vsd +50:application/x-tex-pk:*.pk +50:application/x-font-type1:*.gsf +50:application/x-perl:*.pl +50:application/x-perl:*.pl +50:application/x-perl:*.pm +50:application/x-pagemaker:*.pm +50:application/vnd.ms-powerpoint.presentation.macroEnabled.12:*.pptm +50:application/vnd.ms-powerpoint.presentation.macroenabled.12:*.pptm +50:text/x-gettext-translation:*.po +50:application/vnd.hp-hpgl:*.hpgl +50:audio/x-gsm:*.gsm +50:application/postscript:*.ps +50:text/x-fortran:*.f90 +50:application/vnd.ms-word.document.macroEnabled.12:*.docm +50:application/vnd.ms-word.document.macroenabled.12:*.docm +50:application/x-yaml:*.yml +50:application/vnd.visio:*.vss +50:application/vnd.visio:*.vst +50:image/x-tga:*.vst +50:application/x-karbon:*.karbon +50:image/x-nikon-nef:*.nef +50:application/vnd.visio:*.vsw +50:application/x-archive:*.a +50:audio/aac:*.aac +50:text/x-csrc:*.c:cs +50:text/x-csrc:*.c +50:application/x-pw:*.pw +50:application/x-magicpoint:*.mgp +50:text/x-ocl:*.ocl +50:application/x-pak:*.pak +50:text/x-chdr:*.h +50:text/x-dsrc:*.d +50:application/x-nes-rom:*.nes +50:application/x-ms-dos-executable:*.exe +50:text/x-objcsrc:*.m +50:text/x-matlab:*.m +50:text/x-troff-me:*.me +50:application/x-object:*.o +50:text/x-fortran:*.f +50:text/x-pascal:*.p +50:text/x-pascal:*.pas +50:video/mp2t:*.clpi +10:application/x-perl:*.t +10:text/troff:*.t +10:text/x-readme:readme* +10:application/pgp-encrypted:*.asc +10:application/pgp-keys:*.asc +10:application/pgp-signature:*.asc +10:text/x-makefile:makefile.* -- cgit From 340c1b5cd4376e0a4ff2e7acdb4e4536f734006c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 9 Nov 2016 17:53:33 -0500 Subject: Fix the wallpaper background when a screen resizes. --- src-qt5/core/lumina-desktop/LDesktop.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index 1a11899d..b08251bd 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -474,6 +474,7 @@ void LDesktop::UpdateDesktopPluginArea(){ bgDesktop->setGeometry(desktop->screenGeometry(desktopnumber)); bgDesktop->setDesktopArea( rec ); bgDesktop->UpdateGeom(); //just in case the plugin space itself needs to do anything + QTimer::singleShot(10, this, SLOT(UpdateBackground()) ); //Re-paint the panels (just in case a plugin was underneath it and the panel is transparent) //for(int i=0; iupdate(); } //Make sure to re-disable any WM control flags -- cgit From 8811bc7cdd845ef14eacbc1f4a8bc1512c9fd928 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 10:02:20 -0500 Subject: Due to some erratic reports of the wallpaper widget not staying on the bottom of the window stack within virtualBox environments: on focus in events for the desktop, lower the window to the bottom of the stack manually. --- src-qt5/core/lumina-desktop/LDesktopPluginSpace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h index 12382db8..abc34878 100644 --- a/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h +++ b/src-qt5/core/lumina-desktop/LDesktopPluginSpace.h @@ -188,6 +188,10 @@ private slots: } protected: + void focusInEvent(QFocusEvent *ev){ + this->lower(); //make sure we stay on the bottom of the window stack + QWidget::focusInEvent(ev); //do normal handling + } void paintEvent(QPaintEvent*ev); //Need Drag and Drop functionality (internal movement) -- cgit From 3ccbe4ab221a88c19d50525e5a73c45381ee0bd4 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 10:13:36 -0500 Subject: Tag version 1.1.2 internally (Lumina Library no longer in existence) --- 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 4f8d94ef..2797c8ca 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -15,7 +15,7 @@ static QStringList fav; QString LDesktopUtils::LuminaDesktopVersion(){ - QString ver = "1.1.1"; + QString ver = "1.1.2"; #ifdef GIT_VERSION ver.append( QString(" (Git Revision: %1)").arg(GIT_VERSION) ); #endif -- cgit From 634557bad1b1b6781fe693d37b480897cc55376e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 12:38:56 -0500 Subject: Add pass-through for context menu requests on many desktop plugins. This should allow the user to click almost anywhere on the plugin to actually see the menu for managing the plugin itself. --- .../core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp | 4 +++- src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp | 1 + .../core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp index 4d293b39..722a5865 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/audioplayer/PlayerWidget.cpp @@ -30,6 +30,8 @@ PlayerWidget::PlayerWidget(QWidget *parent) : QWidget(parent), ui(new Ui::Player ui->tool_add->setMenu(addMenu); updatinglists = false; //start off as false + + ui->combo_playlist->setContextMenuPolicy(Qt::NoContextMenu); LoadIcons(); playerStateChanged(); //update button visibility @@ -266,4 +268,4 @@ AudioPlayerPlugin::AudioPlayerPlugin(QWidget *parent, QString ID) : LDPlugin(par AudioPlayerPlugin::~AudioPlayerPlugin(){ //qDebug() << "Remove AudioPlayerPlugin"; -} \ No newline at end of file +} diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp index a2549acf..fe26941e 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp @@ -60,6 +60,7 @@ NotePadPlugin::NotePadPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID) edit->setReadOnly(false); edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); vlay->addWidget(edit); + edit->setContextMenuPolicy(Qt::NoContextMenu); //Now load the new file-based system for saving notes //qDebug() << "Saving a new setting"; diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp index 8dc58e0a..c330d6c0 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSFeedPlugin.cpp @@ -20,7 +20,7 @@ RSSFeedPlugin::RSSFeedPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID) //Load the global settings setprefix = "rssreader/"; //this structure/prefix should be used for *all* plugins of this type RSS = new RSSReader(this, setprefix); - + ui->text_feed->setContextMenuPolicy(Qt::NoContextMenu); //Create the options menu optionsMenu = new QMenu(this); ui->tool_options->setMenu(optionsMenu); -- cgit From 9553d3929dc5b32c80c23fc426da09ed80c36ed3 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 14:00:16 -0500 Subject: Add a new panel plugin: "audioplayer": This is panel-based implementation of the desktop plugin with the same name. Allows the user to load/play audio files directly from the desktop session without loading any external applications. --- src-qt5/core/lumina-desktop/Globals.h | 15 +++++++++------ src-qt5/core/lumina-desktop/panel-plugins/NewPP.h | 4 ++++ .../core/lumina-desktop/panel-plugins/panel-plugins.pri | 13 +++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/Globals.h b/src-qt5/core/lumina-desktop/Globals.h index 14dfd93f..3df48741 100644 --- a/src-qt5/core/lumina-desktop/Globals.h +++ b/src-qt5/core/lumina-desktop/Globals.h @@ -8,17 +8,20 @@ #define _LUMINA_DESKTOP_GLOBALS_H #include +#include +#include #include -//#include "../global.h" + +#include +#include +#include +#include +#include +#include #include #include -/*#ifdef __linux - // Needed for BUFSIZ - #include -#endif // #ifdef __linux*/ - class Lumina{ public: enum STATES {NONE, VISIBLE, INVISIBLE, ACTIVE, NOTIFICATION, NOSHOW}; diff --git a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h index 2641ad79..e811beeb 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h @@ -26,9 +26,11 @@ #include "appmenu/LAppMenuPlugin.h" #include "applauncher/AppLaunchButton.h" #include "systemstart/LStartButton.h" +#include "audioplayer/LPAudioPlayer.h" //#include "quickcontainer/QuickPPlugin.h" #include "systemtray/LSysTray.h" //must be last due to X11 compile issues + class NewPP{ public: static LPPlugin* createPlugin(QString plugin, QWidget* parent = 0, bool horizontal = true){ @@ -60,6 +62,8 @@ public: plug = new LAppMenuPlugin(parent, plugin, horizontal); }else if(plugin.startsWith("systemstart---")){ plug = new LStartButtonPlugin(parent, plugin, horizontal); + }else if(plugin.startsWith("audioplayer---")){ + plug = new LPAudioPlayer(parent, plugin, horizontal); }else if(plugin.section("---",0,0).section("::",0,0)=="applauncher"){ plug = new AppLaunchButtonPlugin(parent, plugin, horizontal); //}else if( plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri index afa7dbe2..284d1700 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri +++ b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri @@ -18,7 +18,9 @@ SOURCES += $$PWD/userbutton/LUserButton.cpp \ $$PWD/applauncher/AppLaunchButton.cpp \ $$PWD/systemstart/LStartButton.cpp \ $$PWD/systemstart/StartMenu.cpp \ - $$PWD/systemstart/ItemWidget.cpp + $$PWD/systemstart/ItemWidget.cpp \ + $$PWD/audioplayer/LPAudioPlayer.cpp \ + $$PWD/audioplayer/PPlayerWidget.cpp HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/userbutton/UserWidget.h \ @@ -40,10 +42,13 @@ HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/applauncher/AppLaunchButton.h \ $$PWD/systemstart/LStartButton.h \ $$PWD/systemstart/StartMenu.h \ - $$PWD/systemstart/ItemWidget.h + $$PWD/systemstart/ItemWidget.h \ + $$PWD/audioplayer/LPAudioPlayer.h \ + $$PWD/audioplayer/PPlayerWidget.h # $$PWD/quickcontainer/QuickPPlugin.h FORMS += $$PWD/userbutton/UserWidget.ui \ $$PWD/systemdashboard/SysMenuQuick.ui \ - $$PWD/systemstart/StartMenu.ui - \ No newline at end of file + $$PWD/systemstart/StartMenu.ui \ + $$PWD/audioplayer/PPlayerWidget.ui + -- cgit From d38116c2f2140f1815aefa847b6644e6d8ef2046 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 10 Nov 2016 14:02:35 -0500 Subject: Clean up some more of the library project files. --- src-qt5/core/libLumina/ResizeMenu.pri | 4 +-- src-qt5/core/libLumina/libLumina.pro | 68 ----------------------------------- 2 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 src-qt5/core/libLumina/libLumina.pro (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/ResizeMenu.pri b/src-qt5/core/libLumina/ResizeMenu.pri index 2b055841..247427f1 100644 --- a/src-qt5/core/libLumina/ResizeMenu.pri +++ b/src-qt5/core/libLumina/ResizeMenu.pri @@ -1,6 +1,6 @@ #Subproject file for bundling the ResizeMenu class into an application -SOURCES += $${PWD}/ResizeMenu.cpp -HEADERS += $${PWD}/ResizeMenu.h +SOURCES *= $${PWD}/ResizeMenu.cpp +HEADERS *= $${PWD}/ResizeMenu.h #Add this dir to the include path # This allows the application to simply use "#include " to use it INCLUDEPATH *= $${PWD} diff --git a/src-qt5/core/libLumina/libLumina.pro b/src-qt5/core/libLumina/libLumina.pro deleted file mode 100644 index a7dc160a..00000000 --- a/src-qt5/core/libLumina/libLumina.pro +++ /dev/null @@ -1,68 +0,0 @@ -#include("$${PWD}/../../OS-detect.pri") - -#QT += core network widgets x11extras multimedia concurrent svg - -#define -#Setup any special defines (qmake -> C++) -#GIT_VERSION=$$system(git describe --always) -#!isEmpty(GIT_VERSION){ -# DEFINES += GIT_VERSION='"\\\"$${GIT_VERSION}\\\""' -#} -#DEFINES += BUILD_DATE='"\\\"$$system(date)\\\""' - -#TARGET=LuminaUtils - -#target.path = $${L_LIBDIR} - -#DESTDIR= $$_PRO_FILE_PWD_/ - -#TEMPLATE = lib -#LANGUAGE = C++ -#VERSION = 1 - -#HEADERS += LuminaXDG.h \ -# LuminaUtils.h \ -# LuminaX11.h \ -# LuminaThemes.h \ -# LuminaOS.h \ -# LuminaSingleApplication.h - -#SOURCES += LuminaXDG.cpp \ -# LuminaUtils.cpp \ -# LuminaX11.cpp \ -# LuminaThemes.cpp \ -# LuminaSingleApplication.cpp - -# Also load the OS template as available for -# LuminaOS support functions (or fall back to generic one) -#exists($${PWD}/LuminaOS-$${LINUX_DISTRO}.cpp){ -# SOURCES += LuminaOS-$${LINUX_DISTRO}.cpp -#}else:exists($${PWD}/LuminaOS-$${OS}.cpp){ -# SOURCES += LuminaOS-$${OS}.cpp -#}else{ -# SOURCES += LuminaOS-template.cpp -#} - -#LIBS += -lc -lxcb -lxcb-ewmh -lxcb-icccm -lxcb-image -lxcb-composite -lxcb-damage -lxcb-util -lXdamage - -#include.path=$${L_INCLUDEDIR} -#include.files=LuminaXDG.h \ -# LuminaUtils.h \ -# LuminaX11.h \ -# LuminaThemes.h \ -# LuminaOS.h \ -# LuminaSingleApplication.h - -colors.path=$${L_SHAREDIR}/lumina-desktop/colors -colors.files=colors/*.qss.colors - -themes.path=$${L_SHAREDIR}/lumina-desktop/themes/ -themes.files=themes/*.qss.template - -#quickplugins.path=$${L_SHAREDIR}/lumina-desktop/quickplugins/ -#quickplugins.files=quickplugins/* - -globs.path=$${L_SHAREDIR}/lumina-desktop -globs.files=xtrafiles/globs2 - -INSTALLS += colors themes globs -- cgit From 4a73dcc40afd2257588cee0656119dfe985efa3e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 11 Nov 2016 09:14:40 -0500 Subject: Oops - forgot to add some files to the previous commits. --- src-qt5/core/lumina-desktop/Globals.h | 1 + src-qt5/core/lumina-desktop/panel-plugins/NewPP.h | 3 + .../panel-plugins/audioplayer/LPAudioPlayer.cpp | 30 +++ .../panel-plugins/audioplayer/LPAudioPlayer.h | 49 ++++ .../panel-plugins/audioplayer/PPlayerWidget.cpp | 258 +++++++++++++++++++++ .../panel-plugins/audioplayer/PPlayerWidget.h | 59 +++++ .../panel-plugins/audioplayer/PPlayerWidget.ui | 182 +++++++++++++++ .../panel-plugins/jsonmenu/PPJsonMenu.cpp | 35 +++ .../panel-plugins/jsonmenu/PPJsonMenu.h | 42 ++++ .../lumina-desktop/panel-plugins/panel-plugins.pri | 6 +- 10 files changed, 663 insertions(+), 2 deletions(-) create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.cpp create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.h create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.cpp create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.h create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.ui create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.cpp create mode 100644 src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.h (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/Globals.h b/src-qt5/core/lumina-desktop/Globals.h index 3df48741..15e7a4b6 100644 --- a/src-qt5/core/lumina-desktop/Globals.h +++ b/src-qt5/core/lumina-desktop/Globals.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h index e811beeb..3a5f6a5b 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h +++ b/src-qt5/core/lumina-desktop/panel-plugins/NewPP.h @@ -27,6 +27,7 @@ #include "applauncher/AppLaunchButton.h" #include "systemstart/LStartButton.h" #include "audioplayer/LPAudioPlayer.h" +#include "jsonmenu/PPJsonMenu.h" //#include "quickcontainer/QuickPPlugin.h" #include "systemtray/LSysTray.h" //must be last due to X11 compile issues @@ -64,6 +65,8 @@ public: plug = new LStartButtonPlugin(parent, plugin, horizontal); }else if(plugin.startsWith("audioplayer---")){ plug = new LPAudioPlayer(parent, plugin, horizontal); + }else if(plugin.section("::::",0,0)=="jsonmenu" && plugin.split("::::").length()>=3 ){ + plug = new LPJsonMenu(parent, plugin, horizontal); }else if(plugin.section("---",0,0).section("::",0,0)=="applauncher"){ plug = new AppLaunchButtonPlugin(parent, plugin, horizontal); //}else if( plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){ diff --git a/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.cpp b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.cpp new file mode 100644 index 00000000..5669aaf5 --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.cpp @@ -0,0 +1,30 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2014, Susanne Jaeckel +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "LPAudioPlayer.h" +#include "LSession.h" + +LPAudioPlayer::LPAudioPlayer(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal){ + //Setup the button + button = new QToolButton(this); + button->setAutoRaise(true); + button->setToolButtonStyle(Qt::ToolButtonIconOnly); + button->setPopupMode(QToolButton::InstantPopup); //make sure it runs the update routine first + //connect(button, SIGNAL(clicked()), this, SLOT(openMenu())); + this->layout()->setContentsMargins(0,0,0,0); + this->layout()->addWidget(button); + wact = new QWidgetAction(this); + aplayer = new PPlayerWidget(this); + button ->setMenu(new QMenu(this) ); + wact->setDefaultWidget(aplayer); + button->menu()->addAction(wact); + //Now start up the widgets + button->setIcon( LXDG::findIcon("audio-volume-high","") ); + QTimer::singleShot(0,this,SLOT(OrientationChange()) ); //update the sizing/icon +} + +LPAudioPlayer::~LPAudioPlayer(){ +} diff --git a/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.h b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.h new file mode 100644 index 00000000..e5132b1f --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/LPAudioPlayer.h @@ -0,0 +1,49 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_PANEL_AUDIO_PLAYER_PLUGIN_H +#define _LUMINA_PANEL_AUDIO_PLAYER_PLUGIN_H + +#include "../../Globals.h" +#include "../LTBWidget.h" +#include "../LPPlugin.h" +#include "PPlayerWidget.h" + +class LPAudioPlayer : public LPPlugin{ + Q_OBJECT +public: + LPAudioPlayer(QWidget *parent = 0, QString id = "audioplayer", bool horizontal=true); + ~LPAudioPlayer(); + +private: + QToolButton *button; + QWidgetAction *wact; + PPlayerWidget *aplayer; + + //int iconOld; + +private slots: + //void updateBattery(bool force = false); + //QString getRemainingTime(); + +public slots: + void LocaleChange(){ + //updateBattery(true); + } + + void OrientationChange(){ + if(this->layout()->direction()==QBoxLayout::LeftToRight){ + this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + button->setIconSize( QSize(this->height(), this->height()) ); + }else{ + this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + button->setIconSize( QSize(this->width(), this->width()) ); + } + this->layout()->update(); + } +}; + +#endif diff --git a/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.cpp b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.cpp new file mode 100644 index 00000000..023e20c7 --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.cpp @@ -0,0 +1,258 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "PPlayerWidget.h" +#include "ui_PPlayerWidget.h" + +#include +#include +#include +#include +#include +#include +#include + +PPlayerWidget::PPlayerWidget(QWidget *parent) : QWidget(parent), ui(new Ui::PPlayerWidget()){ + ui->setupUi(this); //load the designer form + PLAYER = new QMediaPlayer(this); + PLAYER->setVolume(100); + PLAYER->setNotifyInterval(1000); //1 second interval (just needs to be a rough estimate) + PLAYLIST = new QMediaPlaylist(this); + PLAYLIST->setPlaybackMode(QMediaPlaylist::Sequential); + PLAYER->setPlaylist(PLAYLIST); + + configMenu = new QMenu(this); + ui->tool_config->setMenu(configMenu); + addMenu = new QMenu(this); + ui->tool_add->setMenu(addMenu); + + updatinglists = false; //start off as false + + ui->combo_playlist->setContextMenuPolicy(Qt::NoContextMenu); + + LoadIcons(); + playerStateChanged(); //update button visibility + currentSongChanged(); + //Connect all the signals/slots + //connect(infoTimer, SIGNAL(timeout()), this, SLOT(rotateTrackInfo()) ); + connect(PLAYER, SIGNAL(positionChanged(qint64)),this, SLOT(updateProgress(qint64)) ); + connect(PLAYER, SIGNAL(durationChanged(qint64)), this, SLOT(updateMaxProgress(qint64)) ); + connect(PLAYLIST, SIGNAL(mediaChanged(int, int)), this, SLOT(playlistChanged()) ); + connect(PLAYER, SIGNAL(stateChanged(QMediaPlayer::State)), this, SLOT(playerStateChanged()) ); + connect(PLAYLIST, SIGNAL(currentMediaChanged(const QMediaContent&)), this, SLOT(currentSongChanged()) ); + connect(ui->combo_playlist, SIGNAL(currentIndexChanged(int)), this, SLOT(userlistSelectionChanged()) ); + connect(ui->tool_play, SIGNAL(clicked()), this, SLOT(playClicked()) ); + connect(ui->tool_pause, SIGNAL(clicked()), this, SLOT(pauseClicked()) ); + connect(ui->tool_stop, SIGNAL(clicked()), this, SLOT(stopClicked()) ); + connect(ui->tool_next, SIGNAL(clicked()), this, SLOT(nextClicked()) ); + connect(ui->tool_prev, SIGNAL(clicked()), this, SLOT(prevClicked()) ); + +} + +PPlayerWidget::~PPlayerWidget(){ + //qDebug() << "Removing PPlayerWidget"; +} + +void PPlayerWidget::LoadIcons(){ + ui->tool_stop->setIcon( LXDG::findIcon("media-playback-stop","") ); + ui->tool_play->setIcon( LXDG::findIcon("media-playback-start","") ); + ui->tool_pause->setIcon( LXDG::findIcon("media-playback-pause","") ); + ui->tool_next->setIcon( LXDG::findIcon("media-skip-forward","") ); + ui->tool_prev->setIcon( LXDG::findIcon("media-skip-backward","") ); + ui->tool_add->setIcon( LXDG::findIcon("list-add","") ); + ui->tool_config->setIcon( LXDG::findIcon("configure","") ); + //Now re-assemble the menus as well + configMenu->clear(); + configMenu->addAction(LXDG::findIcon("media-eject",""), tr("Clear Playlist"), this, SLOT(ClearPlaylist())); + configMenu->addAction(LXDG::findIcon("roll",""), tr("Shuffle Playlist"), this, SLOT(ShufflePlaylist())); + addMenu->clear(); + addMenu->addAction(LXDG::findIcon("document-new",""), tr("Add Files"), this, SLOT(AddFilesToPlaylist())); + addMenu->addAction(LXDG::findIcon("folder-new",""), tr("Add Directory"), this, SLOT(AddDirToPlaylist())); + addMenu->addAction(LXDG::findIcon("download",""), tr("Add URL"), this, SLOT(AddURLToPlaylist())); +} + +void PPlayerWidget::playClicked(){ + PLAYER->play(); +} + +void PPlayerWidget::pauseClicked(){ + PLAYER->pause(); +} + +void PPlayerWidget::stopClicked(){ + PLAYER->stop(); +} + +void PPlayerWidget::nextClicked(){ + PLAYLIST->next(); +} + +void PPlayerWidget::prevClicked(){ + PLAYLIST->previous(); +} + +void PPlayerWidget::AddFilesToPlaylist(){ + //Prompt the user to select multimedia files + QFileDialog dlg(0, Qt::Dialog | Qt::WindowStaysOnTopHint ); + dlg.setFileMode(QFileDialog::ExistingFiles); + dlg.setAcceptMode(QFileDialog::AcceptOpen); + dlg.setNameFilter( tr("Multimedia Files")+" ("+LXDG::findAVFileExtensions().join(" ")+")"); + dlg.setWindowTitle(tr("Select Multimedia Files")); + dlg.setWindowIcon( LXDG::findIcon("file-open","") ); + dlg.setDirectory(QDir::homePath()); //start in the home directory + //ensure it is centered on the current screen + QPoint center = QApplication::desktop()->screenGeometry(this).center(); + dlg.move( center.x()-(dlg.width()/2), center.y()-(dlg.height()/2) ); + dlg.show(); + while( dlg.isVisible() ){ + QApplication::processEvents(); + } + QList files = dlg.selectedUrls(); + if(files.isEmpty() || dlg.result()!=QDialog::Accepted){ return; } //cancelled + //Make this use show/processEvents later + //QList files = QFileDialog::getOpenFileUrls(0, tr("Select Multimedia Files"), QDir::homePath(), "Multimedia Files ("+LXDG::findAVFileExtensions().join(" ")+")"); + QList urls; + for(int i=0; iaddMedia(urls); + playlistChanged(); +} + +void PPlayerWidget::AddDirToPlaylist(){ + QFileDialog dlg(0, Qt::Dialog | Qt::WindowStaysOnTopHint ); + dlg.setFileMode(QFileDialog::Directory); + dlg.setOption(QFileDialog::ShowDirsOnly, true); + dlg.setAcceptMode(QFileDialog::AcceptOpen); + dlg.setWindowTitle(tr("Select Multimedia Directory")); + dlg.setWindowIcon( LXDG::findIcon("folder-open","") ); + dlg.setDirectory(QDir::homePath()); //start in the home directory + //ensure it is centered on the current screen + QPoint center = QApplication::desktop()->screenGeometry(this).center(); + dlg.move( center.x()-(dlg.width()/2), center.y()-(dlg.height()/2) ); + dlg.show(); + while( dlg.isVisible() ){ + QApplication::processEvents(); + } + if(dlg.result() != QDialog::Accepted){ return; } //cancelled + QStringList sel = dlg.selectedFiles(); + if(sel.isEmpty()){ return; } //cancelled + QString dirpath = sel.first(); //QFileDialog::getExistingDirectory(0, tr("Select a Multimedia Directory"), QDir::homePath() ); + if(dirpath.isEmpty()){ return; } //cancelled + QDir dir(dirpath); + QFileInfoList files = dir.entryInfoList(LXDG::findAVFileExtensions(), QDir::Files | QDir::NoDotAndDotDot, QDir::Name); + if(files.isEmpty()){ return; } //nothing in this directory + QList urls; + for(int i=0; iaddMedia(urls); + playlistChanged(); +} + +void PPlayerWidget::AddURLToPlaylist(){ + QInputDialog dlg(0, Qt::Dialog | Qt::WindowStaysOnTopHint ); + dlg.setInputMode(QInputDialog::TextInput); + dlg.setLabelText(tr("Enter a valid URL for a multimedia file or stream:")); + dlg.setTextEchoMode(QLineEdit::Normal); + dlg.setWindowTitle(tr("Multimedia URL")); + dlg.setWindowIcon( LXDG::findIcon("download","") ); + //ensure it is centered on the current screen + QPoint center = QApplication::desktop()->screenGeometry(this).center(); + dlg.move( center.x()-(dlg.width()/2), center.y()-(dlg.height()/2) ); + dlg.show(); + while( dlg.isVisible() ){ + QApplication::processEvents(); + } + QString url = dlg.textValue(); + if(url.isEmpty() || dlg.result()!=QDialog::Accepted){ return; } //cancelled + + //QString url = QInputDialog::getText(0, tr("Multimedia URL"), tr("Enter a valid URL for a multimedia file or stream"), QLineEdit::Normal); + //if(url.isEmpty()){ return; } + QUrl newurl(url); + if(!newurl.isValid()){ return; } //invalid URL + PLAYLIST->addMedia(newurl); + playlistChanged(); +} + +void PPlayerWidget::ClearPlaylist(){ + PLAYER->stop(); + PLAYLIST->clear(); + playlistChanged(); +} + +void PPlayerWidget::ShufflePlaylist(){ + PLAYLIST->shuffle(); +} + + +void PPlayerWidget::userlistSelectionChanged(){ //front-end combobox was changed by the user + if(updatinglists){ return; } + PLAYLIST->setCurrentIndex( ui->combo_playlist->currentIndex() ); +} + +void PPlayerWidget::playerStateChanged(){ + switch( PLAYER->state() ){ + case QMediaPlayer::StoppedState: + ui->tool_stop->setVisible(false); + ui->tool_play->setVisible(true); + ui->tool_pause->setVisible(false); + ui->progressBar->setVisible(false); + break; + case QMediaPlayer::PausedState: + ui->tool_stop->setVisible(true); + ui->tool_play->setVisible(true); + ui->tool_pause->setVisible(false); + ui->progressBar->setVisible(true); + break; + case QMediaPlayer::PlayingState: + ui->tool_stop->setVisible(true); + ui->tool_play->setVisible(false); + ui->tool_pause->setVisible(true); + ui->progressBar->setVisible(true); + break; + } + +} + +void PPlayerWidget::playlistChanged(){ + updatinglists = true; + ui->combo_playlist->clear(); + for(int i=0; imediaCount(); i++){ + QUrl url = PLAYLIST->media(i).canonicalUrl(); + if(url.isLocalFile()){ + ui->combo_playlist->addItem(LXDG::findMimeIcon(url.fileName().section(".",-1)), url.fileName() ); + }else{ + ui->combo_playlist->addItem(LXDG::findIcon("download",""), url.toString() ); + } + } + if(PLAYLIST->currentIndex()<0 && PLAYLIST->mediaCount()>0){ PLAYLIST->setCurrentIndex(0); } + ui->combo_playlist->setCurrentIndex(PLAYLIST->currentIndex()); + + updatinglists = false; +} + +void PPlayerWidget::currentSongChanged(){ + if(PLAYLIST->currentIndex() != ui->combo_playlist->currentIndex()){ + updatinglists = true; + ui->combo_playlist->setCurrentIndex(PLAYLIST->currentIndex()); + updatinglists = false; + } + ui->tool_next->setEnabled( PLAYLIST->nextIndex() >= 0 ); + ui->tool_prev->setEnabled( PLAYLIST->previousIndex() >= 0); + ui->label_num->setText( QString::number( PLAYLIST->currentIndex()+1)+"/"+QString::number(PLAYLIST->mediaCount()) ); + ui->progressBar->setRange(0, PLAYER->duration() ); + ui->progressBar->setValue(0); +} + +void PPlayerWidget::updateProgress(qint64 val){ + //qDebug() << "Update Progress Bar:" << val; + ui->progressBar->setValue(val); +} + +void PPlayerWidget::updateMaxProgress(qint64 val){ + ui->progressBar->setRange(0,val); +} diff --git a/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.h b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.h new file mode 100644 index 00000000..a551d74f --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.h @@ -0,0 +1,59 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2015, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This plugin is a simple audio player on the desktop +//=========================================== +#ifndef _LUMINA_PANEL_PLUGIN_AUDIO_PLAYER_WIDGET_H +#define _LUMINA_PANEL_PLUGIN_AUDIO_PLAYER_WIDGET_H + +#include +#include +#include +#include +#include + + +namespace Ui{ + class PPlayerWidget; +}; + +class PPlayerWidget : public QWidget{ + Q_OBJECT +public: + PPlayerWidget(QWidget *parent = 0); + ~PPlayerWidget(); + +public slots: + void LoadIcons(); + +private: + Ui::PPlayerWidget *ui; + QMediaPlaylist *PLAYLIST; + QMediaPlayer *PLAYER; + QMenu *configMenu, *addMenu; + bool updatinglists; + +private slots: + void playClicked(); + void pauseClicked(); + void stopClicked(); + void nextClicked(); + void prevClicked(); + + void AddFilesToPlaylist(); + void AddDirToPlaylist(); + void AddURLToPlaylist(); + void ClearPlaylist(); + void ShufflePlaylist(); + void userlistSelectionChanged(); //front-end combobox was changed by the user + void playerStateChanged(); + void playlistChanged(); //list of items changed + void currentSongChanged(); + void updateProgress(qint64 val); + void updateMaxProgress(qint64 val); +}; + +#endif diff --git a/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.ui b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.ui new file mode 100644 index 00000000..2d2450be --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/audioplayer/PPlayerWidget.ui @@ -0,0 +1,182 @@ + + + PPlayerWidget + + + + 0 + 0 + 346 + 90 + + + + Form + + + QToolButton::menu-indicator{ image: none; } + + + + 4 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + Config + + + QToolButton::InstantPopup + + + true + + + + + + + Add + + + QToolButton::InstantPopup + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + prev + + + true + + + + + + + 1/10 + + + + + + + next + + + true + + + + + + + + + + + + + + Play + + + true + + + + + + + Pause + + + true + + + + + + + Stop + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 24 + + + false + + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + + diff --git a/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.cpp b/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.cpp new file mode 100644 index 00000000..14880f9b --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.cpp @@ -0,0 +1,35 @@ +//=========================================== +// Lumina Desktop source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "PPJsonMenu.h" +#include "../../JsonMenu.h" + +LPJsonMenu::LPJsonMenu(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal){ + //Setup the button + button = new QToolButton(this); + button->setAutoRaise(true); + button->setToolButtonStyle(Qt::ToolButtonIconOnly); + button->setPopupMode(QToolButton::InstantPopup); //make sure it runs the update routine first + //connect(button, SIGNAL(clicked()), this, SLOT(openMenu())); + this->layout()->setContentsMargins(0,0,0,0); + this->layout()->addWidget(button); + //Parse the id and get the extra information needed for the plugin + QStringList info = id.section("---",0,0).split("::::"); //FORMAT:[ "jsonmenu---",exec,name, icon(optional)] + if(info.length()>=3){ + qDebug() << "Custom JSON Menu Loaded:" << info; + JsonMenu *menu = new JsonMenu(info[1], button); + button->setText(info[2]); + //connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(SystemApplication(QAction*)) ); + if(info.length()>=4){ button->setIcon( LXDG::findIcon(info[3],"run-build") ); } + else{ button->setIcon( LXDG::findIcon("run-build","") ); } + button->setMenu(menu); + } + //Now start up the widgets + QTimer::singleShot(0,this,SLOT(OrientationChange()) ); //update the sizing/icon +} + +LPJsonMenu::~LPJsonMenu(){ +} diff --git a/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.h b/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.h new file mode 100644 index 00000000..d0827fd2 --- /dev/null +++ b/src-qt5/core/lumina-desktop/panel-plugins/jsonmenu/PPJsonMenu.h @@ -0,0 +1,42 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#ifndef _LUMINA_PANEL_JSON_PLUGIN_H +#define _LUMINA_PANEL_JSON_PLUGIN_H + +#include "../../Globals.h" +#include "../LPPlugin.h" + + +class LPJsonMenu : public LPPlugin{ + Q_OBJECT +public: + LPJsonMenu(QWidget *parent = 0, QString id = "jsonmenu", bool horizontal=true); + ~LPJsonMenu(); + +private: + QToolButton *button; + +private slots: + //void SystemApplication(QAction*); + +public slots: + void LocaleChange(){ + } + + void OrientationChange(){ + if(this->layout()->direction()==QBoxLayout::LeftToRight){ + this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); + button->setIconSize( QSize(this->height(), this->height()) ); + }else{ + this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + button->setIconSize( QSize(this->width(), this->width()) ); + } + this->layout()->update(); + } +}; + +#endif diff --git a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri index 284d1700..9db23968 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri +++ b/src-qt5/core/lumina-desktop/panel-plugins/panel-plugins.pri @@ -20,7 +20,8 @@ SOURCES += $$PWD/userbutton/LUserButton.cpp \ $$PWD/systemstart/StartMenu.cpp \ $$PWD/systemstart/ItemWidget.cpp \ $$PWD/audioplayer/LPAudioPlayer.cpp \ - $$PWD/audioplayer/PPlayerWidget.cpp + $$PWD/audioplayer/PPlayerWidget.cpp \ + $$PWD/jsonmenu/PPJsonMenu.cpp HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/userbutton/UserWidget.h \ @@ -44,7 +45,8 @@ HEADERS += $$PWD/userbutton/LUserButton.h \ $$PWD/systemstart/StartMenu.h \ $$PWD/systemstart/ItemWidget.h \ $$PWD/audioplayer/LPAudioPlayer.h \ - $$PWD/audioplayer/PPlayerWidget.h + $$PWD/audioplayer/PPlayerWidget.h \ + $$PWD/jsonmenu/PPJsonMenu.h # $$PWD/quickcontainer/QuickPPlugin.h FORMS += $$PWD/userbutton/UserWidget.ui \ -- cgit From 522e8444ec27ff825a33d7447a0011cc8b5749c1 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 11 Nov 2016 17:31:40 -0500 Subject: Fix up the panel autohide routine so it actually resizes the panels instead of just moving them around. --- src-qt5/core/lumina-desktop/LPanel.cpp | 44 ++++++++++++++++++++++++++-------- src-qt5/core/lumina-desktop/LPanel.h | 4 +++- 2 files changed, 37 insertions(+), 11 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index 933dc778..62534acb 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -121,6 +121,7 @@ void LPanel::UpdatePanel(bool geomonly){ layout->setDirection(QBoxLayout::TopToBottom); } int ht = qRound(settings->value(PPREFIX+"height", 30).toDouble()); //this is technically the distance into the screen from the edge + fullwidth = ht; //save this for later if(ht<=1){ ht = 30; } //some kind of error in the saved height - use the default value int hidesize = qRound(ht*0.01); //use 1% of the panel size if(hidesize<2){ hidesize=2; } //minimum of 2 pixels (need space for the mouse to go over it) @@ -151,9 +152,10 @@ void LPanel::UpdatePanel(bool geomonly){ if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "top"); } else{ LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc, yloc, this->width(), hidesize), "top"); - hidepoint = QPoint(xloc, yloc+hidesize-ht); + hidepoint = QPoint(xloc, yloc); showpoint = QPoint(xloc, yloc); - this->move(hidepoint); //Could bleed over onto the screen above + this->move(hidepoint); + this->resize( this->width(), viswidth); } }else if(loc=="bottom"){ //bottom of screen QSize sz = QSize(xwid*panelPercent, ht); @@ -169,6 +171,7 @@ void LPanel::UpdatePanel(bool geomonly){ hidepoint = QPoint(xloc, yloc+xhi-hidesize); showpoint = QPoint(xloc, yloc+xhi-ht); this->move(hidepoint); //Could bleed over onto the screen below + this->resize( this->width(), viswidth); } }else if(loc=="left"){ //left side of screen QSize sz = QSize(ht, xhi*panelPercent); @@ -181,9 +184,10 @@ void LPanel::UpdatePanel(bool geomonly){ if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "left"); } else{ LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc, yloc, hidesize, sz.height()), "left"); - hidepoint = QPoint(xloc-ht+hidesize, yloc); + hidepoint = QPoint(xloc, yloc); showpoint = QPoint(xloc, yloc); this->move(hidepoint); //Could bleed over onto the screen left + this->resize( viswidth, this->height()); } }else{ //right side of screen QSize sz = QSize(ht, xhi*panelPercent); @@ -199,6 +203,7 @@ void LPanel::UpdatePanel(bool geomonly){ hidepoint = QPoint(xloc+xwid-hidesize, yloc); showpoint = QPoint(xloc+xwid-ht, yloc); this->move(hidepoint); //Could bleed over onto the screen right + this->resize( viswidth, this->height()); } } if(DEBUG){ qDebug() << " - Done with panel geometry"; } @@ -265,7 +270,7 @@ void LPanel::UpdatePanel(bool geomonly){ i--; //make sure we don't miss the next item with the re-order } } - LSession::processEvents(); + //LSession::processEvents(); } //Now remove any extra plugins from the end //qDebug() << "plugins:" << plugins; @@ -279,7 +284,7 @@ void LPanel::UpdatePanel(bool geomonly){ } layout->takeAt(i); //remove from the layout PLUGINS.takeAt(i)->deleteLater(); //delete the actual widget - LSession::processEvents(); + //LSession::processEvents(); i--; //need to back up one space to not miss another plugin } this->update(); @@ -289,7 +294,8 @@ void LPanel::UpdatePanel(bool geomonly){ for(int i=0; isize(); if( !this->geometry().contains(QCursor::pos()) ){ //Move the panel back to it's "hiding" spot - if(hidden){ this->move(hidepoint); this->update(); } + if(hidden){ + QSize sz(horizontal ? this->width() : viswidth, horizontal ? viswidth : this->height() ); + this->setMinimumSize(sz); + this->setMaximumSize(sz); + this->setGeometry( QRect(hidepoint, sz) ); + } //Re-active the old window if(LSession::handle()->activeWindow()!=0){ LSession::handle()->XCB->ActivateWindow(LSession::handle()->activeWindow()); } + }else if(hidden){ + QSize sz(horizontal ? this->width() : fullwidth, horizontal ? fullwidth : this->height() ); + this->setMinimumSize(sz); + this->setMaximumSize(sz); + this->setGeometry( QRect(showpoint, sz) ); } } @@ -324,10 +341,15 @@ void LPanel::checkPanelFocus(){ //=========== // PROTECTED //=========== +void LPanel::resizeEvent(QResizeEvent *event){ + QWidget::resizeEvent(event); + for(int i=0; iOrientationChange(); } +} + void LPanel::paintEvent(QPaintEvent *event){ if(!hascompositer){ QPainter *painter = new QPainter(this); - //qDebug() << "Paint Panel:" << PPREFIX; + qDebug() << "Paint Panel:" << PPREFIX; //Make sure the base background of the event rectangle is the associated rectangle from the BGWindow QRect rec = event->rect();//this->geometry(); //start with the global geometry of the panel rec.adjust(-1,-1,2,2); //add 1 more pixel on each side @@ -343,11 +365,13 @@ void LPanel::paintEvent(QPaintEvent *event){ void LPanel::enterEvent(QEvent *event){ //qDebug() << "Panel Enter Event:"; - if(hidden){ + checkPanelFocus(); + /*if(hidden){ //Move the panel out so it is fully available this->move(showpoint); + this->resize( horizontal ? this->width() : fullwidth, horizontal ? fullwidth : this->height() ); this->update(); - } + }*/ //this->activateWindow(); event->accept(); //just to quiet the compile warning } diff --git a/src-qt5/core/lumina-desktop/LPanel.h b/src-qt5/core/lumina-desktop/LPanel.h index b3c9ba60..2828161c 100644 --- a/src-qt5/core/lumina-desktop/LPanel.h +++ b/src-qt5/core/lumina-desktop/LPanel.h @@ -35,11 +35,12 @@ private: QString PPREFIX; //internal prefix for all settings QDesktopWidget *screen; QWidget *bgWindow, *panelArea; + //QRect hidegeom, showgeom; //for hidden panels QPoint hidepoint, showpoint; //for hidden panels: locations when hidden/visible bool defaultpanel, horizontal, hidden, hascompositer; int screennum; int panelnum; - int viswidth; + int viswidth, fullwidth; QList PLUGINS; public: @@ -69,6 +70,7 @@ private slots: void checkPanelFocus(); protected: + void resizeEvent(QResizeEvent *event); void paintEvent(QPaintEvent *event); void enterEvent(QEvent *event); void leaveEvent(QEvent *event); -- cgit From 3464e681e6eebe8022b75750405770e8dfe7db87 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sat, 12 Nov 2016 09:19:29 -0500 Subject: Speed up the initial loading of the desktop at start, and delay the auto-started apps by 1/2 second. --- src-qt5/core/lumina-desktop/LPanel.cpp | 4 ++-- src-qt5/core/lumina-desktop/LSession.cpp | 22 +++++----------------- .../applauncher/AppLauncherPlugin.cpp | 3 ++- .../desktop-plugins/notepad/NotepadPlugin.cpp | 2 +- 4 files changed, 10 insertions(+), 21 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LPanel.cpp b/src-qt5/core/lumina-desktop/LPanel.cpp index 62534acb..43584ffc 100644 --- a/src-qt5/core/lumina-desktop/LPanel.cpp +++ b/src-qt5/core/lumina-desktop/LPanel.cpp @@ -67,7 +67,7 @@ LPanel::LPanel(QSettings *file, int scr, int num, QWidget *parent) : QWidget(){ //this->setWindowOpacity(0.5); //fully transparent background for the main widget //panelArea->setWindowOpacity(1.0); //fully opaque for the widget on top (apply stylesheet transparencies) } - QTimer::singleShot(1,this, SLOT(UpdatePanel()) ); //start this in a new thread + QTimer::singleShot(1,this, SLOT(UpdatePanel()) ); //connect(screen, SIGNAL(resized(int)), this, SLOT(UpdatePanel()) ); //in case the screen resolution changes } @@ -246,7 +246,7 @@ void LPanel::UpdatePanel(bool geomonly){ //Make sure the plugin layout has the correct orientation if(horizontal){PLUGINS[p]->layout()->setDirection(QBoxLayout::LeftToRight); } else{ PLUGINS[p]->layout()->setDirection(QBoxLayout::TopToBottom); } - QTimer::singleShot(0,PLUGINS[p], SLOT( OrientationChange() ) ); + PLUGINS[p]->OrientationChange(); //Now check the location of the plugin in the panel if(p!=i){ //wrong place in the panel layout->takeAt(p); //remove the item from the current location diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index f383c163..22439911 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -120,12 +120,6 @@ void LSession::setupSession(){ if(DEBUG){ qDebug() << " - Init System Tray:" << timer->elapsed();} startSystemTray(); - //Launch Fluxbox - //splash.showScreen("wm"); - //if(DEBUG){ qDebug() << " - Init WM:" << timer->elapsed();} - //WM = new WMProcess(); - //WM->startWM(); - //Initialize the global menus qDebug() << " - Initialize system menus"; splash.showScreen("apps"); @@ -143,7 +137,8 @@ void LSession::setupSession(){ if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed();} desktopFiles = QDir(QDir::homePath()+"/Desktop").entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs, QDir::Name | QDir::IgnoreCase | QDir::DirsFirst); updateDesktops(); - + for(int i=0; i<6; i++){ LSession::processEvents(); } //Run through this a few times so the interface systems get up and running + //Now setup the system watcher for changes splash.showScreen("final"); qDebug() << " - Initialize file system watcher"; @@ -154,25 +149,18 @@ void LSession::setupSession(){ watcherChange( confdir+"/desktopsettings.conf" ); watcherChange( confdir+"/fluxbox-init" ); watcherChange( confdir+"/fluxbox-keys" ); - //watcher->addPath( sessionsettings->fileName() ); - //watcher->addPath( confdir+"/desktopsettings.conf" ); - //watcher->addPath( confdir+"/fluxbox-init" ); - //watcher->addPath( confdir+"/fluxbox-keys" ); //Try to watch the localized desktop folder too if(QFile::exists(QDir::homePath()+"/"+tr("Desktop"))){ watcherChange( QDir::homePath()+"/"+tr("Desktop") ); } watcherChange( QDir::homePath()+"/Desktop" ); //connect internal signals/slots - //connect(this->desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(screensChanged()) ); - //connect(this->desktop(), SIGNAL(resized(int)), this, SLOT(screenResized(int)) ); connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(watcherChange(QString)) ); connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange(QString)) ); connect(this, SIGNAL(aboutToQuit()), this, SLOT(SessionEnding()) ); if(DEBUG){ qDebug() << " - Init Finished:" << timer->elapsed(); delete timer;} - QApplication::processEvents(); - launchStartupApps(); - //QTimer::singleShot(500, this, SLOT(launchStartupApps()) ); - //QApplication::processEvents(); + for(int i=0; i<4; i++){ LSession::processEvents(); } //Again, just a few event loops here so thing can settle before we close the splash screen + //launchStartupApps(); + QTimer::singleShot(500, this, SLOT(launchStartupApps()) ); splash.close(); } 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 708355cd..3be19faa 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/applauncher/AppLauncherPlugin.cpp @@ -20,7 +20,8 @@ AppLauncherPlugin::AppLauncherPlugin(QWidget* parent, QString ID) : LDPlugin(par connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT( loadButton()) ); connect(this, SIGNAL(PluginActivated()), this, SLOT(buttonClicked()) ); //in case they use the context menu to launch it. - QTimer::singleShot(200,this, SLOT(loadButton()) ); + loadButton(); + //QTimer::singleShot(0,this, SLOT(loadButton()) ); } void AppLauncherPlugin::Cleanup(){ diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp index fe26941e..6d321305 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/notepad/NotepadPlugin.cpp @@ -66,7 +66,7 @@ NotePadPlugin::NotePadPlugin(QWidget* parent, QString ID) : LDPlugin(parent, ID) //qDebug() << "Saving a new setting"; this->saveSetting("customFile",""); //always clear this when the plugin is initialized (only maintained per-session) //qDebug() << "Loading Notes Dir"; - QTimer::singleShot(2000, this, SLOT(notesDirChanged())); + QTimer::singleShot(10, this, SLOT(notesDirChanged())); //qDebug() << "Set Sizing"; //qDebug() << "Connect Signals/slots"; -- cgit From e3a9c6c5fdb7710c56f526e7d3bbf0e55cd24fd1 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 15 Nov 2016 09:05:41 -0500 Subject: Update the default luminaDesktop.conf files to try and associate the archive mimetypes with lumina-archiver by default. --- .../core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf | 7 +++++++ src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf index 9b819e7c..56ff8b84 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf @@ -42,6 +42,13 @@ mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop mime_default_application/pdf_ifexists=pc-pdfviewer.desktop mime_default_application/pdf_ifexists=okular.desktop +mime_default_application/zip_ifexists=lumina-archiver.desktop +mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-tar_ifexists=lumina-archiver.desktop #THEME SETTINGS theme_themefile=Glass #Name of the theme to use (disable for Lumina-Default) diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf index 4950b1a0..46d00053 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf @@ -36,13 +36,13 @@ session_default_email_ifexists=trojita.desktop mime_default_text/*_ifexists=lumina-textedit.desktop mime_default_audio/*_ifexists=vlc.desktop mime_default_video/*_ifexists=vlc.desktop -mime_default_application/zip_ifexists=peazip.desktop -mime_default_application/x-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-bzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lrzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lzma-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-xz-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-tar_ifexists=peazip.desktop +mime_default_application/zip_ifexists=lumina-archiver.desktop +mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-tar_ifexists=lumina-archiver.desktop mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop -- cgit From e81f5030cba63c6ba8763c688d86d0b1843272e0 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Nov 2016 09:56:13 -0500 Subject: Bump the copyright year on the LuminaX11 files. --- src-qt5/core/libLumina/LuminaX11.cpp | 3 ++- src-qt5/core/libLumina/LuminaX11.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LuminaX11.cpp b/src-qt5/core/libLumina/LuminaX11.cpp index 3708af6d..a8016460 100644 --- a/src-qt5/core/libLumina/LuminaX11.cpp +++ b/src-qt5/core/libLumina/LuminaX11.cpp @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2015, Ken Moore +// Copyright (c) 2014-2016, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -1124,6 +1124,7 @@ void LXCB::closeSystemTray(WId trayID){ xcb_destroy_window(QX11Info::connection(), trayID); } + // === SetScreenWorkArea() === /*void LXCB::SetScreenWorkArea(unsigned int screen, QRect rect){ //This is only useful because Fluxbox does not set the _NET_WORKAREA root atom diff --git a/src-qt5/core/libLumina/LuminaX11.h b/src-qt5/core/libLumina/LuminaX11.h index 7b6cce3c..2c741111 100644 --- a/src-qt5/core/libLumina/LuminaX11.h +++ b/src-qt5/core/libLumina/LuminaX11.h @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2015, Ken Moore +// Copyright (c) 2014-2016, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -161,7 +161,6 @@ public: WId startSystemTray(int screen = 0); //Startup the system tray (returns window ID for tray) void closeSystemTray(WId); //Close the system tray - //============ // WM Functions (directly changing/reading properties) // - Using these directly may prevent the WM from seeing the change -- cgit From c8478cd010f7c6056a48e0cca9d4c0359329297a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Nov 2016 10:38:53 -0500 Subject: Add in the beginnings of a new backend class for managing input devices (LInputDevice): This uses the xcb-xinput library for interacting with devices on X (could be moved to wayland in the future). --- src-qt5/core/libLumina/LInputDevice.cpp | 88 +++++++++++++++++++++++++++++++++ src-qt5/core/libLumina/LInputDevice.h | 43 ++++++++++++++++ src-qt5/core/libLumina/LInputDevice.pri | 13 +++++ 3 files changed, 144 insertions(+) create mode 100644 src-qt5/core/libLumina/LInputDevice.cpp create mode 100644 src-qt5/core/libLumina/LInputDevice.h create mode 100644 src-qt5/core/libLumina/LInputDevice.pri (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp new file mode 100644 index 00000000..a760d19d --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.cpp @@ -0,0 +1,88 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "LInputDevice.h" + +//Qt Library includes +#include +#include +#include + +//XCB Library includes +#include +#include +#include + +// LInputDevice Class +LInputDevice::LInputDevice(unsigned int id, unsigned int type){ + devID = id; + devType = type; + //devName = name; +} + +LInputDevice::~LInputDevice(){ + +} + +unsigned int LInputDevice::devNumber(){ + return devID; +} + +bool LInputDevice::isPointer(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_POINTER \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); +} + +bool LInputDevice::isKeyboard(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_KEYBOARD \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD); +} + +bool LInputDevice::isExtension(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_DEVICE \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); +} + +QStringList LInputDevice::listProperties(){ + xcb_input_list_device_properties_cookie_t cookie = xcb_input_list_device_properties_unchecked(QX11Info::connection(), devID); + xcb_input_list_device_properties_reply_t *reply = xcb_input_list_device_properties_reply(QX11Info::connection(), cookie, NULL); + qDebug() << "Property List:"; + qDebug() << " - response_type:" << reply->response_type; + qDebug() << " - num atoms:" << reply->num_atoms; + qDebug() << " - length:" << reply->length; + qDebug() << " - sequence:" << reply->sequence; + //Done with data structure + ::free(reply); + //Return info + return QStringList(); +} +//====================== +// LInput Static Functions +//====================== +QList LInput::listDevices(){ + QList devices; + xcb_input_list_input_devices_cookie_t cookie = xcb_input_list_input_devices_unchecked(QX11Info::connection()); + xcb_input_list_input_devices_reply_t *reply = xcb_input_list_input_devices_reply(QX11Info::connection(), cookie, NULL); + if(reply==0){ return devices; } //error - nothing returned + //Use the iterator for going through the reply + xcb_input_device_info_iterator_t iter = xcb_input_list_input_devices_devices_iterator(reply); + //xcb_str_iterator_t nameiter = xcb_input_list_input_devices_names_iterator(reply); + + //Now step through the reply + QStringList info; + while(iter.data != 0 ){ + devices << new LInputDevice(iter.data->device_id, iter.data->device_use); + //qDebug() << "Input Device:" << iter.data->device_id; + //qDebug() << " - num_class_info:" << iter.data->num_class_info; + xcb_input_device_info_next(&iter); + //xcb_input_device_name_next(&nameiter); + } + //Free the reply (done with it) + ::free(reply); + //return the information + return devices; +} diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h new file mode 100644 index 00000000..efbc41e7 --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.h @@ -0,0 +1,43 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This class governs all the XCB input device interactions +// and provides simpler Qt-based functions for use elsewhere +//=========================================== +#ifndef _LUMINA_XCB_INPUT_DEVICES_H +#define _LUMINA_XCB_INPUT_DEVICES_H + +#include +#include +#include + +class LInputDevice{ +public: + LInputDevice(unsigned int id, unsigned int type); //don't use this directly - use the "listDevices()" function instead + ~LInputDevice(); + + //QString name(); //Return the name of this device + unsigned int devNumber(); + bool isPointer(); + bool isKeyboard(); + bool isExtension(); + + //List Properties of device + QStringList listProperties(); + +private: + unsigned int devID; //device ID number - assigned at class creation + unsigned int devType; //device "use" identifier - assigned at class creation + //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) +}; + +//Static functions for overall management +class LInput{ + QList listDevices(); //NOTE: Make sure you "free()" all the LInputDevice objects when finished + +}; + +#endif diff --git a/src-qt5/core/libLumina/LInputDevice.pri b/src-qt5/core/libLumina/LInputDevice.pri new file mode 100644 index 00000000..e90728ce --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.pri @@ -0,0 +1,13 @@ + +QT *= x11extras + +LIBS *= -lc -lxcb -lxcb-xinput + +#LUtils Files +SOURCES *= $${PWD}/LInputDevice.cpp +HEADERS *= $${PWD}/LInputDevice.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +#include(LUtils.pri) -- cgit From f56665661e03a6a988451af0544c5866a6dfd88e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Nov 2016 10:42:48 -0500 Subject: Oops - make sure the LInput funcions are public and static --- src-qt5/core/libLumina/LInputDevice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h index efbc41e7..1293ea92 100644 --- a/src-qt5/core/libLumina/LInputDevice.h +++ b/src-qt5/core/libLumina/LInputDevice.h @@ -36,7 +36,8 @@ private: //Static functions for overall management class LInput{ - QList listDevices(); //NOTE: Make sure you "free()" all the LInputDevice objects when finished + public: + static QList listDevices(); //NOTE: Make sure you "free()" all the LInputDevice objects when finished }; -- cgit From 7a0a00fde86468ddf5d6877a96a3e23ed123bb0a Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Nov 2016 11:17:57 -0500 Subject: Get a bit more of the input device class working - using lumina-config for testing on the new "mouse" page (which is still disabled for the moment). --- src-qt5/core/libLumina/LInputDevice.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp index a760d19d..79f5c27f 100644 --- a/src-qt5/core/libLumina/LInputDevice.cpp +++ b/src-qt5/core/libLumina/LInputDevice.cpp @@ -69,17 +69,17 @@ QList LInput::listDevices(){ xcb_input_list_input_devices_reply_t *reply = xcb_input_list_input_devices_reply(QX11Info::connection(), cookie, NULL); if(reply==0){ return devices; } //error - nothing returned //Use the iterator for going through the reply + //qDebug() << "Create iterator"; xcb_input_device_info_iterator_t iter = xcb_input_list_input_devices_devices_iterator(reply); //xcb_str_iterator_t nameiter = xcb_input_list_input_devices_names_iterator(reply); //Now step through the reply - QStringList info; while(iter.data != 0 ){ devices << new LInputDevice(iter.data->device_id, iter.data->device_use); - //qDebug() << "Input Device:" << iter.data->device_id; + //qDebug() << "Found Input Device:" << iter.data->device_id; //qDebug() << " - num_class_info:" << iter.data->num_class_info; - xcb_input_device_info_next(&iter); - //xcb_input_device_name_next(&nameiter); + if(iter.rem>0){ xcb_input_device_info_next(&iter); } + else{ break; } } //Free the reply (done with it) ::free(reply); -- cgit From 44c2f396902ee2a9da898fd3965a7c5600d20118 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 17 Nov 2016 13:53:55 -0500 Subject: Commit some more work on the new input device framework. Got the properties getting listed now, just need to figure out how to read/set the various properties (no documentation on what the various inputs are for the XCB functions to do that). --- src-qt5/core/libLumina/LInputDevice.cpp | 40 ++++++++++++++++++++++++++------- src-qt5/core/libLumina/LInputDevice.h | 11 ++++++++- 2 files changed, 42 insertions(+), 9 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp index 79f5c27f..d141e39a 100644 --- a/src-qt5/core/libLumina/LInputDevice.cpp +++ b/src-qt5/core/libLumina/LInputDevice.cpp @@ -15,12 +15,17 @@ #include #include #include +#include -// LInputDevice Class +//=================== +// LInputDevice Class +//=================== +// === PUBLIC === LInputDevice::LInputDevice(unsigned int id, unsigned int type){ devID = id; devType = type; //devName = name; + getProperties(); //need to populate the name/atom correlations for properties } LInputDevice::~LInputDevice(){ @@ -47,18 +52,37 @@ bool LInputDevice::isExtension(){ || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); } +// Property Management QStringList LInputDevice::listProperties(){ + return devProps.keys(); +} + +QVariant LInputDevice::propertyValue(QString prop){ + if(!devProps.contains(prop)){ return QVariant(); } + //Now generate the property request + // xcb_input_get_device_property_cookie_t cookie = xcb_input_get_device_property_unchecked( QX11Info::connection(), devProps.value(prop), \ +// XCB_ATOM_ATOM, 0, 1000, devID, NULL); + QVariant result; + return result; +} + +// === PRIVATE === +void LInputDevice::getProperties(){ + devProps.clear(); xcb_input_list_device_properties_cookie_t cookie = xcb_input_list_device_properties_unchecked(QX11Info::connection(), devID); xcb_input_list_device_properties_reply_t *reply = xcb_input_list_device_properties_reply(QX11Info::connection(), cookie, NULL); - qDebug() << "Property List:"; - qDebug() << " - response_type:" << reply->response_type; - qDebug() << " - num atoms:" << reply->num_atoms; - qDebug() << " - length:" << reply->length; - qDebug() << " - sequence:" << reply->sequence; + //Get the atoms + xcb_atom_t *atoms = xcb_input_list_device_properties_atoms(reply); + //qDebug() << "Property Response Type:" << reply->response_type; //Always seems to be "1" + QList cookies; + for(int i=0; inum_atoms; i++){ cookies << xcb_get_atom_name(QX11Info::connection(), atoms[i]); } + for(int i=0; inum_atoms; i++){ + xcb_get_atom_name_reply_t *nr = xcb_get_atom_name_reply(QX11Info::connection(), cookies[i], NULL); + devProps.insert(QString::fromUtf8( xcb_get_atom_name_name(nr), xcb_get_atom_name_name_length(nr) ),atoms[i] ); + ::free(nr); + } //Done with data structure ::free(reply); - //Return info - return QStringList(); } //====================== // LInput Static Functions diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h index 1293ea92..f7a4713c 100644 --- a/src-qt5/core/libLumina/LInputDevice.h +++ b/src-qt5/core/libLumina/LInputDevice.h @@ -13,24 +13,33 @@ #include #include #include +#include +#include + +#include class LInputDevice{ public: LInputDevice(unsigned int id, unsigned int type); //don't use this directly - use the "listDevices()" function instead ~LInputDevice(); + //Device Information //QString name(); //Return the name of this device unsigned int devNumber(); bool isPointer(); bool isKeyboard(); bool isExtension(); - //List Properties of device + //Property Management QStringList listProperties(); + QVariant propertyValue(QString prop); private: unsigned int devID; //device ID number - assigned at class creation unsigned int devType; //device "use" identifier - assigned at class creation + QHash devProps; //Known device properties + + void getProperties(); //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) }; -- cgit From 151062b99e29e18dbc614bf66582f908c864a96a Mon Sep 17 00:00:00 2001 From: q5sys Date: Sun, 20 Nov 2016 01:50:36 -0500 Subject: Revert "search clear function on ESC press" This reverts commit b9840ef585385fece513e24e4cea193d35328dc0, reversing changes made to cb5524f6fd5186414c11339375bebd3b808b4857. --- src-qt5/core/libLumina/LInputDevice.cpp | 112 --------------------- src-qt5/core/libLumina/LInputDevice.h | 53 ---------- src-qt5/core/libLumina/LInputDevice.pri | 13 --- src-qt5/core/libLumina/LuminaX11.cpp | 3 +- src-qt5/core/libLumina/LuminaX11.h | 3 +- .../defaults/luminaDesktop-TrueOS.conf | 7 -- .../lumina-desktop/defaults/luminaDesktop.conf | 14 +-- 7 files changed, 10 insertions(+), 195 deletions(-) delete mode 100644 src-qt5/core/libLumina/LInputDevice.cpp delete mode 100644 src-qt5/core/libLumina/LInputDevice.h delete mode 100644 src-qt5/core/libLumina/LInputDevice.pri (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp deleted file mode 100644 index d141e39a..00000000 --- a/src-qt5/core/libLumina/LInputDevice.cpp +++ /dev/null @@ -1,112 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2016, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -#include "LInputDevice.h" - -//Qt Library includes -#include -#include -#include - -//XCB Library includes -#include -#include -#include -#include - -//=================== -// LInputDevice Class -//=================== -// === PUBLIC === -LInputDevice::LInputDevice(unsigned int id, unsigned int type){ - devID = id; - devType = type; - //devName = name; - getProperties(); //need to populate the name/atom correlations for properties -} - -LInputDevice::~LInputDevice(){ - -} - -unsigned int LInputDevice::devNumber(){ - return devID; -} - -bool LInputDevice::isPointer(){ - return (devType==XCB_INPUT_DEVICE_USE_IS_X_POINTER \ - || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); -} - -bool LInputDevice::isKeyboard(){ - return (devType==XCB_INPUT_DEVICE_USE_IS_X_KEYBOARD \ - || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD); -} - -bool LInputDevice::isExtension(){ - return (devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_DEVICE \ - || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD \ - || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); -} - -// Property Management -QStringList LInputDevice::listProperties(){ - return devProps.keys(); -} - -QVariant LInputDevice::propertyValue(QString prop){ - if(!devProps.contains(prop)){ return QVariant(); } - //Now generate the property request - // xcb_input_get_device_property_cookie_t cookie = xcb_input_get_device_property_unchecked( QX11Info::connection(), devProps.value(prop), \ -// XCB_ATOM_ATOM, 0, 1000, devID, NULL); - QVariant result; - return result; -} - -// === PRIVATE === -void LInputDevice::getProperties(){ - devProps.clear(); - xcb_input_list_device_properties_cookie_t cookie = xcb_input_list_device_properties_unchecked(QX11Info::connection(), devID); - xcb_input_list_device_properties_reply_t *reply = xcb_input_list_device_properties_reply(QX11Info::connection(), cookie, NULL); - //Get the atoms - xcb_atom_t *atoms = xcb_input_list_device_properties_atoms(reply); - //qDebug() << "Property Response Type:" << reply->response_type; //Always seems to be "1" - QList cookies; - for(int i=0; inum_atoms; i++){ cookies << xcb_get_atom_name(QX11Info::connection(), atoms[i]); } - for(int i=0; inum_atoms; i++){ - xcb_get_atom_name_reply_t *nr = xcb_get_atom_name_reply(QX11Info::connection(), cookies[i], NULL); - devProps.insert(QString::fromUtf8( xcb_get_atom_name_name(nr), xcb_get_atom_name_name_length(nr) ),atoms[i] ); - ::free(nr); - } - //Done with data structure - ::free(reply); -} -//====================== -// LInput Static Functions -//====================== -QList LInput::listDevices(){ - QList devices; - xcb_input_list_input_devices_cookie_t cookie = xcb_input_list_input_devices_unchecked(QX11Info::connection()); - xcb_input_list_input_devices_reply_t *reply = xcb_input_list_input_devices_reply(QX11Info::connection(), cookie, NULL); - if(reply==0){ return devices; } //error - nothing returned - //Use the iterator for going through the reply - //qDebug() << "Create iterator"; - xcb_input_device_info_iterator_t iter = xcb_input_list_input_devices_devices_iterator(reply); - //xcb_str_iterator_t nameiter = xcb_input_list_input_devices_names_iterator(reply); - - //Now step through the reply - while(iter.data != 0 ){ - devices << new LInputDevice(iter.data->device_id, iter.data->device_use); - //qDebug() << "Found Input Device:" << iter.data->device_id; - //qDebug() << " - num_class_info:" << iter.data->num_class_info; - if(iter.rem>0){ xcb_input_device_info_next(&iter); } - else{ break; } - } - //Free the reply (done with it) - ::free(reply); - //return the information - return devices; -} diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h deleted file mode 100644 index f7a4713c..00000000 --- a/src-qt5/core/libLumina/LInputDevice.h +++ /dev/null @@ -1,53 +0,0 @@ -//=========================================== -// Lumina-DE source code -// Copyright (c) 2016, Ken Moore -// Available under the 3-clause BSD license -// See the LICENSE file for full details -//=========================================== -// This class governs all the XCB input device interactions -// and provides simpler Qt-based functions for use elsewhere -//=========================================== -#ifndef _LUMINA_XCB_INPUT_DEVICES_H -#define _LUMINA_XCB_INPUT_DEVICES_H - -#include -#include -#include -#include -#include - -#include - -class LInputDevice{ -public: - LInputDevice(unsigned int id, unsigned int type); //don't use this directly - use the "listDevices()" function instead - ~LInputDevice(); - - //Device Information - //QString name(); //Return the name of this device - unsigned int devNumber(); - bool isPointer(); - bool isKeyboard(); - bool isExtension(); - - //Property Management - QStringList listProperties(); - QVariant propertyValue(QString prop); - -private: - unsigned int devID; //device ID number - assigned at class creation - unsigned int devType; //device "use" identifier - assigned at class creation - QHash devProps; //Known device properties - - void getProperties(); - //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) -}; - -//Static functions for overall management -class LInput{ - public: - static QList listDevices(); //NOTE: Make sure you "free()" all the LInputDevice objects when finished - -}; - -#endif diff --git a/src-qt5/core/libLumina/LInputDevice.pri b/src-qt5/core/libLumina/LInputDevice.pri deleted file mode 100644 index e90728ce..00000000 --- a/src-qt5/core/libLumina/LInputDevice.pri +++ /dev/null @@ -1,13 +0,0 @@ - -QT *= x11extras - -LIBS *= -lc -lxcb -lxcb-xinput - -#LUtils Files -SOURCES *= $${PWD}/LInputDevice.cpp -HEADERS *= $${PWD}/LInputDevice.h - -INCLUDEPATH *= ${PWD} - -#include LUtils and LuminaOS -#include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LuminaX11.cpp b/src-qt5/core/libLumina/LuminaX11.cpp index a8016460..3708af6d 100644 --- a/src-qt5/core/libLumina/LuminaX11.cpp +++ b/src-qt5/core/libLumina/LuminaX11.cpp @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2016, Ken Moore +// Copyright (c) 2014-2015, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -1124,7 +1124,6 @@ void LXCB::closeSystemTray(WId trayID){ xcb_destroy_window(QX11Info::connection(), trayID); } - // === SetScreenWorkArea() === /*void LXCB::SetScreenWorkArea(unsigned int screen, QRect rect){ //This is only useful because Fluxbox does not set the _NET_WORKAREA root atom diff --git a/src-qt5/core/libLumina/LuminaX11.h b/src-qt5/core/libLumina/LuminaX11.h index 2c741111..7b6cce3c 100644 --- a/src-qt5/core/libLumina/LuminaX11.h +++ b/src-qt5/core/libLumina/LuminaX11.h @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2016, Ken Moore +// Copyright (c) 2014-2015, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -161,6 +161,7 @@ public: WId startSystemTray(int screen = 0); //Startup the system tray (returns window ID for tray) void closeSystemTray(WId); //Close the system tray + //============ // WM Functions (directly changing/reading properties) // - Using these directly may prevent the WM from seeing the change diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf index 56ff8b84..9b819e7c 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf @@ -42,13 +42,6 @@ mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop mime_default_application/pdf_ifexists=pc-pdfviewer.desktop mime_default_application/pdf_ifexists=okular.desktop -mime_default_application/zip_ifexists=lumina-archiver.desktop -mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-tar_ifexists=lumina-archiver.desktop #THEME SETTINGS theme_themefile=Glass #Name of the theme to use (disable for Lumina-Default) diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf index 46d00053..4950b1a0 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf @@ -36,13 +36,13 @@ session_default_email_ifexists=trojita.desktop mime_default_text/*_ifexists=lumina-textedit.desktop mime_default_audio/*_ifexists=vlc.desktop mime_default_video/*_ifexists=vlc.desktop -mime_default_application/zip_ifexists=lumina-archiver.desktop -mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop -mime_default_application/x-tar_ifexists=lumina-archiver.desktop +mime_default_application/zip_ifexists=peazip.desktop +mime_default_application/x-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-xz-compressed-tar_ifexists=peazip.desktop +mime_default_application/x-tar_ifexists=peazip.desktop mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop -- cgit From c79aa5623796f62aa67b2c37367e28710b0f05d2 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Sun, 20 Nov 2016 13:22:08 -0500 Subject: Revert "Revert "search clear function on ESC press"" This reverts commit 151062b99e29e18dbc614bf66582f908c864a96a. --- src-qt5/core/libLumina/LInputDevice.cpp | 112 +++++++++++++++++++++ src-qt5/core/libLumina/LInputDevice.h | 53 ++++++++++ src-qt5/core/libLumina/LInputDevice.pri | 13 +++ src-qt5/core/libLumina/LuminaX11.cpp | 3 +- src-qt5/core/libLumina/LuminaX11.h | 3 +- .../defaults/luminaDesktop-TrueOS.conf | 7 ++ .../lumina-desktop/defaults/luminaDesktop.conf | 14 +-- 7 files changed, 195 insertions(+), 10 deletions(-) create mode 100644 src-qt5/core/libLumina/LInputDevice.cpp create mode 100644 src-qt5/core/libLumina/LInputDevice.h create mode 100644 src-qt5/core/libLumina/LInputDevice.pri (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp new file mode 100644 index 00000000..d141e39a --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.cpp @@ -0,0 +1,112 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +#include "LInputDevice.h" + +//Qt Library includes +#include +#include +#include + +//XCB Library includes +#include +#include +#include +#include + +//=================== +// LInputDevice Class +//=================== +// === PUBLIC === +LInputDevice::LInputDevice(unsigned int id, unsigned int type){ + devID = id; + devType = type; + //devName = name; + getProperties(); //need to populate the name/atom correlations for properties +} + +LInputDevice::~LInputDevice(){ + +} + +unsigned int LInputDevice::devNumber(){ + return devID; +} + +bool LInputDevice::isPointer(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_POINTER \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); +} + +bool LInputDevice::isKeyboard(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_KEYBOARD \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD); +} + +bool LInputDevice::isExtension(){ + return (devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_DEVICE \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_KEYBOARD \ + || devType==XCB_INPUT_DEVICE_USE_IS_X_EXTENSION_POINTER); +} + +// Property Management +QStringList LInputDevice::listProperties(){ + return devProps.keys(); +} + +QVariant LInputDevice::propertyValue(QString prop){ + if(!devProps.contains(prop)){ return QVariant(); } + //Now generate the property request + // xcb_input_get_device_property_cookie_t cookie = xcb_input_get_device_property_unchecked( QX11Info::connection(), devProps.value(prop), \ +// XCB_ATOM_ATOM, 0, 1000, devID, NULL); + QVariant result; + return result; +} + +// === PRIVATE === +void LInputDevice::getProperties(){ + devProps.clear(); + xcb_input_list_device_properties_cookie_t cookie = xcb_input_list_device_properties_unchecked(QX11Info::connection(), devID); + xcb_input_list_device_properties_reply_t *reply = xcb_input_list_device_properties_reply(QX11Info::connection(), cookie, NULL); + //Get the atoms + xcb_atom_t *atoms = xcb_input_list_device_properties_atoms(reply); + //qDebug() << "Property Response Type:" << reply->response_type; //Always seems to be "1" + QList cookies; + for(int i=0; inum_atoms; i++){ cookies << xcb_get_atom_name(QX11Info::connection(), atoms[i]); } + for(int i=0; inum_atoms; i++){ + xcb_get_atom_name_reply_t *nr = xcb_get_atom_name_reply(QX11Info::connection(), cookies[i], NULL); + devProps.insert(QString::fromUtf8( xcb_get_atom_name_name(nr), xcb_get_atom_name_name_length(nr) ),atoms[i] ); + ::free(nr); + } + //Done with data structure + ::free(reply); +} +//====================== +// LInput Static Functions +//====================== +QList LInput::listDevices(){ + QList devices; + xcb_input_list_input_devices_cookie_t cookie = xcb_input_list_input_devices_unchecked(QX11Info::connection()); + xcb_input_list_input_devices_reply_t *reply = xcb_input_list_input_devices_reply(QX11Info::connection(), cookie, NULL); + if(reply==0){ return devices; } //error - nothing returned + //Use the iterator for going through the reply + //qDebug() << "Create iterator"; + xcb_input_device_info_iterator_t iter = xcb_input_list_input_devices_devices_iterator(reply); + //xcb_str_iterator_t nameiter = xcb_input_list_input_devices_names_iterator(reply); + + //Now step through the reply + while(iter.data != 0 ){ + devices << new LInputDevice(iter.data->device_id, iter.data->device_use); + //qDebug() << "Found Input Device:" << iter.data->device_id; + //qDebug() << " - num_class_info:" << iter.data->num_class_info; + if(iter.rem>0){ xcb_input_device_info_next(&iter); } + else{ break; } + } + //Free the reply (done with it) + ::free(reply); + //return the information + return devices; +} diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h new file mode 100644 index 00000000..f7a4713c --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.h @@ -0,0 +1,53 @@ +//=========================================== +// Lumina-DE source code +// Copyright (c) 2016, Ken Moore +// Available under the 3-clause BSD license +// See the LICENSE file for full details +//=========================================== +// This class governs all the XCB input device interactions +// and provides simpler Qt-based functions for use elsewhere +//=========================================== +#ifndef _LUMINA_XCB_INPUT_DEVICES_H +#define _LUMINA_XCB_INPUT_DEVICES_H + +#include +#include +#include +#include +#include + +#include + +class LInputDevice{ +public: + LInputDevice(unsigned int id, unsigned int type); //don't use this directly - use the "listDevices()" function instead + ~LInputDevice(); + + //Device Information + //QString name(); //Return the name of this device + unsigned int devNumber(); + bool isPointer(); + bool isKeyboard(); + bool isExtension(); + + //Property Management + QStringList listProperties(); + QVariant propertyValue(QString prop); + +private: + unsigned int devID; //device ID number - assigned at class creation + unsigned int devType; //device "use" identifier - assigned at class creation + QHash devProps; //Known device properties + + void getProperties(); + //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) +}; + +//Static functions for overall management +class LInput{ + public: + static QList listDevices(); //NOTE: Make sure you "free()" all the LInputDevice objects when finished + +}; + +#endif diff --git a/src-qt5/core/libLumina/LInputDevice.pri b/src-qt5/core/libLumina/LInputDevice.pri new file mode 100644 index 00000000..e90728ce --- /dev/null +++ b/src-qt5/core/libLumina/LInputDevice.pri @@ -0,0 +1,13 @@ + +QT *= x11extras + +LIBS *= -lc -lxcb -lxcb-xinput + +#LUtils Files +SOURCES *= $${PWD}/LInputDevice.cpp +HEADERS *= $${PWD}/LInputDevice.h + +INCLUDEPATH *= ${PWD} + +#include LUtils and LuminaOS +#include(LUtils.pri) diff --git a/src-qt5/core/libLumina/LuminaX11.cpp b/src-qt5/core/libLumina/LuminaX11.cpp index 3708af6d..a8016460 100644 --- a/src-qt5/core/libLumina/LuminaX11.cpp +++ b/src-qt5/core/libLumina/LuminaX11.cpp @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2015, Ken Moore +// Copyright (c) 2014-2016, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -1124,6 +1124,7 @@ void LXCB::closeSystemTray(WId trayID){ xcb_destroy_window(QX11Info::connection(), trayID); } + // === SetScreenWorkArea() === /*void LXCB::SetScreenWorkArea(unsigned int screen, QRect rect){ //This is only useful because Fluxbox does not set the _NET_WORKAREA root atom diff --git a/src-qt5/core/libLumina/LuminaX11.h b/src-qt5/core/libLumina/LuminaX11.h index 7b6cce3c..2c741111 100644 --- a/src-qt5/core/libLumina/LuminaX11.h +++ b/src-qt5/core/libLumina/LuminaX11.h @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014-2015, Ken Moore +// Copyright (c) 2014-2016, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -161,7 +161,6 @@ public: WId startSystemTray(int screen = 0); //Startup the system tray (returns window ID for tray) void closeSystemTray(WId); //Close the system tray - //============ // WM Functions (directly changing/reading properties) // - Using these directly may prevent the WM from seeing the change diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf index 9b819e7c..56ff8b84 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf @@ -42,6 +42,13 @@ mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop mime_default_application/pdf_ifexists=pc-pdfviewer.desktop mime_default_application/pdf_ifexists=okular.desktop +mime_default_application/zip_ifexists=lumina-archiver.desktop +mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-tar_ifexists=lumina-archiver.desktop #THEME SETTINGS theme_themefile=Glass #Name of the theme to use (disable for Lumina-Default) diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf index 4950b1a0..46d00053 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf @@ -36,13 +36,13 @@ session_default_email_ifexists=trojita.desktop mime_default_text/*_ifexists=lumina-textedit.desktop mime_default_audio/*_ifexists=vlc.desktop mime_default_video/*_ifexists=vlc.desktop -mime_default_application/zip_ifexists=peazip.desktop -mime_default_application/x-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-bzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lrzip-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-lzma-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-xz-compressed-tar_ifexists=peazip.desktop -mime_default_application/x-tar_ifexists=peazip.desktop +mime_default_application/zip_ifexists=lumina-archiver.desktop +mime_default_application/x-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-bzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lrzip-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-lzma-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-xz-compressed-tar_ifexists=lumina-archiver.desktop +mime_default_application/x-tar_ifexists=lumina-archiver.desktop mime_default_unknown/*=lumina-textedit.desktop mime_default_application/x-shellscript=lumina-textedit.desktop -- cgit From 3f885fb37548a8ba362ac2519717379f250895cb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 21 Nov 2016 10:04:28 -0500 Subject: Add a new menu plugin: "lockdesktop". This just adds a shortcut to the context menu for locking the desktop session. --- src-qt5/core/lumina-desktop/LDesktop.cpp | 7 ++++++- src-qt5/core/lumina-desktop/LDesktop.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp index b08251bd..5031fb96 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.cpp +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp @@ -96,7 +96,11 @@ void LDesktop::UpdateGeometry(){ //qDebug() << " - Done With Desktop Geom Updates"; QTimer::singleShot(0, this, SLOT(UpdatePanels())); } - + +void LDesktop::SystemLock(){ + QProcess::startDetached("xscreensaver-command -lock"); +} + void LDesktop::SystemLogout(){ LSession::handle()->systemWindow(); } @@ -279,6 +283,7 @@ void LDesktop::UpdateMenu(bool fast){ usewinmenu=false; for(int i=0; iaddAction(LXDG::findIcon("utilities-terminal",""), tr("Terminal"), this, SLOT(SystemTerminal()) ); } + else if(items[i]=="lockdesktop"){ deskMenu->addAction(LXDG::findIcon("system-lock-screen",""), tr("Lock Session"), this, SLOT(SystemLock()) ); } else if(items[i]=="filemanager"){ deskMenu->addAction( LXDG::findIcon("user-home",""), tr("Browse Files"), this, SLOT(SystemFileManager()) ); } else if(items[i]=="applications"){ deskMenu->addMenu( LSession::handle()->applicationMenu() ); } else if(items[i]=="line"){ deskMenu->addSeparator(); } diff --git a/src-qt5/core/lumina-desktop/LDesktop.h b/src-qt5/core/lumina-desktop/LDesktop.h index c576a805..378db75b 100644 --- a/src-qt5/core/lumina-desktop/LDesktop.h +++ b/src-qt5/core/lumina-desktop/LDesktop.h @@ -50,6 +50,7 @@ public: void UpdateGeometry(); public slots: + void SystemLock(); void SystemLogout(); void SystemTerminal(); void SystemFileManager(); -- cgit From 2034d424a2054b6b4c31424c0ad89644e8fac5fe Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 21 Nov 2016 10:06:18 -0500 Subject: Add the "lockdesktop" menu plugin to the TrueOS default settings. --- src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf index 56ff8b84..c1f3a194 100644 --- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf +++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop-TrueOS.conf @@ -73,7 +73,7 @@ panel1_pinlocation=center #[left/center/right] Note:[left/right] corresponds to panel1_edgepercent=99 #[1->100] percentage of the screen edge to use #MENU SETTINGS (right-click menu) -menu_plugins=terminal, filemanager, applications, line, settings #list of menu plugins to show +menu_plugins=terminal, filemanager, applications, line, settings, line, lockdesktop#list of menu plugins to show #FAVORITES CUSTOMIZATION #favorites_add= #Create a favorites entry for this file/dir -- cgit From a0dd33922d93a6972b1fe81808866c5973c7d563 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 21 Nov 2016 11:03:33 -0500 Subject: Add a shortcut for opening the wallpaper settings within the "preferences" menu. --- src-qt5/core/lumina-desktop/SettingsMenu.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/SettingsMenu.cpp b/src-qt5/core/lumina-desktop/SettingsMenu.cpp index 80ef3042..58208931 100644 --- a/src-qt5/core/lumina-desktop/SettingsMenu.cpp +++ b/src-qt5/core/lumina-desktop/SettingsMenu.cpp @@ -30,12 +30,16 @@ void SettingsMenu::UpdateMenu(){ QAction *act = new QAction(LXDG::findIcon("preferences-desktop-screensaver",""), tr("Screensaver"), this); act->setWhatsThis("xscreensaver-demo"); this->addAction(act); - act = new QAction( LXDG::findIcon("preferences-desktop",""), tr("Desktop"), this); - act->setWhatsThis("lumina-config"); + act = new QAction( LXDG::findIcon("preferences-desktop-wallpaper",""), tr("Wallpaper"), this); + act->setWhatsThis("lumina-config --page wallpaper"); this->addAction(act); act = new QAction( LXDG::findIcon("preferences-other",""), tr("Display"), this); act->setWhatsThis("lumina-xconfig"); this->addAction(act); + act = new QAction( LXDG::findIcon("preferences-desktop",""), tr("All Desktop Settings"), this); + act->setWhatsThis("lumina-config"); + this->addAction(act); + this->addSeparator(); /*QString qtconfig = LOS::QtConfigShortcut(); if(QFile::exists(qtconfig) && !qtconfig.isEmpty()){ act = new QAction( LXDG::findIcon("preferences-desktop-theme",""), tr("Window Theme"), this); @@ -52,7 +56,6 @@ void SettingsMenu::UpdateMenu(){ this->addAction(act); } } - this->addSeparator(); act = new QAction( LXDG::findIcon("lumina",""), tr("About Lumina"), this); act->setWhatsThis("lumina-info"); this->addAction(act); -- cgit From 1b7f0d30506c1c9ff39acbe8cd6e6403a02ae5f2 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 22 Nov 2016 14:08:52 -0500 Subject: Fix up the default settings-setting routine to use the new panel/desktop syntax when setting the default configuration for the primary monitor. --- src-qt5/core/libLumina/LDesktopUtils.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 2797c8ca..80135ed0 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -269,10 +269,11 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){ } // -- DESKTOP SETTINGS -- + QString deskID = QApplication::primaryScreen()->name(); //(only works for the primary desktop at the moment) - tmp = sysDefaults.filter("desktop_"); - if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."); }//for backwards compat - if(!tmp.isEmpty()){deskset << "[desktop-"+screen+"]"; } + tmp = sysDefaults.filter("desktop-"+deskID); + if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."+deskID); }//for backwards compat + if(!tmp.isEmpty()){deskset << "[desktop-"+deskID+"]"; } for(int i=0; i Date: Tue, 22 Nov 2016 14:16:14 -0500 Subject: Oops - NOW the desktop/panel settings-reload will work. --- src-qt5/core/libLumina/LDesktopUtils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 80135ed0..978ce70b 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -271,8 +271,8 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){ // -- DESKTOP SETTINGS -- QString deskID = QApplication::primaryScreen()->name(); //(only works for the primary desktop at the moment) - tmp = sysDefaults.filter("desktop-"+deskID); - if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."+deskID); }//for backwards compat + tmp = sysDefaults.filter("desktop_"); + if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."); }//for backwards compat if(!tmp.isEmpty()){deskset << "[desktop-"+deskID+"]"; } for(int i=0; i Date: Wed, 30 Nov 2016 09:45:08 -0500 Subject: Cleanup the bootsplash a bit: 1) Move the loading message/progress to the bottom of the window. 2) Move the loading icon to the top-left side 3) Implement the (optional) usage of the "fortune" utility for a random/short message during the loading process. --- src-qt5/core/lumina-desktop/BootSplash.cpp | 8 +- src-qt5/core/lumina-desktop/BootSplash.ui | 197 +++++++++++++++++++---------- 2 files changed, 139 insertions(+), 66 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index e75bca21..e8a2decc 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -2,6 +2,7 @@ #include "ui_BootSplash.h" #include +#include BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus), ui(new Ui::BootSplash){ ui->setupUi(this); @@ -9,6 +10,11 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana //Center the window on the primary screen QPoint ctr = QApplication::desktop()->screenGeometry().center(); this->move( ctr.x()-(this->width()/2), ctr.y()-(this->height()/2) ); + if(LUtils::isValidBinary("fortune")){ + QString random = LUtils::getCmdOutput("fortune -s").join("\n").simplified(); + if(random.endsWith("\n")){ random.chop(1); } + ui->label_welcome->setText( "\""+random+"\"" ); + } } void BootSplash::showScreen(QString loading){ //update icon, text, and progress @@ -40,7 +46,7 @@ void BootSplash::showScreen(QString loading){ //update icon, text, and progress icon = "preferences-desktop-wallpaper"; }else if(loading=="final"){ txt = tr("Finalizing …"); per = 90; - icon = "pcbsd"; + icon = "start-here-lumina"; }else if(loading.startsWith("app::")){ txt = QString(tr("Starting App: %1")).arg(loading.section("::",1,50)); per = -1; } diff --git a/src-qt5/core/lumina-desktop/BootSplash.ui b/src-qt5/core/lumina-desktop/BootSplash.ui index 867b658c..7b2bebf9 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.ui +++ b/src-qt5/core/lumina-desktop/BootSplash.ui @@ -6,82 +6,149 @@ 0 0 - 280 - 127 + 314 + 194 Form - - - - - Qt::Horizontal - - - - 40 - 20 - - - + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 64 + 64 + + + + + 64 + 16777215 + + + + + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Welcome to the Lumina Desktop Environment! + + + Qt::AlignCenter + + + true + + + + - - - - - 64 - 64 - - - - - - - Qt::AlignCenter - - - - - - - 0 - - - Qt::Vertical - - - - - - - - + + Qt::Horizontal - - - 40 - 20 - - - - - - - - Some loading message - - - Qt::AlignCenter - - - true - + + + + + + + 0 + 0 + + + + 0 + + + Qt::Horizontal + + + + + + + + + + + 0 + 0 + + + + Some loading message + + + Qt::AlignCenter + + + true + + + + + -- cgit From d3b332c98f7d7ff105e39b3ae2bbf88ad5fcd9cd Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 30 Nov 2016 10:04:52 -0500 Subject: A few more tweaks for the boot splash. Font weights and such to better accent the rest of the UI. --- src-qt5/core/lumina-desktop/BootSplash.ui | 60 ++++++++++++++++++++++--------- src-qt5/core/lumina-desktop/LSession.cpp | 3 ++ 2 files changed, 46 insertions(+), 17 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.ui b/src-qt5/core/lumina-desktop/BootSplash.ui index 7b2bebf9..43070eee 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.ui +++ b/src-qt5/core/lumina-desktop/BootSplash.ui @@ -80,23 +80,49 @@ - - - - 0 - 0 - - - - Welcome to the Lumina Desktop Environment! - - - Qt::AlignCenter - - - true - - + + + + + + 75 + true + false + + + + Starting the Lumina Desktop... + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + 0 + 0 + + + + + true + + + + + + + Qt::AlignCenter + + + true + + + + diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 22439911..289d7ede 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -161,7 +161,10 @@ void LSession::setupSession(){ for(int i=0; i<4; i++){ LSession::processEvents(); } //Again, just a few event loops here so thing can settle before we close the splash screen //launchStartupApps(); QTimer::singleShot(500, this, SLOT(launchStartupApps()) ); + splash.hide(); + LSession::processEvents(); splash.close(); + LSession::processEvents(); } void LSession::CleanupSession(){ -- cgit From d4f8bc41d53b85b1d3639fdc129f369e7f1b581e Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 30 Nov 2016 13:08:30 -0500 Subject: Unify the icons used for battery indications within the start menu and battery plugin. Also, add a green background to the battery plugin when the charge is 100% and still plugged in. --- src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp | 3 ++- .../core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src-qt5/core') 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 af081191..ee379613 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/battery/LBattery.cpp @@ -1,6 +1,6 @@ //=========================================== // Lumina-DE source code -// Copyright (c) 2014, Susanne Jaeckel +// Copyright (c) 2014, Susanne Jaeckel, 2015-2016 Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -81,6 +81,7 @@ void LBattery::updateBattery(bool force){ LSession::handle()->playAudioFile(LOS::LuminaShare()+"low-battery.ogg"); } 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;}"); } iconOld = icon; 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 260215ec..a34d09db 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp @@ -488,11 +488,10 @@ void StartMenu::on_stackedWidget_currentChanged(int val){ //Battery available - update the status button int charge = LOS::batteryCharge(); QString TT, ICON; - if(charge < 10){ ICON="-low"; } - else if(charge<20){ ICON="-caution"; } - else if(charge<40){ ICON="-040"; } - else if(charge<60){ ICON="-060"; } - else if(charge<80){ ICON="-080"; } + if(charge<=5){ ICON="-caution"; } + else if(charge<=20){ ICON="-040"; } + else if(charge<=70){ ICON="-060"; } + else if(charge<=90){ ICON="-080"; } else{ ICON="-100"; } if(LOS::batteryIsCharging()){ if(charge>=80){ ICON.clear(); } //for charging, there is no suffix to the icon name over 80% -- cgit From a3e934d2defa7831204ff2bd2e1bd030dcfae80c Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 1 Dec 2016 08:24:00 -0500 Subject: Add the Lumina version to the bottom of the boot splash as well. --- src-qt5/core/lumina-desktop/BootSplash.cpp | 2 ++ src-qt5/core/lumina-desktop/BootSplash.ui | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index e8a2decc..f7981670 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -3,6 +3,7 @@ #include #include +#include BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus), ui(new Ui::BootSplash){ ui->setupUi(this); @@ -15,6 +16,7 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana if(random.endsWith("\n")){ random.chop(1); } ui->label_welcome->setText( "\""+random+"\"" ); } + ui->label_version->setText( QString(tr("Version %1")).arg(LDesktopUtils::LuminaDesktopVersion()) ); } void BootSplash::showScreen(QString loading){ //update icon, text, and progress diff --git a/src-qt5/core/lumina-desktop/BootSplash.ui b/src-qt5/core/lumina-desktop/BootSplash.ui index 43070eee..43f4ca67 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.ui +++ b/src-qt5/core/lumina-desktop/BootSplash.ui @@ -122,6 +122,22 @@ + + + + + 7 + true + + + + Version + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -- cgit From f7b894621578f5b54b3da9a3291586cee503c2d9 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 1 Dec 2016 10:33:19 -0500 Subject: Get rid of the "fortune" usage, and replace it with a built-in system of tips for Lumina itself (avoids strange stuff from fortune, and ensures information which is at least semi-useful for the user). --- src-qt5/core/lumina-desktop/BootSplash.cpp | 28 +++++++++++++++++++++++----- src-qt5/core/lumina-desktop/BootSplash.h | 4 +++- src-qt5/core/lumina-desktop/LSession.cpp | 8 +++++--- 3 files changed, 31 insertions(+), 9 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index f7981670..f6c4c5fa 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -11,14 +11,32 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana //Center the window on the primary screen QPoint ctr = QApplication::desktop()->screenGeometry().center(); this->move( ctr.x()-(this->width()/2), ctr.y()-(this->height()/2) ); - if(LUtils::isValidBinary("fortune")){ - QString random = LUtils::getCmdOutput("fortune -s").join("\n").simplified(); - if(random.endsWith("\n")){ random.chop(1); } - ui->label_welcome->setText( "\""+random+"\"" ); - } + generateTipOfTheDay(); ui->label_version->setText( QString(tr("Version %1")).arg(LDesktopUtils::LuminaDesktopVersion()) ); } +void BootSplash::generateTipOfTheDay(){ + int index = qrand()%5; //Make sure this number matches the length of the case below (max value +1) + QString tip = "This desktop is generously sponsored by iXsystems\nwww.ixsystems.com"; //fallback message (just in case) + switch(index){ + case 0: + tip = tr("This desktop is powered by coffee, coffee, and more coffee."); break; + case 1: + tip = tr("Keep up with desktop news!")+"\n\nwww.lumina-desktop.org"; break; + case 2: + tip = tr("There is a full handbook of information about the desktop available online.")+"\n\nwww.lumina-desktop.org/handbook"; break; + case 3: + tip = tr("Want to change the interface? Everything is customizable in the desktop configuration!"); break; + case 4: + tip = tr("Lumina can easily reproduce the interface from most other desktop environments."); break; + case 5: + tip = tr(""); break; + case 6: + tip = tr(""); break; + } + ui->label_welcome->setText( "\""+tip+"\"" ); +} + void BootSplash::showScreen(QString loading){ //update icon, text, and progress QString txt, icon; int per = 0; diff --git a/src-qt5/core/lumina-desktop/BootSplash.h b/src-qt5/core/lumina-desktop/BootSplash.h index f5bf97a8..f9812ff4 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.h +++ b/src-qt5/core/lumina-desktop/BootSplash.h @@ -18,6 +18,8 @@ class BootSplash : public QWidget{ private: Ui::BootSplash *ui; + void generateTipOfTheDay(); + public: BootSplash(); ~BootSplash(){} @@ -26,4 +28,4 @@ public: void showText(QString txt); //will only update the text, not the icon/progress }; -#endif \ No newline at end of file +#endif diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp index 289d7ede..27b40aa3 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -81,14 +81,16 @@ LSession::~LSession(){ } void LSession::setupSession(){ + //Seed random number generator (if needed) + qsrand( QTime::currentTime().msec() ); + BootSplash splash; splash.showScreen("init"); qDebug() << "Initializing Session"; if(QFile::exists("/tmp/.luminastopping")){ QFile::remove("/tmp/.luminastopping"); } QTime* timer = 0; - if(DEBUG){ timer = new QTime(); timer->start(); qDebug() << " - Init srand:" << timer->elapsed();} - //Seed random number generator (if needed) - qsrand( QTime::currentTime().msec() ); + //if(DEBUG){ timer = new QTime(); timer->start(); qDebug() << " - Init srand:" << timer->elapsed();} + //Setup the QSettings default paths splash.showScreen("settings"); if(DEBUG){ qDebug() << " - Init QSettings:" << timer->elapsed();} -- cgit From a78098bec6289f4d242bc132205866dbdd73eb24 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 1 Dec 2016 15:40:59 -0500 Subject: Adjust the Qt-crash workaround a bit to try and avoid starting a dbus session if possible. --- src-qt5/core/lumina-session/session.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 10953f12..19acdb1c 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -61,11 +61,16 @@ void LSession::startProcess(QString ID, QString command, QStringList watchfiles) proc->setStandardOutputFile(logfile); proc->setObjectName(ID); if(ID=="runtime"){ - //Bypass for a hidden dbus requirement for Qt itself (Qt 5.5.1) - QDir tmp = QDir::temp(); - if( tmp.entryList(QStringList() << "dbus-*").isEmpty() && LUtils::isValidBinary("dbus-launch")){ - command.prepend("dbus-launch --exit-with-session "); - } + //Bypass for a hidden dbus file requirement for Qt itself (Qt 5.5.1+?) + if(!QFile::exists("/etc/machine-id") && !QFile::exists("/var/db/dbus/machine-id")){ + if(LUtils::isValidBinary("dbus-uuidgen") && LUtils::runCmd("dbus-uuidgen --ensure") ){ } //good - the UUID was created successfully + else if(LUtils::isValidBinary("dbus-launch")){ command.prepend("dbus-launch --exit-with-session "); } + else{ + //create a simple DBUS UUID and put it in the universal-fallback location (OS-independent) + // TO-DO - root vs user level permissions issue? + qDebug() << "Could not find '/etc/machine-id' or '/var/db/dbus/machine-id': Qt will most likely crash. \nPlease run 'dbus-uuidgen --ensure' with root permissions to generate this file if Lumina does not start properly."; + } + } } proc->start(command, QIODevice::ReadOnly); connect(proc, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(procFinished()) ); -- cgit From 120110d558b58fb0ca530c63a6070dad44d4cd75 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 2 Dec 2016 13:47:23 -0500 Subject: Make the start menu open faster by only loading the favorites *when the file/list changes*. --- src-qt5/core/lumina-desktop/LSession.cpp | 7 ++++++- src-qt5/core/lumina-desktop/LSession.h | 1 + .../core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp | 3 ++- 3 files changed, 9 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 27b40aa3..0b5d9409 100644 --- a/src-qt5/core/lumina-desktop/LSession.cpp +++ b/src-qt5/core/lumina-desktop/LSession.cpp @@ -151,6 +151,7 @@ void LSession::setupSession(){ watcherChange( confdir+"/desktopsettings.conf" ); watcherChange( confdir+"/fluxbox-init" ); watcherChange( confdir+"/fluxbox-keys" ); + watcherChange( confdir+"/favorites.list" ); //Try to watch the localized desktop folder too if(QFile::exists(QDir::homePath()+"/"+tr("Desktop"))){ watcherChange( QDir::homePath()+"/"+tr("Desktop") ); } watcherChange( QDir::homePath()+"/Desktop" ); @@ -333,9 +334,13 @@ void LSession::watcherChange(QString changed){ desktopFiles = QDir(changed).entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs ,QDir::Name | QDir::IgnoreCase | QDir::DirsFirst); if(DEBUG){ qDebug() << "New Desktop Files:" << desktopFiles.length(); } emit DesktopFilesChanged(); - } + }else if(changed.endsWith("favorites.list")){ emit FavoritesChanged(); } //Now ensure this file was not removed from the watcher if(!watcher->files().contains(changed) && !watcher->directories().contains(changed)){ + if(!QFile::exists(changed)){ + //Create the file really quick to ensure it can be watched + //TODO + } watcher->addPath(changed); } } diff --git a/src-qt5/core/lumina-desktop/LSession.h b/src-qt5/core/lumina-desktop/LSession.h index d19cf70c..bd93289a 100644 --- a/src-qt5/core/lumina-desktop/LSession.h +++ b/src-qt5/core/lumina-desktop/LSession.h @@ -184,6 +184,7 @@ signals: void IconThemeChanged(); void DesktopConfigChanged(); void SessionConfigChanged(); + void FavoritesChanged(); void DesktopFilesChanged(); void WorkspaceChanged(); 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 a34d09db..d05ba22f 100644 --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp @@ -24,6 +24,7 @@ StartMenu::StartMenu(QWidget *parent) : QWidget(parent), ui(new Ui::StartMenu){ searchTimer->setSingleShot(true); connect(searchTimer, SIGNAL(timeout()), this, SLOT(startSearch()) ); connect(LSession::handle()->applicationMenu(), SIGNAL(AppMenuUpdated()), this, SLOT(UpdateApps()) ); + connect(LSession::handle(), SIGNAL(FavoritesChanged()), this, SLOT(UpdateFavs()) ); //Need to load the last used setting of the application list QString state = LSession::handle()->DesktopPluginSettings()->value("panelPlugs/systemstart/showcategories", "partial").toString(); if(state=="partial"){ui->check_apps_showcats->setCheckState(Qt::PartiallyChecked); } @@ -128,7 +129,7 @@ void StartMenu::UpdateMenu(bool forceall){ if(forceall){ UpdateAll(); } //Quick update routine before the menu is made visible //qDebug() << "update favs"; - UpdateFavs(); + //UpdateFavs(); //qDebug() << "check page"; if(ui->stackedWidget->currentWidget() != ui->page_main){ ui->stackedWidget->setCurrentWidget(ui->page_main); //just show the main page -- cgit From 74cae9e81c4b11df50a419e43d1f3dfab49acdfb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 5 Dec 2016 09:38:50 -0500 Subject: Add a bit more debugging to the start-lumina-desktop binary. --- src-qt5/core/lumina-session/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 73af45f9..5fa2bb69 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -33,6 +33,7 @@ int main(int argc, char ** argv) //Start X11 if needed QString disp = QString(getenv("DISPLAY")).simplified(); if(disp.isEmpty()){ + qDebug() << "No X11 session detected: Lumina will try to start one..."; //No X session found. Go ahead and re-init this binary within an xinit call QString prog = QString(argv[0]).section("/",-1); LUtils::isValidBinary(prog); //will adjust the path to be absolute @@ -40,6 +41,7 @@ int main(int argc, char ** argv) //if(LUtils::isValidBinary("x11vnc")){ args << "--" << "-listen" << "tcp"; } //need to be able to VNC into this session return QProcess::execute("xinit", args); } + qDebug() << "Starting the Lumina desktop on current X11 session:" << disp; //Setup any initialization values LTHEME::LoadCustomEnvSettings(); LXDG::setEnvironmentVars(); @@ -52,8 +54,10 @@ int main(int argc, char ** argv) //Configure X11 monitors if needed if(LUtils::isValidBinary("lumina-xconfig")){ + qDebug() << " - Resetting monitor configuration to last-used settings"; QProcess::execute("lumina-xconfig --reset-monitors"); } + qDebug() << " - Starting the session..."; //Startup the session QCoreApplication a(argc, argv); LSession sess; -- cgit From a66855211362b35033171bdecce13f02fe9aa3d7 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 5 Dec 2016 12:29:34 -0500 Subject: Have the "start-lumina-desktop" binary check for an existing lockfile and remove it before launching the desktop. --- src-qt5/core/lumina-session/lumina-session.pro | 2 +- src-qt5/core/lumina-session/main.cpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-session/lumina-session.pro b/src-qt5/core/lumina-session/lumina-session.pro index dc697a34..4b06ad60 100644 --- a/src-qt5/core/lumina-session/lumina-session.pro +++ b/src-qt5/core/lumina-session/lumina-session.pro @@ -1,6 +1,6 @@ include($${PWD}/../../OS-detect.pri) -QT = core widgets +QT = core widgets x11extras TARGET = start-lumina-desktop diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 5fa2bb69..0e076ac3 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -8,6 +8,8 @@ #include #include #include +#include +#include #include "session.h" #include @@ -16,6 +18,8 @@ #include #include +#include + #define DEBUG 0 int main(int argc, char ** argv) @@ -51,6 +55,19 @@ int main(int argc, char ** argv) //Check for any missing user config files + //Check for any stale desktop lock files and clean them up + QString cfile = QDir::tempPath()+"/.LSingleApp-%1-%2-%3"; + cfile = cfile.arg( QString(getlogin()), "lumina-desktop", QString::number(QX11Info::appScreen()) ); + if(QFile::exists(cfile)){ + qDebug() << "Found Desktop Lock for X session:" << disp; + qDebug() << " - Disabling Lock and starting new desktop session"; + QLockFile lock(cfile+"-lock"); + if(lock.isLocked()){ lock.unlock(); } + QFile::remove(cfile); + } + if(QFile::exists(QDir::tempPath()+"/.luminastopping")){ + QFile::remove(QDir::tempPath()+"/.luminastopping"); + } //Configure X11 monitors if needed if(LUtils::isValidBinary("lumina-xconfig")){ -- cgit From c6e0fe646e78a6aff588277445fde9752f886a71 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 6 Dec 2016 14:34:27 -0500 Subject: Get the new input device routines almost ready. Still have the page disabled in lumina-config right now, but it is coming along nicely. --- src-qt5/core/libLumina/LInputDevice.cpp | 181 ++++++++++++++++++++++++++++++-- src-qt5/core/libLumina/LInputDevice.h | 28 +++-- src-qt5/core/libLumina/LInputDevice.pri | 2 +- 3 files changed, 194 insertions(+), 17 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/libLumina/LInputDevice.cpp b/src-qt5/core/libLumina/LInputDevice.cpp index d141e39a..a04dd607 100644 --- a/src-qt5/core/libLumina/LInputDevice.cpp +++ b/src-qt5/core/libLumina/LInputDevice.cpp @@ -17,6 +17,8 @@ #include #include +#include + //=================== // LInputDevice Class //=================== @@ -24,8 +26,10 @@ LInputDevice::LInputDevice(unsigned int id, unsigned int type){ devID = id; devType = type; + //ATOM_FLOAT = 0; //init this when needed later //devName = name; getProperties(); //need to populate the name/atom correlations for properties + readProperties(); //populate the hash with the current values of the properties } LInputDevice::~LInputDevice(){ @@ -53,17 +57,46 @@ bool LInputDevice::isExtension(){ } // Property Management -QStringList LInputDevice::listProperties(){ +QList LInputDevice::listProperties(){ return devProps.keys(); } -QVariant LInputDevice::propertyValue(QString prop){ - if(!devProps.contains(prop)){ return QVariant(); } - //Now generate the property request - // xcb_input_get_device_property_cookie_t cookie = xcb_input_get_device_property_unchecked( QX11Info::connection(), devProps.value(prop), \ -// XCB_ATOM_ATOM, 0, 1000, devID, NULL); - QVariant result; - return result; +QString LInputDevice::propertyName(int prop){ + if(devProps.contains(prop)){ return devProps[prop].name; } + else{ return ""; } +} + +QVariant LInputDevice::getPropertyValue(int prop){ + if(devProps.contains(prop)){ return devProps[prop].value; } + else{ return QVariant(); } +} + +bool LInputDevice::setPropertyValue(int prop, QVariant value){ + if(!devProps.contains(prop)){ return false; } + //Need the float atom for some properties - make sure we have that first + /*if(ATOM_FLOAT==0){ + xcb_intern_atom_reply_t *ar = xcb_intern_atom_reply(QX11Info::connection(), \ + xcb_intern_atom(QX11Info::connection(), 0, 1, "FLOAT"), NULL); + if(ar!=0){ + ATOM_FLOAT = ar->atom; + free(ar); + } + }*/ + //Now setup the argument + bool ok = false; + QStringList args; + args << "--set-prop"; + args << QString::number(devID); + args << QString::number(prop); //prop ID + args << variantToString(value); + ok = (0 == LUtils::runCmd("xinput", args) ); + if(ok){ + //Need to update the value in the hash as well + propData dat = devProps[prop]; + dat.value = value; + devProps.insert(prop, dat); + } + return ok; } // === PRIVATE === @@ -78,12 +111,142 @@ void LInputDevice::getProperties(){ for(int i=0; inum_atoms; i++){ cookies << xcb_get_atom_name(QX11Info::connection(), atoms[i]); } for(int i=0; inum_atoms; i++){ xcb_get_atom_name_reply_t *nr = xcb_get_atom_name_reply(QX11Info::connection(), cookies[i], NULL); - devProps.insert(QString::fromUtf8( xcb_get_atom_name_name(nr), xcb_get_atom_name_name_length(nr) ),atoms[i] ); + propData DATA; + DATA.name = QString::fromUtf8( xcb_get_atom_name_name(nr), xcb_get_atom_name_name_length(nr) ); + DATA.atom = atoms[i]; + DATA.id = (int)(atoms[i]); + devProps.insert(DATA.id,DATA); ::free(nr); } //Done with data structure ::free(reply); } + +void LInputDevice::readProperties(){ + QList props = devProps.keys(); + //XINPUT UTILITY USAGE (alternative to XCB which actually works right now) + QStringList info = LUtils::getCmdOutput("xinput list-props "+QString::number(devID)); + for(int i=0; i1){ + //some kind of array + QList list; + QStringList valList = val.split(", "); + for(int j=0; jatom; + free(ar); + } + } + //Turn the reply into the proper items array (depends on format of the return data) + xcb_input_get_device_property_items_t items; + qDebug() <num_items); + void *buffer = xcb_input_get_device_property_items(reply); + xcb_input_get_device_property_items_serialize( &buffer, reply->num_items, reply->format, &items); + + //if(reply->num_items > 0){ + //qDebug() << "Format:" << reply->format << "Length:" << length; + //qDebug() << "Response Type:" << reply->response_type << "Pads:" << reply->pad0 << reply->pad1; + switch(reply->type){ + case XCB_ATOM_INTEGER: + //qDebug() << "Got Integer"; + + break; + case XCB_ATOM_CARDINAL: + //qDebug() << "Got Cardinal"; + + break; + case XCB_ATOM_STRING: + qDebug() << "Got String:"; + if(reply->format==8){ + result.setValue( QByteArray::fromRawData( (char*) xcb_input_get_device_property_items_data_8(&items), sizeof(xcb_input_get_device_property_items_data_8(&items))/sizeof(char)) ); + } + break; + case XCB_ATOM_ATOM: + //qDebug() << "Got Atom"; + + break; + default: + qDebug() << "Other Type:" << reply->type; + } + //} + free(reply); //done with this structure + return result;*/ +} + +QVariant LInputDevice::valueToVariant(QString value){ + //Read through the string and see what type of value it is + if(value.count("\"")==2){ + //String value or atom + if(value.endsWith(")")){ + //ATOM (name string +(atomID)) + return QVariant(value); //don't strip off the atom number -- keep that within the parenthesis + }else{ + //String + value = value.section("\"",1,-2); //everything between the quotes + return QVariant(value); + } + }else if(value.contains(".")){ + //float/double number + return QVariant( value.toDouble() ); + }else{ + //integer or boolian (no way to tell right now - assume all int) + bool ok = false; + int intval = value.toInt(&ok); + if(ok){ return QVariant(intval); } + } + return QVariant(); +} + +QString LInputDevice::variantToString(QVariant value){ + if( value.canConvert< QList >() ){ + //List of variants + QStringList out; + QList list = value.toList(); + for(int i=0; i() ){ + return QString::number(value.toDouble()); + }else if(value.canConvert() ){ + return QString::number(value.toInt()); + }else if( value.canConvert() ){ + //See if this is an atom first + QString val = value.toString(); + if(val.contains("(")){ val = val.section("(",1,-1).section(")",0,0); } + return val; + } + } + return ""; //nothing to return +} + //====================== // LInput Static Functions //====================== diff --git a/src-qt5/core/libLumina/LInputDevice.h b/src-qt5/core/libLumina/LInputDevice.h index f7a4713c..82dee4fd 100644 --- a/src-qt5/core/libLumina/LInputDevice.h +++ b/src-qt5/core/libLumina/LInputDevice.h @@ -18,6 +18,14 @@ #include +//Internal data structure for storing the property information +struct propData{ + int id; + QString name; + QVariant value; + xcb_atom_t atom; +}; + class LInputDevice{ public: LInputDevice(unsigned int id, unsigned int type); //don't use this directly - use the "listDevices()" function instead @@ -31,16 +39,22 @@ public: bool isExtension(); //Property Management - QStringList listProperties(); - QVariant propertyValue(QString prop); + QList listProperties(); + QString propertyName(int prop); + QVariant getPropertyValue(int prop); + bool setPropertyValue(int prop, QVariant value); private: - unsigned int devID; //device ID number - assigned at class creation - unsigned int devType; //device "use" identifier - assigned at class creation - QHash devProps; //Known device properties + unsigned int devID; //device ID number - assigned at class creation + unsigned int devType; //device "use" identifier - assigned at class creation + QHash devProps; //Known device properties + + void getProperties(); + void readProperties(); + QVariant valueToVariant(QString value); //xinput output to QVariant + QString variantToString(QVariant value); //QVariant to xinput input string - void getProperties(); - //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) + //QString devName; //device name - use this for cross-session management (id #'s can get changed every session) }; //Static functions for overall management diff --git a/src-qt5/core/libLumina/LInputDevice.pri b/src-qt5/core/libLumina/LInputDevice.pri index e90728ce..a5f88a05 100644 --- a/src-qt5/core/libLumina/LInputDevice.pri +++ b/src-qt5/core/libLumina/LInputDevice.pri @@ -10,4 +10,4 @@ HEADERS *= $${PWD}/LInputDevice.h INCLUDEPATH *= ${PWD} #include LUtils and LuminaOS -#include(LUtils.pri) +include(LUtils.pri) -- cgit From 192606e238eb5022975de61e7db6f46eb8172325 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Thu, 8 Dec 2016 16:00:54 -0500 Subject: Add a couple more options for the tip of the day. --- src-qt5/core/lumina-desktop/BootSplash.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index f6c4c5fa..5674eaff 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -16,8 +16,8 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana } void BootSplash::generateTipOfTheDay(){ - int index = qrand()%5; //Make sure this number matches the length of the case below (max value +1) - QString tip = "This desktop is generously sponsored by iXsystems\nwww.ixsystems.com"; //fallback message (just in case) + int index = qrand()%7; //Make sure this number matches the length of the case below (max value +1) + QString tip; switch(index){ case 0: tip = tr("This desktop is powered by coffee, coffee, and more coffee."); break; @@ -30,11 +30,11 @@ void BootSplash::generateTipOfTheDay(){ case 4: tip = tr("Lumina can easily reproduce the interface from most other desktop environments."); break; case 5: - tip = tr(""); break; + tip = tr("This desktop is generously sponsored by iXsystems")+"\n\nwww.ixsystems.com"; break; case 6: - tip = tr(""); break; + tip = "\""+tr("I have never been hurt by what I have not said")+"\"\n\n- Calvin Coolidge -"; break; } - ui->label_welcome->setText( "\""+tip+"\"" ); + ui->label_welcome->setText( tip); } void BootSplash::showScreen(QString loading){ //update icon, text, and progress -- cgit From 9a27567cfd00569a5ec11e18643e68097f7ed04d Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 9 Dec 2016 09:47:45 -0500 Subject: Add a ton more quotes to the login message generator. Now up to 46, which should be good enough for a while. --- src-qt5/core/lumina-desktop/BootSplash.cpp | 80 +++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index 5674eaff..8903d963 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -16,7 +16,7 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana } void BootSplash::generateTipOfTheDay(){ - int index = qrand()%7; //Make sure this number matches the length of the case below (max value +1) + int index = qrand()%46; //Make sure this number matches the length of the case below (max value +1) QString tip; switch(index){ case 0: @@ -33,6 +33,84 @@ void BootSplash::generateTipOfTheDay(){ tip = tr("This desktop is generously sponsored by iXsystems")+"\n\nwww.ixsystems.com"; break; case 6: tip = "\""+tr("I have never been hurt by what I have not said")+"\"\n\n- Calvin Coolidge -"; break; + case 7: + tip = "\""+tr("Gotta have more cowbell!")+"\"\n\n- Christopher Walken (SNL) -"; break; + case 8: + tip = "\""+tr("Everything has its beauty but not everyone sees it.")+"\"\n\n- Confucius -"; break; + case 9: + tip = "\""+tr("Before God we are all equally wise - and equally foolish.")+"\"\n\n- Albert Einstein -"; break; + case 10: + tip = "\""+tr("We cannot do everything at once, but we can do something at once.")+"\"\n\n- Calvin Coolidge -"; break; + case 11: + tip = "\""+tr("One with the law is a majority.")+"\"\n\n- Calvin Coolidge -"; break; + case 12: + tip = "\""+tr("Don't expect to build up the weak by pulling down the strong.")+"\"\n\n- Calvin Coolidge -"; break; + case 13: + tip = "\""+tr("You can't know too much, but you can say too much.")+"\"\n\n- Calvin Coolidge -"; break; + case 14: + tip = "\""+tr("Duty is not collective; it is personal.")+"\"\n\n- Calvin Coolidge -"; break; + case 15: + tip = "\""+tr("Any society that would give up a little liberty to gain a little security will deserve neither and lose both.")+"\"\n\n- Benjamin Franklin -"; break; + case 16: + tip = "\""+tr("Never trust a computer you can’t throw out a window.")+"\"\n\n- Steve Wozniak -"; break; + case 17: + tip = "\""+tr("Study the past if you would define the future.")+"\"\n\n- Confucius -"; break; + case 18: + tip = "\""+tr("The way to get started is to quit talking and begin doing.")+"\"\n\n- Walt Disney -"; break; + case 19: + tip = "\""+tr("Ask and it will be given to you; search, and you will find; knock and the door will be opened for you.")+"\"\n\n- Jesus Christ -"; break; + case 20: + tip = "\""+tr("Start where you are. Use what you have. Do what you can.")+"\"\n\n- Arthur Ashe -"; break; + case 21: + tip = "\""+tr("A person who never made a mistake never tried anything new.")+"\"\n\n- Albert Einstein -"; break; + case 22: + tip = "\""+tr("It does not matter how slowly you go as long as you do not stop.")+"\"\n\n- Confucius -"; break; + case 23: + tip = "\""+tr("Do what you can, where you are, with what you have.")+"\"\n\n- Theodore Roosevelt -"; break; + case 24: + tip = "\""+tr("Remember no one can make you feel inferior without your consent.")+"\"\n\n- Eleanor Roosevelt -"; break; + case 25: + tip = "\""+tr("It’s not the years in your life that count. It’s the life in your years.")+"\"\n\n- Abraham Lincoln -"; break; + case 26: + tip = "\""+tr("Either write something worth reading or do something worth writing.")+"\"\n\n- Benjamin Franklin -"; break; + case 27: + tip = "\""+tr("The only way to do great work is to love what you do.")+"\"\n\n- Steve Jobs -"; break; + case 28: + tip = "\""+tr("Political correctness is tyranny with manners.")+"\"\n\n- Charlton Heston -"; break; + case 29: + tip = "\""+tr("Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.")+"\"\n\n- Albert Einstein -"; break; + case 30: + tip = "\""+tr("I find that the harder I work, the more luck I seem to have.")+"\"\n\n- Thomas Jefferson -"; break; + case 31: + tip = "\""+tr("Do, or do not. There is no 'try'.")+"\"\n\n- Yoda -"; break; + case 32: + tip = "\""+tr("A mathematician is a device for turning coffee into theorems.")+"\"\n\n- Paul Erdos -"; break; + case 33: + tip = "\""+tr("Good people do not need laws to tell them to act responsibly, while bad people will find a way around the laws.")+"\"\n\n- Plato -"; break; + case 34: + tip = "\""+tr("Black holes are where God divided by zero.")+"\"\n\n- Steven Wright -"; break; + case 35: + tip = "\""+tr("It's kind of fun to do the impossible.")+"\"\n\n- Walt Disney -"; break; + case 36: + tip = "\""+tr("Knowledge speaks, but wisdom listens.")+"\"\n\n- Jimi Hendrix -"; break; + case 37: + tip = "\""+tr("A witty saying proves nothing.")+"\"\n\n- Voltaire -"; break; + case 38: + tip = "\""+tr("Success usually comes to those who are too busy to be looking for it.")+"\"\n\n- Henry David Thoreau -"; break; + case 39: + tip = "\""+tr("Well-timed silence hath more eloquence than speech.")+"\"\n\n- Martin Fraquhar Tupper -"; break; + case 40: + tip = "\""+tr("I have never let my schooling interfere with my education.")+"\"\n\n- Mark Twain -"; break; + case 41: + tip = "\""+tr("The best way to predict the future is to invent it.")+"\"\n\n- Alan Kay -"; break; + case 42: + tip = "\""+tr("Well done is better than well said.")+"\"\n\n- Benjamin Franklin -"; break; + case 43: + tip = "\""+tr("Sometimes it is not enough that we do our best; we must do what is required.")+"\"\n\n- Sir Winston Churchill -"; break; + case 44: + tip = "\""+tr("The truth is more important than the facts.")+"\"\n\n- Frank Lloyd Wright -"; break; + case 45: + tip = "\""+tr("Better to remain silent and be thought a fool than to speak out and remove all doubt.")+"\"\n\n- Abraham Lincoln -"; break; } ui->label_welcome->setText( tip); } -- cgit From d3cec7b2198761622f444dc5a18db2cc2c7fecfa Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 13 Dec 2016 11:44:35 -0500 Subject: Add new options for the Lumina tips: If a lumina-motd file (executable or text) is found within one of the etc directories (/usr/local/etc/lumina-motd on FreeBSD) or as a valid binary on PATH, then that file will be "preferred" for generating the tips rather than the built-in system. This allows system administrators and/or OS-distributors to customize the login messages "at will" for their particular use-case. NOTE: By making the lumina-motd file a blank text file the tips will be disabled. --- src-qt5/core/lumina-desktop/BootSplash.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src-qt5/core') diff --git a/src-qt5/core/lumina-desktop/BootSplash.cpp b/src-qt5/core/lumina-desktop/BootSplash.cpp index 8903d963..1a648973 100644 --- a/src-qt5/core/lumina-desktop/BootSplash.cpp +++ b/src-qt5/core/lumina-desktop/BootSplash.cpp @@ -16,8 +16,24 @@ BootSplash::BootSplash() : QWidget(0, Qt::SplashScreen | Qt::X11BypassWindowMana } void BootSplash::generateTipOfTheDay(){ - int index = qrand()%46; //Make sure this number matches the length of the case below (max value +1) + //Try to find a system-defined message of the day for lumina + QStringList dirs; dirs << LOS::AppPrefix()+"/etc/" << LOS::SysPrefix()+"/etc/" << L_ETCDIR+"/"; + QString sysMOTD = "lumina-motd"; + for(int i=0; ilabel_welcome->setText( tip); } -- cgit