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

4 files changed, 18 insertions, 7 deletions

diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
index a422e012..30267439 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.cpp
@@ -94,7 +94,8 @@ QSize orig = settings->value("preferences/MainWindowSize", QSize()).toSize();
   if(DEBUG){ qDebug() << " - Keyboard Shortcuts"; }
   nextTabLShort = new QShortcut( QKeySequence(tr("Shift+Left")), this);
   nextTabRShort = new QShortcut( QKeySequence(tr("Shift+Right")), this);
-  
+  togglehiddenfilesShort = new QShortcut( QKeySequence(tr("Ctrl+H")), this);
+
   //Finish loading the interface
   workThread->start();
   if(DEBUG){ qDebug() << " - Icons"; }
@@ -240,7 +241,7 @@ void MainUI::setupConnections(){
   connect(tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(tabClosed(int)) );
   connect(ui->menuBookmarks, SIGNAL(triggered(QAction*)), this, SLOT(goToBookmark(QAction*)) );
   connect(ui->menuExternal_Devices, SIGNAL(triggered(QAction*)), this, SLOT(goToDevice(QAction*)) );
-	
+
   //Radio Buttons
   connect(radio_view_details, SIGNAL(toggled(bool)), this, SLOT(viewModeChanged(bool)) );
   connect(radio_view_list, SIGNAL(toggled(bool)), this, SLOT(viewModeChanged(bool)) );
@@ -250,6 +251,15 @@ void MainUI::setupConnections(){
   //Special Keyboard Shortcuts
   connect(nextTabLShort, SIGNAL(activated()), this, SLOT( prevTab() ) );
   connect(nextTabRShort, SIGNAL(activated()), this, SLOT( nextTab() ) );
+  connect(togglehiddenfilesShort, SIGNAL(activated()), this, SLOT( togglehiddenfiles() ) );
+}
+
+void MainUI::togglehiddenfiles()
+{
+    //change setChecked to inverse value
+    ui->actionView_Hidden_Files->setChecked( !settings->value("showhidden", true).toBool() );
+    // then trigger function
+    on_actionView_Hidden_Files_triggered();
 }
 
 void MainUI::loadSettings(){
diff --git a/src-qt5/desktop-utils/lumina-fm/MainUI.h b/src-qt5/desktop-utils/lumina-fm/MainUI.h
index e0bae254..4522b7f6 100644
--- a/src-qt5/desktop-utils/lumina-fm/MainUI.h
+++ b/src-qt5/desktop-utils/lumina-fm/MainUI.h
@@ -88,7 +88,7 @@ private:
 	SlideshowWidget *SW;
 	
     QSettings *settings;
-    QShortcut *nextTabLShort, *nextTabRShort;
+    QShortcut *nextTabLShort, *nextTabRShort, *togglehiddenfilesShort;
 	QCompleter *dirCompleter;
 
 	//Simplification Functions
@@ -138,7 +138,10 @@ private slots:
 	void tabClosed(int tab = -1);
 	void nextTab(); //For keyboard shortcuts
 	void prevTab(); //For keyboard shortcuts
-	
+
+    //Other Shortcuts
+    void togglehiddenfiles();
+
 	//Backend Info passing
 	void DirDataAvailable(QString, QString, LFileInfoList);
 	void SnapshotDataAvailable(QString, QString, QStringList);
diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
index b5d65559..86fada43 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
@@ -220,7 +220,6 @@ void MainUI::updateTab(QString file){
   //qDebug() << "Update Tab:" << file << cur << changes;
   ui->tabWidget->setTabText(index,(changes ? "*" : "") + file.section("/",-1));
   ui->actionSave_File->setEnabled(changes);
-  ui->actionSave_File_As->setEnabled(changes);
   this->setWindowTitle( ui->tabWidget->tabText( ui->tabWidget->currentIndex() ) );
 }
 
@@ -230,7 +229,6 @@ void MainUI::tabChanged(){
   if(cur==0){ return; } //should never happen though
   bool changes = cur->hasChange();
   ui->actionSave_File->setEnabled(changes);
-  ui->actionSave_File_As->setEnabled(changes);
   this->setWindowTitle( ui->tabWidget->tabText( ui->tabWidget->currentIndex() ) );
   if(!ui->line_find->hasFocus() && !ui->line_replace->hasFocus()){ ui->tabWidget->currentWidget()->setFocus(); }
 }
diff --git a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
index 9db0db68..cfb4abf3 100644
--- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
+++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
@@ -93,7 +93,7 @@ desktop.files=lumina-textedit.desktop
 desktop.path=$${L_SHAREDIR}/applications/
 
 link.path=$${L_BINDIR}
-link.extra=ln -sf $${L_BINDIR}/lumina-textedit $${L_BINDIR}/lte
+link.extra=ln -sf $(INSTALL_ROOT)$${L_BINDIR}/lumina-textedit $(INSTALL_ROOT)$${L_BINDIR}/lte
 
 INSTALLS += target desktop link