From 7f65c0f2ce6d89a52cc24dfd250d897c3523bdc5 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Thu, 22 Jun 2017 13:55:03 +0000 Subject: Translated using Weblate (lumina_DESKTOP@da (generated)) Currently translated at 100.0% (325 of 325 strings) --- .../core/lumina-desktop/i18n/lumina-desktop_da.ts | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) 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 4016fb99..d28fbbc4 100644 --- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts +++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_da.ts @@ -265,12 +265,12 @@ - Don't expect to build up the weak by pulling down the strong. + Don't expect to build up the weak by pulling down the strong. Forvent ikke at opbygge det svage ved at nedrive det stærke. - You can't know too much, but you can say too much. + You can't know too much, but you can say too much. Du kan ikke vide for meget, men du kan sige for meget. @@ -350,7 +350,7 @@ - Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. + Only two things are infinite, the universe and human stupidity, and I'm not sure about the former. Kun to ting er uendelige, universet og menneskelig dumhed, og jeg er ikke sikker på det første. @@ -360,8 +360,8 @@ - Do, or do not. There is no 'try'. - Gør eller lad være. Der er ikke noget "prøv". + Do, or do not. There is no 'try'. + Gør eller lad være. Der er ikke noget "prøv". @@ -380,7 +380,7 @@ - It's kind of fun to do the impossible. + It's kind of fun to do the impossible. Det er egentligt sjovt at gøre det umulige. @@ -773,24 +773,24 @@ Desktop Actions - + Skrivebordshandlinger New Folder - + Ny mappe New File - + Ny fil Paste - + Indsæt @@ -827,7 +827,7 @@ Desktop - Skrivebord + Skrivebord @@ -874,7 +874,7 @@ Volume - + Lydstyrke @@ -1416,22 +1416,22 @@ Suspend - Dvale + Dvale Restart - Genstart + Genstart Power Off - + Sluk Log Out - Log ud + Log ud @@ -1501,7 +1501,7 @@ Power Off - + Sluk -- cgit From 06e898014a3a9dba1b89fa9a6539002607ee4f7f Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 20 Jun 2017 14:48:38 -0400 Subject: Added missing icon and Null Reciever from comparing INFO in destructor --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp index 3e0150e2..02d064ab 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp @@ -15,7 +15,7 @@ #include //LFileInfo INFO = LFileInfo(""); - + MainUI::MainUI() : QDialog(), ui(new Ui::MainUI){ ui->setupUi(this); //load the designer form canwrite = false; @@ -27,14 +27,16 @@ MainUI::MainUI() : QDialog(), ui(new Ui::MainUI){ MainUI::~MainUI(){ terminate_thread = true; - if(INFO!=0){ delete INFO; } + disconnect(this, SIGNAL(folder_size_changed(quint64, quint64, quint64, bool )) ); + if(!INFO){ delete INFO; } + this->close(); } //============= // PUBLIC //============= void MainUI::LoadFile(QString path, QString type){ - + //Do the first file information tab qDebug() << "Load File:" << path << type; INFO = new LFileInfo(path); @@ -51,7 +53,6 @@ void MainUI::LoadFile(QString path, QString type){ if(type=="APP"){ INFO->XDG()->type = XDGDesktop::APP; } else if(type=="LINK"){ INFO->XDG()->type = XDGDesktop::LINK; } } - //First load the general file information if(!INFO->filePath().isEmpty()){ ui->label_file_name->setText( INFO->fileName() ); @@ -106,7 +107,7 @@ void MainUI::LoadFile(QString path, QString type){ qDebug() << "Check XDG Info:" << type; //qDebug() << INFO->isDesktopFile() << type; if(INFO->isDesktopFile() || !type.isEmpty()){ - + if(INFO->XDG()->type == XDGDesktop::APP){ ui->line_xdg_command->setText(INFO->XDG()->exec); ui->line_xdg_wdir->setText(INFO->XDG()->path); @@ -126,9 +127,9 @@ void MainUI::LoadFile(QString path, QString type){ ui->lblWorkingDir->setText(tr("URL:")); ui->line_xdg_wdir->setText( INFO->XDG()->url ); ui->tool_xdg_getDir->setVisible(false); //the dir selection button - + } - ui->line_xdg_name->setText(INFO->XDG()->name); + ui->line_xdg_name->setText(INFO->XDG()->name); ui->line_xdg_comment->setText(INFO->XDG()->comment); ui->push_xdg_getIcon->setWhatsThis( INFO->XDG()->icon ); ReloadAppIcon(); @@ -142,12 +143,12 @@ void MainUI::LoadFile(QString path, QString type){ }else{ xdgvaluechanged(); //just do the disables here //Also remove the xdg tab - if(ui->tabWidget->indexOf(ui->tab_deskedit) >= 0){ + if(ui->tabWidget->indexOf(ui->tab_deskedit) >= 0){ qDebug() << "Removing the deskedit tab"; ui->tabWidget->removeTab( ui->tabWidget->indexOf(ui->tab_deskedit) ); } } - //Setup the tab + //Setup the tab if(type.isEmpty()){ ui->tabWidget->setCurrentIndex(0); } else if(ui->tabWidget->count()>1){ ui->tabWidget->setCurrentIndex(1); } qDebug() << "Done Loading File"; @@ -157,8 +158,8 @@ void MainUI::UpdateIcons(){ this->setWindowIcon(LXDG::findIcon("document-preview","unknown")); ui->push_close->setIcon( LXDG::findIcon("dialog-close","") ); ui->push_save->setIcon( LXDG::findIcon("document-save","") ); - ui->tool_xdg_getCommand->setIcon( LXDG::findIcon("edit-find-project","") ); - ui->tool_xdg_getDir->setIcon( LXDG::findIcon("document-open","") ); + ui->tool_xdg_getCommand->setIcon( LXDG::findIcon("edit-find-page","") ); + ui->tool_xdg_getDir->setIcon( LXDG::findIcon("document-open","") ); } //============== @@ -234,7 +235,6 @@ void MainUI::on_push_close_clicked(){ if(ui->push_save->isEnabled()){ //Still have unsaved changes //TO-DO - prompt for whether to save the changes - } this->close(); } @@ -317,7 +317,7 @@ void MainUI::on_push_xdg_getIcon_clicked(){ for(int i=0; ipush_xdg_getIcon->setWhatsThis(file); + ui->push_xdg_getIcon->setWhatsThis(file); ReloadAppIcon(); xdgvaluechanged(); } @@ -329,7 +329,7 @@ void MainUI::xdgvaluechanged(){ //Compare the current UI values to the file values ui->push_save->setEnabled(canwrite); //assume changed at this point // TO-DO - + }else{ ui->push_save->setVisible(false); ui->push_save->setEnabled(false); -- cgit From ec0d2eb5f63712f9d2de3c1facd1e0aee1554189 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Tue, 20 Jun 2017 14:53:00 -0400 Subject: Fixed number syntax in C++ --- src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax index f504263e..4efd7fb3 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax +++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax @@ -45,7 +45,7 @@ }, { "name": "numbers", - "regex" : "\\b[0-9\\.]+\\b", + "regex" : "\\b[0-9]+\\.?[0-9]*\\b", "foreground": "colors/text" }, { -- cgit From 75a062d3009a958ee0af0b6b0c7615a0eb9cd472 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Wed, 21 Jun 2017 15:52:01 -0400 Subject: Removed error when trying to delete pointer --- src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp index 02d064ab..d82f09ce 100644 --- a/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-fileinfo/MainUI.cpp @@ -27,8 +27,6 @@ MainUI::MainUI() : QDialog(), ui(new Ui::MainUI){ MainUI::~MainUI(){ terminate_thread = true; - disconnect(this, SIGNAL(folder_size_changed(quint64, quint64, quint64, bool )) ); - if(!INFO){ delete INFO; } this->close(); } -- cgit From 7792d26f2e91ef9cf160ba46b3915d7deb3d2177 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Thu, 22 Jun 2017 10:02:42 -0400 Subject: Fixed nullReceiver error in Lumina-fm --- src-qt5/desktop-utils/lumina-fm/Browser.cpp | 19 ++++----- src-qt5/desktop-utils/lumina-fm/Browser.h | 2 +- src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp | 50 +++++++++++------------ src-qt5/desktop-utils/lumina-fm/BrowserWidget.h | 6 +-- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index 010196a4..1d57dd8c 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -16,7 +16,7 @@ Browser::Browser(QObject *parent) : QObject(parent){ watcher = new QFileSystemWatcher(this); connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(fileChanged(QString)) ); - connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(dirChanged(QString)) ); + connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(dirChanged(QString)) ); showHidden = false; showThumbs = false; imageFormats = LUtils::imageExtensions(false); //lowercase suffixes @@ -52,7 +52,6 @@ bool Browser::showingThumbnails(){ // PRIVATE void Browser::loadItem(QString info, Browser *obj){ - //qDebug() << "LoadItem:" << info; QImage pix; if(imageFormats.contains(info.section(".",-1).toLower()) ){ QFile file(info); @@ -88,30 +87,30 @@ void Browser::fileChanged(QString file){ } void Browser::dirChanged(QString dir){ + if(dir==currentDir){ QTimer::singleShot(500, this, SLOT(loadDirectory()) ); } else if(dir.startsWith(currentDir)){ QtConcurrent::run(this, &Browser::loadItem, dir, this ); } } void Browser::futureFinished(QString name, QImage icon){ //Note: this will be called once for every item that loads - qDebug() << "Future Finished:" << name; - QIcon ico; - LFileInfo info(name); + QIcon ico; + //LFileInfo info(name); + LFileInfo *info = new LFileInfo(name); if(!icon.isNull()){ //qDebug() << " -- Data:"; QPixmap pix = QPixmap::fromImage(icon); ico.addPixmap(pix); - }else if(info.isDir()){ + }else if(info->isDir()){ //qDebug() << " -- Folder:"; ico = loadIcon("folder"); } if(ico.isNull()){ //qDebug() << " -- MimeType:" << info.fileName() << info.mimetype(); - ico = loadIcon(info.iconfile()); + ico = loadIcon(info->iconfile()); } - qDebug() << " -- emit signal"; - this->emit itemDataAvailable( ico, info ); - qDebug() << " -- done:" << name; + this->emit itemDataAvailable( ico, info); + //qDebug() << " -- done:" << name; } // PUBLIC SLOTS diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.h b/src-qt5/desktop-utils/lumina-fm/Browser.h index 40e98753..94f6ba3f 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.h +++ b/src-qt5/desktop-utils/lumina-fm/Browser.h @@ -63,7 +63,7 @@ signals: //Main Signals void itemRemoved(QString item); //emitted if a file was removed from the underlying void clearItems(); //emitted when dirs change for example - void itemDataAvailable(QIcon, LFileInfo); + void itemDataAvailable(QIcon, LFileInfo*); //Start/Stop signals for loading of data void itemsLoading(int); //number of items which are getting loaded diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp index a64c03ca..b2ebd476 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.cpp @@ -22,7 +22,7 @@ BrowserWidget::BrowserWidget(QString objID, QWidget *parent) : QWidget(parent){ BROWSER = new Browser(this); connect(BROWSER, SIGNAL(clearItems()), this, SLOT(clearItems()) ); connect(BROWSER, SIGNAL(itemRemoved(QString)), this, SLOT(itemRemoved(QString)) ); - connect(BROWSER, SIGNAL(itemDataAvailable(QIcon, LFileInfo)), this, SLOT(itemDataAvailable(QIcon, LFileInfo)) ); + connect(BROWSER, SIGNAL(itemDataAvailable(QIcon, LFileInfo*)), this, SLOT(itemDataAvailable(QIcon, LFileInfo*)) ); connect(BROWSER, SIGNAL(itemsLoading(int)), this, SLOT(itemsLoading(int)) ); connect(this, SIGNAL(dirChange(QString)), BROWSER, SLOT(loadDirectory(QString)) ); listWidget = 0; @@ -118,7 +118,7 @@ bool BrowserWidget::hasThumbnails(){ void BrowserWidget::setThumbnailSize(int px){ bool larger = true; - if(listWidget!=0){ + if(listWidget!=0){ larger = listWidget->iconSize().height() < px; listWidget->setIconSize(QSize(px,px)); }else if(treeWidget!=0){ @@ -138,7 +138,7 @@ int BrowserWidget::thumbnailSize(){ void BrowserWidget::setHistory(QStringList paths){ //NOTE: later items are used first - historyList = paths; + historyList = paths; } QStringList BrowserWidget::history(){ @@ -192,7 +192,7 @@ QStringList BrowserWidget::currentItems(int type){ }else if(i==0){ //ALL paths << listWidget->item(i)->whatsThis(); } - } + } }else if(treeWidget!=0){ for(int i=0; itopLevelItemCount(); i++){ if(i<0 && !treeWidget->topLevelItem(i)->text(1).isEmpty()){ //FILES @@ -270,45 +270,46 @@ void BrowserWidget::itemRemoved(QString item){ } } -void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo info){ - //qDebug() << "Item Data Available:" << info.fileName(); +void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo *info){ + //qDebug() << "Item Data Available:" << info->fileName(); int num = 0; if(listWidget!=0){ //LIST WIDGET - name and icon only - if(!listWidget->findItems(info.fileName(), Qt::MatchExactly).isEmpty()){ + if(!listWidget->findItems(info->fileName(), Qt::MatchExactly).isEmpty()){ //Update existing item - QListWidgetItem *it = listWidget->findItems(info.fileName(), Qt::MatchExactly).first(); - it->setText(info.fileName()); - it->setWhatsThis(info.absoluteFilePath()); + QListWidgetItem *it = listWidget->findItems(info->fileName(), Qt::MatchExactly).first(); + it->setText(info->fileName()); + it->setWhatsThis(info->absoluteFilePath()); it->setIcon(ico); }else{ //New item - QListWidgetItem *it = new CQListWidgetItem(ico, info.fileName(), listWidget); - it->setWhatsThis(info.absoluteFilePath()); - it->setData(Qt::UserRole, (info.isDir() ? "dir" : "file")); //used for sorting + QListWidgetItem *it = new CQListWidgetItem(ico, info->fileName(), listWidget); + it->setWhatsThis(info->absoluteFilePath()); + it->setData(Qt::UserRole, (info->isDir() ? "dir" : "file")); //used for sorting listWidget->addItem(it); } num = listWidget->count(); }else if(treeWidget!=0){ QTreeWidgetItem *it = 0; - if( ! treeWidget->findItems(info.fileName(), Qt::MatchExactly, 0).isEmpty() ){ it = treeWidget->findItems(info.fileName(), Qt::MatchExactly, 0).first(); } - else{ - it = new CQTreeWidgetItem(treeWidget); - it->setText(0, info.fileName() ); //name (0) + if( ! treeWidget->findItems(info->fileName(), Qt::MatchExactly, 0).isEmpty() ){ it = treeWidget->findItems(info->fileName(), Qt::MatchExactly, 0).first(); } + else{ + it = new CQTreeWidgetItem(treeWidget); + it->setText(0, info->fileName() ); //name (0) treeWidget->addTopLevelItem(it); } //Now set/update all the data it->setIcon(0, ico); - it->setText(1, info.isDir() ? "" : LUtils::BytesToDisplaySize(info.size()) ); //size (1) - it->setText(2, info.mimetype() ); //type (2) - it->setText(3, DTtoString(info.lastModified() )); //modification date (3) - it->setText(4, DTtoString(info.created()) ); //creation date (4) + it->setText(1, info->isDir() ? "" : LUtils::BytesToDisplaySize(info->size()) ); //size (1) + it->setText(2, info->mimetype() ); //type (2) + it->setText(3, DTtoString(info->lastModified() )); //modification date (3) + it->setText(4, DTtoString(info->created()) ); //creation date (4) //Now all the hidden data - it->setWhatsThis(0, info.absoluteFilePath()); - it->setWhatsThis(3, info.lastModified().toString("yyyyMMddhhmmsszzz") ); //sorts by this actually - it->setWhatsThis(4, info.created().toString("yyyyMMddhhmmsszzz") ); //sorts by this actually + it->setWhatsThis(0, info->absoluteFilePath()); + it->setWhatsThis(3, info->lastModified().toString("yyyyMMddhhmmsszzz") ); //sorts by this actually + it->setWhatsThis(4, info->created().toString("yyyyMMddhhmmsszzz") ); //sorts by this actually num = treeWidget->topLevelItemCount(); } + if(num < numItems){ //Still loading items //this->setEnabled(false); @@ -341,7 +342,6 @@ void BrowserWidget::itemDataAvailable(QIcon ico, LFileInfo info){ } } } - if( (nF+nD) >0){ stats.prepend("\t"); if(nF>0){ diff --git a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h index a0c8fae6..fafb3746 100644 --- a/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h +++ b/src-qt5/desktop-utils/lumina-fm/BrowserWidget.h @@ -72,7 +72,7 @@ private slots: //Browser connections void clearItems(); void itemRemoved(QString); - void itemDataAvailable(QIcon, LFileInfo); + void itemDataAvailable(QIcon, LFileInfo*); void itemsLoading(int total); void selectionChanged(); @@ -86,9 +86,9 @@ signals: void contextMenuRequested(); void DataDropped(QString, QStringList); void hasFocus(QString); //ID output - + //Internal signal void dirChange(QString); //current dir path - + }; #endif -- cgit From 44e2b68b2f419fa6962a2c3ca1e02870cff4d780 Mon Sep 17 00:00:00 2001 From: ZackaryWelch Date: Thu, 22 Jun 2017 10:40:23 -0400 Subject: Fixed two missing icons in Lumina Archiver --- src-qt5/desktop-utils/lumina-archiver/MainUI.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp index 9b77a477..2dae90a4 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp @@ -355,8 +355,8 @@ void MainUI::ProcFinished(bool success, QString msg){ ui->label_progress->setText(msg); ui->label_progress->setVisible(!msg.isEmpty()); ui->label_progress_icon->setVisible(!msg.isEmpty()); - if(success){ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-complete","").pixmap(32,32) );} - else{ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-attention","").pixmap(32,32) );} + if(success){ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-done","").pixmap(32,32) );} + else{ ui->label_progress_icon->setPixmap( LXDG::findIcon("task-question","").pixmap(32,32) );} QFileInfo info(BACKEND->currentFile()); bool canmodify = info.isWritable(); if(!info.exists()){ canmodify = QFileInfo(BACKEND->currentFile().section("/",0,-2)).isWritable(); } -- cgit