From 22387bf6f3ab740630955caa8f2170db8a1f954c Mon Sep 17 00:00:00 2001 From: Tommi Nieminen Date: Wed, 20 Sep 2017 13:41:55 +0000 Subject: Translated using Weblate (Finnish) Currently translated at 100.0% (88 of 88 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/fi/ --- .../lumina-archiver/i18n/l-archiver_fi.ts | 176 ++++++++++----------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts index eace2dca..e1832938 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts @@ -6,22 +6,22 @@ Could not read archive - + Arkistoa ei voitu lukea Archive Loaded - + Arkisto ladattu Extraction Finished - + Purku valmis Modification Finished - + Muutos valmis @@ -29,307 +29,307 @@ Archive: - + Arkisto: File - + Tiedosto Edit - + Muokkaa Burn to Disk - + Polta levylle &Open Archive - + &Avaa arkisto Open archive - + Avaa arkisto &New Archive - + &Uusi arkisto New archive - + Uusi arkisto &Quit - + &Lopeta Add File(s) - + Lisää tiedostoja Add files to archive - + Lisää arkistoon tiedostoja Remove File(s) - + Poista tiedostoja Remove selection from archive - + Poista arkistosta tiedostoja Extract All - + Pura kaikki Extract archive into a directory - + Pura arkisto kansioon Add Directory - + Lisää kansio Add directory to archive - + Lisää arkistoon kansio Extract Selection - + Pura valinta Extract Selected Items - + Pura valitut kohteet USB Image - + USB-levykuva Copy an IMG to a USB device (may require admin permission) - + Kopioi IMG-levykuva USB-laitteeseen (voi vaatia ylläpitäjän oikeuksia) Archive Manager - + Arkistonhallinta Admin Mode - + Ylläpitäjän tila CTRL+N - + Ctrl+N CTRL+O - + Ctrl+O CTRL+Q - + Ctrl+Q CTRL+E - + Ctrl+E MimeType - + MIME-tyyppi Size - + Koko Opening Archive... - + Avataan arkistoa... All Types %1 - + Kaikki tyypit %1 Uncompressed Archive (*.tar) - + Pakkaamaton arkisto (*.tar) GZip Compressed Archive (*.tar.gz *.tgz) - + GZip-pakattu arkisto (*.tar.gz *.tgz) BZip Compressed Archive (*.tar.bz *.tbz) - + BZip-pakattu arkisto (*.tar.bz *.tbz) BZip2 Compressed Archive (*.tar.bz2 *.tbz2) - + BZip2-pakattu arkisto (*.tar.bz2 *.tbz2) LMZA Compressed Archive (*.tar.lzma *.tlz) - + LMZA-pakattu arkisto (*.tar.lzma *.tlz) XZ Compressed Archive (*.tar.xz *.txz) - + XZ-pakattu arkisto (*.tar.xz *.txz) CPIO Archive (*.cpio) - + CPIO-arkisto (*.cpio) PAX Archive (*.pax) - + PAX-arkisto (*.pax) AR Archive (*.ar) - + AR-arkisto (*.ar) SHAR Archive (*.shar) - + SHAR-arkisto (*.shar) Zip Archive (*.zip) - + Zip-arkisto (*.zip) 7-Zip Archive (*.7z) - + 7-Zip-arkisto (*.7z) All Known Types %1 - + Kaikki tunnetut tyypit %1 READ-ONLY: ISO image (*.iso *.img) - + VAIN LUKU: ISO-levykuva (*.iso *.img) READ-ONLY: XAR archive (*.xar) - + VAIN LUKU: XAR-arkisto (*.xar) READ-ONLY: Java archive (*.jar) - + VAIN LUKU: Java-arkisto (*.jar) READ-ONLY: RedHat Package (*.rpm) - + VAIN LUKU: RedHat-paketti (*.rpm) Show All Files (*) - + Näytä kaikki tiedostot (*) Create Archive - + Luo arkisto Error - + Virhe Could not overwrite file: - + Ei voitu korvata tiedostoa: Open Archive - + Avaa arkisto Add to Archive - + Lisää arkistoon Adding Items... - + Lisätään kohteita... Removing Items... - + Poistetaan kohteita... Extract Into Directory - + Pura kansioon @@ -337,12 +337,12 @@ Extracting... - + Puretaan... Link To: %1 - + Linkki kohteeseen: %1 @@ -350,127 +350,127 @@ Burn IMG to device - + Polta IMG-levykuva laitteelle IMG File - + IMG-tiedosto Block Size - + Lohkokoko USB Device - + USB-laite Refresh Device List - + Virkistä laiteluettelo Wipe all extra space on device (conv = sync) - + Pyyhi laitteen kaikki ylimääräinen tila (conv=sync) Burning to USB: - + Poltetaan USB:lle: Time Elapsed: - + Aikaa kulunut: Cancel - + Peru Start - + Käynnistä Burn IMG to Device - + Polta IMG-levykuva laitteelle Admin Mode - + Ylläpitäjän tila Kilobyte(s) - + kilotavu(a) Megabyte(s) - + megatavu(a) Gigabyte(s) - + gigatavu(a) Cancel Image Burn? - + Perutaanko levykuvan poltto? Do you wish to stop the current IMG burn process? - + Haluatko pysäyttää käynnissä olevan IMG-levykuvan polton? Warning: This will leave the USB device in an inconsistent state - + Varoitus: Tämä jättää USB-laitteesi epävakaaseen tilaan Administrator Permissions Needed - + Ylläpitäjäoikeudet vaaditaan This operation requires administrator priviledges. - + Tämä toiminto vaatii ylläpitäjän oikeuksia. Would you like to enable these priviledges? - + Haluatko ottaa nämä oikeudet käyttöön? ERROR - + VIRHE The process could not be completed: - + Toimenpidettä ei saatu loppuun: SUCCESS - + ONNISTUI The image was successfully burned to the USB device - + Levykuva poltettiin ongelmitta USB-laitteelle -- cgit From c1d7a162fa79b8f1c30ef519fbd631ceaffa5261 Mon Sep 17 00:00:00 2001 From: Moo Date: Sat, 26 Aug 2017 11:23:18 +0000 Subject: Translated using Weblate (Lithuanian) Currently translated at 96.5% (85 of 88 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/lt/ --- src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts index bfe38ea6..f04b12a6 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts @@ -445,12 +445,12 @@ This operation requires administrator priviledges. - + Ši operacija reikalauja administratoriaus teisių. Would you like to enable these priviledges? - + Ar norėtumėte leisti šias teises? -- cgit From 2c91b1cb93893d427e5890092aae2a48c57cee35 Mon Sep 17 00:00:00 2001 From: Davidmp Date: Wed, 20 Sep 2017 14:55:34 +0000 Subject: Translated using Weblate (Catalan) Currently translated at 100.0% (101 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/ca/ --- .../lumina-archiver/i18n/l-archiver_ca.ts | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts index 98930879..f39823f0 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts @@ -6,7 +6,7 @@ Could not read archive - No s'ha pogut llegir l'arxiu + No s'ha pogut llegir l'arxiu @@ -81,7 +81,7 @@ Add files to archive - Afegiu fitxers a l'arxiu + Afegiu fitxers a l'arxiu @@ -91,7 +91,7 @@ Remove selection from archive - Elimina la selecció de l'arxiu + Elimina la selecció de l'arxiu @@ -101,7 +101,7 @@ Extract archive into a directory - Extreu l'arxiu en un directori + Extreu l'arxiu en un directori @@ -111,7 +111,7 @@ Add directory to archive - Afegeix un directori a l'arxiu + Afegeix un directori a l'arxiu @@ -131,17 +131,17 @@ Copy an IMG to a USB device (may require admin permission) - Copia una IMG en un dispositiu USB (pot caldre permís d'administrador) + Copia una IMG en un dispositiu USB (pot caldre permís d'administrador) Archive Manager - Gestor d'arxius + Gestor d'arxius Admin Mode - Mode d'administrador + Mode d'administrador @@ -179,7 +179,7 @@ Opening Archive... - S'obre l'arxiu... + S'obre l'arxiu... @@ -301,7 +301,7 @@ Could not overwrite file: - No s'ha pogut sobreescriure el fitxer: + No s'ha pogut sobreescriure el fitxer: @@ -312,18 +312,18 @@ Add to Archive - Afegeix a l'arxiu + Afegeix a l'arxiu Adding Items... - S'afegeixen elements... + S'afegeixen elements... Removing Items... - S'eliminen elements... + S'eliminen elements... @@ -337,7 +337,7 @@ Extracting... - S'extreu... + S'extreu... @@ -350,67 +350,67 @@ 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 @@ -443,7 +443,7 @@ Wipe all extra space on device (conv = sync) - Neteja tot l'espai extra al dispositiu (conv = sync) + Neteja tot l'espai extra al dispositiu (conv = sync) @@ -473,7 +473,7 @@ Admin Mode - Mode d'administrador + Mode d'administrador @@ -508,12 +508,12 @@ Administrator Permissions Needed - Calen permisos d'administrador + Calen permisos d'administrador This operation requires administrator priviledges. - Aquesta operació requereix privilegis d'administrador. + Aquesta operació requereix privilegis d'administrador. @@ -528,7 +528,7 @@ The process could not be completed: - El procés no s'ha pogut completar: + El procés no s'ha pogut completar: @@ -538,7 +538,7 @@ The image was successfully burned to the USB device - La imatge s'ha gravat correctament al dispositiu USB. + La imatge s'ha gravat correctament al dispositiu USB. -- cgit From 87b64504cec8f071e51a51b853b0bce0cafebb78 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Wed, 20 Sep 2017 21:24:28 +0000 Subject: Translated using Weblate (Danish) Currently translated at 100.0% (101 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/da/ --- .../lumina-archiver/i18n/l-archiver_da.ts | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_da.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_da.ts index de00be03..ad4de0bd 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_da.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_da.ts @@ -350,67 +350,67 @@ 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 -- cgit From 04cac79681e1b585b31cbdf24f9c58c1195988a0 Mon Sep 17 00:00:00 2001 From: Davidmp Date: Wed, 20 Sep 2017 14:58:11 +0000 Subject: Translated using Weblate (Catalan) Currently translated at 100.0% (101 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/ca/ --- src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts index f39823f0..9e347a2a 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_ca.ts @@ -390,7 +390,7 @@ Settings - Configuració + Paràmetres -- cgit From d731985427420c462d845b4279b14238e5527cae Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 4 Oct 2017 09:51:31 -0400 Subject: Finish up the auto archive/extract within lumina-archiver (with JT) --- src-qt5/desktop-utils/lumina-archiver/MainUI.cpp | 75 ++++++++++++++-------- src-qt5/desktop-utils/lumina-archiver/MainUI.h | 17 ++--- .../desktop-utils/lumina-archiver/TarBackend.cpp | 5 +- src-qt5/desktop-utils/lumina-archiver/TarBackend.h | 2 +- 4 files changed, 59 insertions(+), 40 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp index 9d220824..215fc64e 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp @@ -20,7 +20,11 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI){ ui->setupUi(this); - auto_extract_close = false; + delayClose = new QTimer(this); + delayClose->setInterval(500); + delayClose->setSingleShot(true); + connect(delayClose, SIGNAL(timeout()), this, SLOT(close()) ); + QString title = tr("Archive Manager"); if( getuid()==0){ title.append(" ("+tr("Admin Mode")+")"); } this->setWindowTitle(title); @@ -70,33 +74,34 @@ MainUI::~MainUI(){ } void MainUI::LoadArguments(QStringList args){ - bool burnIMG = false; - bool autoExtract = false; - //bool autoArchive = false; + int action = -1; // 0: burnIMG, 1: autoExtract, 2: autoArchive + QStringList files; for(int i=0; ilabel_progress->setText(tr("Opening Archive...")); - if(autoExtract){ - connect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); - connect(BACKEND, SIGNAL(ExtractSuccessful()), this, SLOT(close()) ); - } - BACKEND->loadFile(args[i]); - ui->actionUSB_Image->setEnabled(args[i].simplified().endsWith(".img")); - if(burnIMG){ BurnImgToUSB(); } //Go ahead and launch the burn dialog right away - break; + if(args[i].startsWith("--") ){ + if(action>=0){ break; } + else if(args[i]=="--burn-img"){ action = 0; continue; } + else if(args[i]=="--ax"){ action = 1; continue; } + else if(args[i]=="--aa"){ action = 2; continue; } + }else{ + files << args[i]; } - //if(autoArchive){ - //get rest of arguments - //for(int i=1; ilabel_progress->setText(tr("Opening Archive...")); + if(action==1){ + connect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); + connect(BACKEND, SIGNAL(ExtractSuccessful()), delayClose, SLOT(start()) ); + }else if(action==2){ + aaFileList.clear(); + for(int j=1; jloadFile(files[0]); + ui->actionUSB_Image->setEnabled(files[0].simplified().endsWith(".img")); + if(action==0){ BurnImgToUSB(); } //Go ahead and launch the burn dialog right away + } void MainUI::loadIcons(){ @@ -258,13 +263,27 @@ void MainUI::autoextractFiles(){ disconnect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); QString dir = BACKEND->currentFile().section("/",0,-2); //parent directory of the archive if(dir.isEmpty()){ return; } + QDir tmp(dir); + QString name = BACKEND->currentFile().section("/",-1).section(".",0,0); + if(QFile::exists(dir+"/"+name)){ + int num = 1; + while( QFile::exists(dir+"/"+name+"_"+QString::number(num))){ num++; } + name = name+"_"+QString::number(num); + } + if(tmp.mkdir(name) ){ + dir.append("/"+name); //created sub directory + } ui->label_progress->setText(tr("Extracting...")); BACKEND->startExtract(dir, true); } -/* -void MainUI::autoArchiveFiles(aaFileList){ -*/ + +void MainUI::autoArchiveFiles(){ + qDebug() << "Auto Archive Files:" << aaFileList; + ui->label_progress->setText(tr("Adding Items...")); + BACKEND->startAdd(aaFileList); +} + void MainUI::extractSelection(){ if(ui->tree_contents->currentItem()==0){ return; } //nothing selected diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.h b/src-qt5/desktop-utils/lumina-archiver/MainUI.h index a2687895..a16d5862 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.h +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.h @@ -10,6 +10,7 @@ #include #include #include +#include #include "TarBackend.h" @@ -24,20 +25,20 @@ public: ~MainUI(); void LoadArguments(QStringList); - void loadIcons(); - //QStringList aaFileList; + void loadIcons(); private: Ui::MainUI *ui; Backend *BACKEND; - bool auto_extract_close; + QStringList aaFileList; + QTimer *delayClose; QTreeWidgetItem* findItem(QString path, QTreeWidgetItem *start = 0); bool cleanItems(QStringList list, QTreeWidgetItem *start = 0); //returns true if anything gets cleaned //Functions for setting the valid file extensions ("tar" limitations) QString CreateFileTypes(); - QString OpenFileTypes(); + QString OpenFileTypes(); private slots: void NewArchive(); @@ -45,14 +46,14 @@ private slots: void addFiles(); void addDirs(); void remFiles(); - void extractFiles(); - void autoextractFiles(); - //void autoArchiveFiles(QStringList aaFileList); + void extractFiles(); + void autoextractFiles(); + void autoArchiveFiles(); void extractSelection(); void ViewFile(QTreeWidgetItem *it); void UpdateTree(); - void BurnImgToUSB(); + void BurnImgToUSB(); //Backend Handling void ProcStarting(); diff --git a/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp b/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp index e0b802a4..f110624b 100644 --- a/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp @@ -36,7 +36,7 @@ void Backend::loadFile(QString path){ flags.clear(); flags << "-f" << filepath; //add the actual archive path if(QFile::exists(path)){ startList(); qDebug () << "BACKEND LOAD startList has started";} - else{ contents.clear(); emit ProcessFinished(true, ""); } + else{ contents.clear(); emit FileLoaded(); emit ProcessFinished(true, ""); } } bool Backend::canModify(){ @@ -262,8 +262,7 @@ void Backend::procFinished(int retcode, QProcess::ExitStatus){ } } if(args.contains("-x")){ result = tr("Extraction Finished"); emit ExtractSuccessful(); } - //if(args.contains("-aa")){ result = tr("Archival Finished"); emit ArchivalSuccessful(); } - else if(args.contains("-c")){ result = tr("Modification Finished"); } + else if(args.contains("-c")){ result = tr("Modification Finished"); emit ArchivalSuccessful(); } if(needupdate){ startList(); } else{ emit ProcessFinished(retcode==0, result); result.clear(); } } diff --git a/src-qt5/desktop-utils/lumina-archiver/TarBackend.h b/src-qt5/desktop-utils/lumina-archiver/TarBackend.h index d86ecf7c..183cb610 100644 --- a/src-qt5/desktop-utils/lumina-archiver/TarBackend.h +++ b/src-qt5/desktop-utils/lumina-archiver/TarBackend.h @@ -64,7 +64,7 @@ signals: void ProcessStarting(); void ProgressUpdate(int, QString); //percentage, text void ProcessFinished(bool, QString); //success, text - //void ArchivalSuccessful(); + void ArchivalSuccessful(); }; #endif -- cgit From 8edbaac8f41029364d68ec3d48183fa43921317c Mon Sep 17 00:00:00 2001 From: q5sys Date: Mon, 23 Oct 2017 17:36:14 -0400 Subject: removing whitespace --- src-qt5/desktop-utils/lumina-archiver/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/main.cpp b/src-qt5/desktop-utils/lumina-archiver/main.cpp index 40cd7967..01e7bda1 100644 --- a/src-qt5/desktop-utils/lumina-archiver/main.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/main.cpp @@ -15,7 +15,7 @@ int main(int argc, char *argv[]) { LTHEME::LoadCustomEnvSettings(); QApplication a(argc, argv); - a.setAttribute(Qt::AA_UseHighDpiPixmaps); + a.setAttribute(Qt::AA_UseHighDpiPixmaps); LUtils::LoadTranslation(&a, "l-archiver"); //Now go ahead and setup the app QStringList args; -- cgit From 067a5f38cafc5789af47df06c687f0ddf79219f7 Mon Sep 17 00:00:00 2001 From: q5sys Date: Tue, 24 Oct 2017 20:40:30 -0400 Subject: add extraction method for custom path --- src-qt5/desktop-utils/lumina-archiver/MainUI.cpp | 51 ++++++++++++++++-------- src-qt5/desktop-utils/lumina-archiver/MainUI.h | 4 +- 2 files changed, 38 insertions(+), 17 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp index 215fc64e..20534569 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp @@ -82,6 +82,7 @@ void MainUI::LoadArguments(QStringList args){ else if(args[i]=="--burn-img"){ action = 0; continue; } else if(args[i]=="--ax"){ action = 1; continue; } else if(args[i]=="--aa"){ action = 2; continue; } + else if(args[i]=="--sx"){ action = 3; continue; } }else{ files << args[i]; } @@ -90,6 +91,7 @@ void MainUI::LoadArguments(QStringList args){ //Now go through and do any actions as needed ui->label_progress->setText(tr("Opening Archive...")); if(action==1){ + qDebug() << "blah"; connect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); connect(BACKEND, SIGNAL(ExtractSuccessful()), delayClose, SLOT(start()) ); }else if(action==2){ @@ -97,6 +99,18 @@ void MainUI::LoadArguments(QStringList args){ for(int j=1; jloadFile(files[0]); ui->actionUSB_Image->setEnabled(files[0].simplified().endsWith(".img")); @@ -260,23 +274,29 @@ void MainUI::extractFiles(){ } void MainUI::autoextractFiles(){ - disconnect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); - QString dir = BACKEND->currentFile().section("/",0,-2); //parent directory of the archive - if(dir.isEmpty()){ return; } - QDir tmp(dir); - QString name = BACKEND->currentFile().section("/",-1).section(".",0,0); - if(QFile::exists(dir+"/"+name)){ - int num = 1; - while( QFile::exists(dir+"/"+name+"_"+QString::number(num))){ num++; } - name = name+"_"+QString::number(num); - } - if(tmp.mkdir(name) ){ - dir.append("/"+name); //created sub directory - } - ui->label_progress->setText(tr("Extracting...")); - BACKEND->startExtract(dir, true); + disconnect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); + QString dir = BACKEND->currentFile().section("/",0,-2); //parent directory of the archive + if(dir.isEmpty()){ return; } + QDir tmp(dir); + QString name = BACKEND->currentFile().section("/",-1).section(".",0,0); + if(QFile::exists(dir+"/"+name)){ + int num = 1; + while( QFile::exists(dir+"/"+name+"_"+QString::number(num))){ num++; } + name = name+"_"+QString::number(num); + } + if(tmp.mkdir(name) ){ + dir.append("/"+name); //created sub directory } + ui->label_progress->setText(tr("Extracting...")); + BACKEND->startExtract(dir, true); +} +void MainUI::simpleExtractFiles(){ + disconnect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); + QString dir = sxPath; + ui->label_progress->setText(tr("Extracting...")); + BACKEND->startExtract(dir, true); +} void MainUI::autoArchiveFiles(){ qDebug() << "Auto Archive Files:" << aaFileList; @@ -284,7 +304,6 @@ void MainUI::autoArchiveFiles(){ BACKEND->startAdd(aaFileList); } - void MainUI::extractSelection(){ if(ui->tree_contents->currentItem()==0){ return; } //nothing selected QList sel = ui->tree_contents->selectedItems(); diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.h b/src-qt5/desktop-utils/lumina-archiver/MainUI.h index a16d5862..1a9d287c 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.h +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.h @@ -30,7 +30,8 @@ public: private: Ui::MainUI *ui; Backend *BACKEND; - QStringList aaFileList; + QStringList aaFileList, sxList; + QString sxPath, sxFile; QTimer *delayClose; QTreeWidgetItem* findItem(QString path, QTreeWidgetItem *start = 0); @@ -49,6 +50,7 @@ private slots: void extractFiles(); void autoextractFiles(); void autoArchiveFiles(); + void simpleExtractFiles(); void extractSelection(); void ViewFile(QTreeWidgetItem *it); void UpdateTree(); -- cgit From e72b4cfb324f8c8bb5aebc9382f2344c6ccb6705 Mon Sep 17 00:00:00 2001 From: q5sys Date: Wed, 25 Oct 2017 09:25:44 -0400 Subject: fixed handling of initial arguments --- src-qt5/desktop-utils/lumina-archiver/MainUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp index 20534569..c4b35474 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp @@ -101,7 +101,7 @@ void MainUI::LoadArguments(QStringList args){ connect(BACKEND, SIGNAL(ArchivalSuccessful()), delayClose, SLOT(start()) ); }else if(action==3){ sxList.clear(); - for(int j=1; j Date: Wed, 1 Nov 2017 12:47:54 -0400 Subject: Quick cleanup of input parsing in lumina-archiver. --- src-qt5/desktop-utils/lumina-archiver/MainUI.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp index c4b35474..79c023dc 100644 --- a/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp +++ b/src-qt5/desktop-utils/lumina-archiver/MainUI.cpp @@ -91,24 +91,18 @@ void MainUI::LoadArguments(QStringList args){ //Now go through and do any actions as needed ui->label_progress->setText(tr("Opening Archive...")); if(action==1){ - qDebug() << "blah"; + //qDebug() << "blah"; connect(BACKEND, SIGNAL(FileLoaded()), this, SLOT(autoextractFiles()) ); connect(BACKEND, SIGNAL(ExtractSuccessful()), delayClose, SLOT(start()) ); }else if(action==2){ aaFileList.clear(); for(int j=1; j Date: Sat, 4 Nov 2017 19:27:33 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (101 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/de/ --- .../lumina-archiver/i18n/l-archiver_de.ts | 202 ++++++++++----------- 1 file changed, 101 insertions(+), 101 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_de.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_de.ts index 8869e707..52faac28 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_de.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_de.ts @@ -6,22 +6,22 @@ Could not read archive - + Archiv konnte nicht gelesen werden Archive Loaded - + Archiv geladen Extraction Finished - + Extrahierung abgeschlossen Modification Finished - + Modifikation abgeschlossen @@ -29,307 +29,307 @@ Archive: - + Archiv: File - + Datei Edit - + Bearbeiten Burn to Disk - + Auf Disc brennen &Open Archive - + Archiv &öffnen Open archive - + Archiv öffnen &New Archive - + &Neues Archiv New archive - + Neues Archiv &Quit - + &Beenden Add File(s) - + Datei(en) hinzufügen Add files to archive - + Dateien zum Archiv hinzufügen Remove File(s) - + Datei(en) entfernen Remove selection from archive - + Auswahl aus Archiv entfernen Extract All - + Alles extrahieren Extract archive into a directory - + Archiv in ein Verzeichnis extrahieren Add Directory - + Verzeichnis hinzufügen Add directory to archive - + Verzeichnis zum Archiv hinzufügen Extract Selection - + Auswahl extrahieren Extract Selected Items - + Ausgewählte Elemente extrahieren USB Image - + USB-Abbild Copy an IMG to a USB device (may require admin permission) - + IMG auf ein USB-Gerät kopieren (eventuell Administratorberechtigung erforderlich) Archive Manager - + Archivverwaltung Admin Mode - + Administratormodus CTRL+N - + STRG+N CTRL+O - + STRG+Ö CTRL+Q - + STRG+B CTRL+E - + STRG+E MimeType - + MimeType Size - + Größe Opening Archive... - + Archiv wird geöffnet... All Types %1 - + Alle Typen %1 Uncompressed Archive (*.tar) - + Unkomprimiertes Archiv (*.tar) GZip Compressed Archive (*.tar.gz *.tgz) - + GZip-komprimiertes Archiv (*.tar.gz *.tgz) BZip Compressed Archive (*.tar.bz *.tbz) - + BZip-komprimiertes Archiv (*.tar.bz *.tbz) BZip2 Compressed Archive (*.tar.bz2 *.tbz2) - + BZip2-komprimiertes Archiv (*.tar.bz2 *.tbz2) LMZA Compressed Archive (*.tar.lzma *.tlz) - + LMZA-komprimiertes Archiv (*.tar.lzma *.tlz) XZ Compressed Archive (*.tar.xz *.txz) - + XZ-komprimiertes Archiv (*.tar.xz *.txz) CPIO Archive (*.cpio) - + CPIO-Archiv (*.cpio) PAX Archive (*.pax) - + PAX-Archiv (*.pax) AR Archive (*.ar) - + AR-Archiv (*.ar) SHAR Archive (*.shar) - + SHAR-Archiv (*.shar) Zip Archive (*.zip) - + Zip-Archiv (*.zip) 7-Zip Archive (*.7z) - + 7-Zip-Archiv (*.7z) All Known Types %1 - + Alle bekannten Typen %1 READ-ONLY: ISO image (*.iso *.img) - + NUR LESEN: ISO-Abbild (*.iso *.img) READ-ONLY: XAR archive (*.xar) - + NUR LESEN: XAR-Archiv (*.xar) READ-ONLY: Java archive (*.jar) - + NUR LESEN: Java-Archiv (*.jar) READ-ONLY: RedHat Package (*.rpm) - + NUR LESEN: RedHat-Paket (*.rpm) Show All Files (*) - + Alle Dateien anzeigen (*) Create Archive - + Archiv erstellen Error - + Fehler Could not overwrite file: - + Datei konnte nicht überschrieben werden: Open Archive - + Archiv öffnen Add to Archive - + Zum Archiv hinzufügen Adding Items... - + Elemente werden hinzugefügt... Removing Items... - + Elemente werden entfernt... Extract Into Directory - + In Verzeichnis extrahieren @@ -337,12 +337,12 @@ Extracting... - + Extrahierungsvorgang... Link To: %1 - + Link auf: %1 @@ -350,67 +350,67 @@ 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 @@ -418,127 +418,127 @@ Burn IMG to device - + IMG auf Gerät brennen IMG File - + IMG-Datei Block Size - + Blockgröße USB Device - + USB-Gerät Refresh Device List - + Geräteliste aktualisieren Wipe all extra space on device (conv = sync) - + Sämtlichen zusätzlichen Speicherplatz auf Gerät löschen (conv = sync) Burning to USB: - + Auf USB brennen: Time Elapsed: - + Vergangene Zeit: Cancel - + Abbrechen Start - + Start Burn IMG to Device - + IMG auf Gerät brennen Admin Mode - + Administratormodus Kilobyte(s) - + Kilobyte(s) Megabyte(s) - + Megabyte(s) Gigabyte(s) - + Gigabyte(s) Cancel Image Burn? - + Brennen des Abbildes abbrechen? Do you wish to stop the current IMG burn process? - + Möchten Sie den laufenden IMG-Brennprozess stoppen? Warning: This will leave the USB device in an inconsistent state - + Warnung: Dies wird das USB-Gerät in einem inkonsistenten Zustand zurücklassen Administrator Permissions Needed - + Administratorberechtigungen erforderlich This operation requires administrator priviledges. - + Dieser Vorgang erfordert Administratorrechte. Would you like to enable these priviledges? - + Möchten Sie diese Rechte aktivieren? ERROR - + FEHLER The process could not be completed: - + Der Prozess konnte nicht abgeschlossen werden: SUCCESS - + ERFOLG The image was successfully burned to the USB device - + Das Abbild wurde erfolgreich auf das USB-Gerät gebrannt -- cgit From b4a0884a1377175f089c683c22bbf724d4db6824 Mon Sep 17 00:00:00 2001 From: Pavel Borecki Date: Thu, 21 Sep 2017 05:22:56 +0000 Subject: Translated using Weblate (Czech) Currently translated at 100.0% (101 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/cs/ --- .../lumina-archiver/i18n/l-archiver_cs.ts | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_cs.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_cs.ts index c2c5a26e..0e3d0da8 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_cs.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_cs.ts @@ -350,67 +350,67 @@ Multimedia - + Multimédia Development - + Vývoj Education - + Výuka Games - + Hry Graphics - + Grafika Network - + Sítě Office - + Kancelář Science - + Věda Settings - + Nastavení System - + Systém Utility - + Nástroje Wine - + Wine Unsorted - + Různé -- cgit From 48d34996f4a54b7fd521a3989cb031f6aa0bb332 Mon Sep 17 00:00:00 2001 From: Tommi Nieminen Date: Wed, 4 Oct 2017 18:29:58 +0000 Subject: Translated using Weblate (Finnish) Currently translated at 94.0% (95 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/fi/ --- .../desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts index 4525f584..8467eb99 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_fi.ts @@ -350,37 +350,37 @@ Multimedia - + Multimedia Development - + Kehitys Education - + Kasvatus Games - + Pelit Graphics - + Grafiikka Network - + Verkko Office - + Toimisto -- cgit From 35dec768b7fea282872454ce2e5f31cf24bc0339 Mon Sep 17 00:00:00 2001 From: Moo Date: Tue, 26 Sep 2017 09:10:24 +0000 Subject: Translated using Weblate (Lithuanian) Currently translated at 94.0% (95 of 101 strings) Translation: lumina/lumina-archiver Translate-URL: http://weblate.trueos.org/projects/lumina/lumina-archiver/lt/ --- .../lumina-archiver/i18n/l-archiver_lt.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src-qt5/desktop-utils/lumina-archiver') diff --git a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts index 121263bb..d8faaae4 100644 --- a/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts +++ b/src-qt5/desktop-utils/lumina-archiver/i18n/l-archiver_lt.ts @@ -350,7 +350,7 @@ Multimedia - + Multimedija @@ -360,42 +360,42 @@ Education - + Švietimas Games - + Žaidimai Graphics - + Grafika Network - + Tinklas Office - + Raštinė Science - + Mokslas Settings - + Nustatymai System - + Sistema @@ -405,7 +405,7 @@ Wine - + Wine -- cgit