Action to select a file to be inserted as a reference

mgrojo · mgrojo · commit 34c15538b2c9 · 2019-12-22T18:37:56.000+01:00
The "Import file" in the Edit Dialog dock is converted to a menu (after long click) with a new action for selecting a file to be imported as a reference in the cell. Then this filename reference can be used to open the file using the default application with the present "Open in Application" action. (In Linux, paths containing non-US-ASCII are known not to work. This seems a bug in Qt QUrl class). New icon composed from our document-open.png and link.png from Silk icon set. Related issue #1597
diff --git a/src/EditDialog.cpp b/src/EditDialog.cpp
@@ -20,6 +20,7 @@
 #include <QClipboard>
 #include <QTextDocument>
 #include <QDesktopServices>
+#include <QMenu>
 
 #include <Qsci/qsciscintilla.h>
 #include <json.hpp>
@@ -66,6 +67,16 @@ EditDialog::EditDialog(QWidget* parent)
     ui->editorBinary->addAction(ui->actionPrint);
     ui->editorBinary->addAction(ui->actionCopyHexAscii);
 
+    // Set up popup menus
+    QMenu* popupImportFileMenu = new QMenu(this);
+    popupImportFileMenu->addAction(ui->actionImportInMenu);
+    popupImportFileMenu->addAction(ui->actionImportAsLink);
+    ui->actionImport->setMenu(popupImportFileMenu);
+
+    connect(ui->actionImportAsLink, &QAction::triggered, this, [&]() {
+        importData(/* asLink */ true);
+    });
+
     connect(ui->actionOpenInApp, &QAction::triggered, this, [&]() {
         QUrl url;
         switch (dataSource) {
@@ -330,7 +341,7 @@ void EditDialog::loadData(const QByteArray& bArrdata)
     }
 }
 
-void EditDialog::importData()
+void EditDialog::importData(bool asLink)
 {
     // Get list of supported image file formats to include them in the file dialog filter
     QString image_formats;
@@ -383,16 +394,22 @@ void EditDialog::importData()
                 );
     if(QFile::exists(fileName))
     {
-        QFile file(fileName);
-        if(file.open(QIODevice::ReadOnly))
-        {
-            QByteArray d = file.readAll();
-            loadData(d);
-            file.close();
-
-            // Update the cell data info in the bottom left of the Edit Cell
-            // and update mode (if required) to the just imported data type.
-            updateCellInfoAndMode(d);
+        if(asLink) {
+            QByteArray fileNameBa = fileName.toUtf8();
+            loadData(fileNameBa);
+            updateCellInfoAndMode(fileNameBa);
+        } else {
+            QFile file(fileName);
+            if(file.open(QIODevice::ReadOnly))
+            {
+                QByteArray d = file.readAll();
+                loadData(d);
+                file.close();
+
+                // Update the cell data info in the bottom left of the Edit Cell
+                // and update mode (if required) to the just imported data type.
+                updateCellInfoAndMode(d);
+            }
         }
     }
 }
diff --git a/src/EditDialog.h b/src/EditDialog.h
@@ -32,7 +32,7 @@ public slots:
     void showEvent(QShowEvent* ev) override;
 
 private slots:
-    void importData();
+    void importData(bool asLink = false);
     void exportData();
     void setNull();
     void updateApplyButton();
diff --git a/src/EditDialog.ui b/src/EditDialog.ui
@@ -421,6 +421,33 @@ Errors are indicated with a red squiggle underline.</string>
     <string>The value is interpreted as a file or URL and opened in the default application or web browser.</string>
    </property>
   </action>
+  <action name="actionImportAsLink">
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/document_link</normaloff>:/icons/document_link</iconset>
+   </property>
+   <property name="text">
+    <string>Save file reference...</string>
+   </property>
+   <property name="toolTip">
+    <string>Save reference to file</string>
+   </property>
+  </action>
+  <action name="actionImportInMenu">
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/document_open</normaloff>:/icons/document_open</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Import...</string>
+   </property>
+   <property name="toolTip">
+    <string>Import from file</string>
+   </property>
+   <property name="whatsThis">
+    <string>Opens a file dialog used to import any kind of data to this database cell.</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>comboMode</tabstop>
@@ -623,6 +650,22 @@ Errors are indicated with a red squiggle underline.</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionImportInMenu</sender>
+   <signal>triggered()</signal>
+   <receiver>EditDialog</receiver>
+   <slot>importData()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>308</x>
+     <y>190</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>importData()</slot>
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -42,7 +42,7 @@ TableBrowser::TableBrowser(QWidget* parent) :
     ui->editGlobalFilter->setPlaceholderText(tr("Filter in all columns"));
     ui->editGlobalFilter->setConditionFormatContextMenuEnabled(false);
 
-    // Set uo popup menus
+    // Set up popup menus
     popupNewRecordMenu = new QMenu(this);
     popupNewRecordMenu->addAction(ui->newRecordAction);
     popupNewRecordMenu->addAction(ui->insertValuesAction);
diff --git a/src/icons/document-link.png b/src/icons/document-link.png
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
@@ -99,5 +99,6 @@
         <file alias="clear_cond_formats">style_delete.png</file>
         <file alias="add_cond_format">style_add.png</file>
         <file alias="open_in_app">application_link.png</file>
+        <file alias="document_link">document-link.png</file>
     </qresource>
 </RCC>
