Merge branch 'master' of http://github.com/trueos/lumina

5 files changed, 15 insertions, 17 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index ec425dd9..abb99975 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -139,7 +139,7 @@ void MainUI::OpenDirs(QStringList dirs){
       if(DWLIST[j]->id().section("-",1,1).toInt() >= id){ id = DWLIST[j]->id().section("-",1,1).toInt()+1; }
     }
     //Create the new DirWidget
-    DirWidget *DW = new DirWidget("DW-"+QString::number(id), this);
+    DirWidget *DW = new DirWidget("DW-"+QString::number(id), settings, this);
     DW->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     ui->BrowserLayout->addWidget(DW);
     DWLIST << DW;
diff --git a/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
index 3638e2a8..66169019 100644
--- a/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/OPWidget.cpp
@@ -19,7 +19,7 @@ OPWidget::OPWidget(QWidget *parent) : QWidget(parent), ui(new Ui::OPWidget()){
   //Now create the widget
   ui->setupUi(this);
   ui->tool_close->setIcon( LXDG::findIcon("dialog-close","view-close") );
-  ui->tool_showerrors->setIcon(LXDG::findIcon("dialog-warning",""));
+  ui->tool_showerrors->setIcon(LXDG::findIcon("view-choose","view-preview"));
   //connect the widget buttons
   connect(ui->tool_close, SIGNAL(clicked()), this, SLOT(closeWidget()) );
   connect(ui->tool_showerrors, SIGNAL(clicked()), this, SLOT(showErrors()) );
@@ -79,7 +79,7 @@ void OPWidget::startOperation(){
   starttime = QDateTime::currentMSecsSinceEpoch();
   endtime = -1;
   QTimer::singleShot(0, worker, SLOT(slotStartOperations()) );
-  emit starting(this->whatsThis());  
+  emit starting(this->whatsThis());
 }
 
 
diff --git a/src-qt5/desktop-utils/lumina-fm/TrayUI.h b/src-qt5/desktop-utils/lumina-fm/TrayUI.h
index 4210784a..a87e2da8 100644
--- a/src-qt5/desktop-utils/lumina-fm/TrayUI.h
+++ b/src-qt5/desktop-utils/lumina-fm/TrayUI.h
@@ -27,7 +27,7 @@ public slots:
 
 private:
 	QList<OPWidget*> OPS;
-	
+
 	void createOP( FILEOP, QStringList oldF, QStringList newF);
 
 private slots:
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
index 78759aa2..8273d09c 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.cpp
@@ -28,7 +28,7 @@
 
 #define DEBUG 0
 
-DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){
+DirWidget::DirWidget(QString objID, QSettings *settings, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){
   ui->setupUi(this); //load the designer file
   ID = objID;
   //Assemble the toolbar for the widget
@@ -54,6 +54,7 @@ DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new U
     toolbar->addAction(ui->actionDualColumn);
     columnActionGroup->addAction(ui->actionDualColumn);
   toolbar->addAction(ui->actionMenu);
+  this->settings = settings;
   //Add the browser widgets
   RCBW = 0; //right column browser is unavailable initially
   BW = new BrowserWidget("", this);
@@ -340,8 +341,7 @@ void DirWidget::on_tool_zoom_in_clicked(){
   size += 16;
   setThumbnailSize(size);
   //Now Save the size value as the default for next time
-  QSettings SET("lumina-desktop","lumina-fm");
-  SET.setValue("iconsize", size);
+  settings->setValue("iconsize", size);
 }
 
 void DirWidget::on_tool_zoom_out_clicked(){
@@ -350,8 +350,7 @@ void DirWidget::on_tool_zoom_out_clicked(){
   size -= 16;
   setThumbnailSize(size);
   //Now Save the size value as the default for next time
-  QSettings SET("lumina-desktop","lumina-fm");
-  SET.setValue("iconsize", size);
+  settings->setValue("iconsize", size);
 }
 
 // -- Top Snapshot Buttons
diff --git a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
index bff8cb74..8dd367df 100644
--- a/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
+++ b/src-qt5/desktop-utils/lumina-fm/widgets/DirWidget2.h
@@ -32,7 +32,7 @@ class DirWidget : public QWidget{
 	Q_OBJECT
 public:
 	enum DETAILTYPES{ NAME, SIZE, TYPE, DATEMOD, DATECREATE};
-	DirWidget(QString objID, QWidget *parent = 0); //needs a unique ID (to distinguish from other DirWidgets)
+	DirWidget(QString objID, QSettings *settings, QWidget *parent = 0); //needs a unique ID (to distinguish from other DirWidgets)
 	~DirWidget();
 
 	void cleanup(); //called before the browser is closed down
@@ -75,6 +75,7 @@ private:
 	QString ID, cBID; //unique ID assigned by the parent, and currently active browser widget
 	QString normalbasedir, snapbasedir, snaprelpath; //for maintaining directory context while moving between snapshots
 	QStringList snapshots, needThumbs, tmpSel;
+  QSettings *settings;
 	bool canmodify;
 
 	//The Toolbar and associated items
@@ -95,13 +96,11 @@ private:
 	BrowserWidget* currentBrowser();
 	QStringList currentDirFiles(); //all the "files" available within the current dir/browser
 
-    //QProcess *pExtract;
-
-    //OpenWithMenu
-    QString fileEXT, filePath;
-    QStringList mimetypes, keys, files;
-    //QStringList getPreferredApplications();
-
+  //QProcess *pExtract;
+  //OpenWithMenu
+  QString fileEXT, filePath;
+  QStringList mimetypes, keys, files;
+  //QStringList getPreferredApplications();
 
 private slots:
 	//UI BUTTONS/Actions