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

6 files changed, 34 insertions, 22 deletions

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 @@
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="611"/>
         <source>Settings</source>
-        <translation>Configuració</translation>
+        <translation>Paràmetres</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="612"/>
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 @@
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="603"/>
         <source>Multimedia</source>
-        <translation type="unfinished"></translation>
+        <translation>Multimedie</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="604"/>
         <source>Development</source>
-        <translation type="unfinished"></translation>
+        <translation>Udvikling</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="605"/>
         <source>Education</source>
-        <translation type="unfinished"></translation>
+        <translation>Uddannelse</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="606"/>
         <source>Games</source>
-        <translation type="unfinished"></translation>
+        <translation>Spil</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="607"/>
         <source>Graphics</source>
-        <translation type="unfinished"></translation>
+        <translation>Grafik</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="608"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>Netværk</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="609"/>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontor</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="610"/>
         <source>Science</source>
-        <translation type="unfinished"></translation>
+        <translation>Videnskab</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="611"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Indstillinger</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="612"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation>System</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="613"/>
         <source>Utility</source>
-        <translation type="unfinished"></translation>
+        <translation>Hjælpeværktøj</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="614"/>
         <source>Wine</source>
-        <translation type="unfinished"></translation>
+        <translation>Wine</translation>
     </message>
     <message>
         <location filename="../../../core/libLumina/LuminaXDG.cpp" line="615"/>
         <source>Unsorted</source>
-        <translation type="unfinished"></translation>
+        <translation>Usorteret</translation>
     </message>
 </context>
 <context>
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/main.cpp b/src-qt5/desktop-utils/lumina-fm-dev/main.cpp
index 61d2dc95..a4a6244e 100644
--- a/src-qt5/desktop-utils/lumina-fm-dev/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fm-dev/main.cpp
@@ -2,6 +2,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QStringList>
+#include <QElapsedTimer>
 
 #include "MainUI.h"
 #include <LuminaOS.h>
@@ -10,6 +11,7 @@
 #include <LuminaSingleApplication.h>
 
 #include "BrowserWidget.h"
+QElapsedTimer* timer = 0;
 
 int main(int argc, char ** argv)
 {
@@ -27,6 +29,7 @@ int main(int argc, char ** argv)
     MainUI w;
     QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance(QStringList)) );
     //QObject::connect(&themes, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
+    timer = new QElapsedTimer(); timer->start(); qDebug() << " - Init:" << timer->elapsed();
     w.OpenDirs(in);
     w.show();
 
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/widgets/DirWidget2.cpp b/src-qt5/desktop-utils/lumina-fm-dev/widgets/DirWidget2.cpp
index 3790d145..2e837cfd 100644
--- a/src-qt5/desktop-utils/lumina-fm-dev/widgets/DirWidget2.cpp
+++ b/src-qt5/desktop-utils/lumina-fm-dev/widgets/DirWidget2.cpp
@@ -28,6 +28,8 @@
 
 #define DEBUG 0
 
+extern QElapsedTimer* timer;
+
 DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){
   ui->setupUi(this); //load the designer file
   ID = objID;
@@ -90,6 +92,8 @@ DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new U
   createShortcuts();
   createMenus();
   line_dir->setCompleter(new QCompleter(dirtreeModel, this));
+  qDebug() << " - Fini:" << timer->elapsed();
+
 }
 
 DirWidget::~DirWidget(){
diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
index 52a29c01..4c2ce0bd 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
@@ -496,11 +496,11 @@ void MainUI::closeEvent(QCloseEvent *ev){
       unsaved << tmp->currentFile();
     }
   }
-  bool quitnow = unsaved.isEmpty();
-  if(!quitnow && !ui->actionShow_Popups->isChecked()){ quitnow = true; }
-  if(!quitnow){
-    quitnow = (QMessageBox::Yes == QMessageBox::question(this, tr("Lose Unsaved Changes?"), QString(tr("There are unsaved changes.\nDo you want to close the editor anyway?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) );
-  }
-  if(quitnow){ QMainWindow::closeEvent(ev); }
-  else{ ev->ignore(); }
+  bool savenow = unsaved.isEmpty();
+  if(!savenow && !ui->actionShow_Popups->isChecked()){ savenow = true; }
+  if(!savenow){
+      savenow = (QMessageBox::Yes == QMessageBox::question(this, tr("Save Changes before closing?"), QString(tr("There are unsaved changes.\nDo you want save them before you close the editor?\n\n%1")).arg(unsaved.join("\n")), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) );
+    }
+    if(!savenow){ QMainWindow::closeEvent(ev); }
+    else{ ev->ignore(); SaveFile(); }
 }
diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.ui b/src-qt5/desktop-utils/lumina-textedit/MainUI.ui
index de5c1ee1..fec94a21 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.ui
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.ui
@@ -182,7 +182,7 @@
      <x>0</x>
      <y>0</y>
      <width>505</width>
-     <height>21</height>
+     <height>28</height>
     </rect>
    </property>
    <property name="contextMenuPolicy">
@@ -437,6 +437,11 @@
    </property>
   </action>
  </widget>
+ <tabstops>
+  <tabstop>line_find</tabstop>
+  <tabstop>line_replace</tabstop>
+  <tabstop>tool_hideReplaceGroup</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>