Data Browser: export query results as JSON

mgrojo · mgrojo · commit a5cc259b45a3 · 2021-03-12T20:51:53.000+01:00
In this case too, the corresponding menu entry for exporting the query results to JSON was missing although it was straight forward to add it with the same scheme as for CSV. Renamed the CSV action for consistency. Related to issue #2607
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -50,6 +50,7 @@ TableBrowser::TableBrowser(DBBrowserDB* _db, QWidget* parent) :
 
     popupSaveFilterAsMenu = new QMenu(this);
     popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportCsv);
+    popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportJson);
     popupSaveFilterAsMenu->addAction(ui->actionFilterSaveAsView);
     ui->actionSaveFilterAsPopup->setMenu(popupSaveFilterAsMenu);
     qobject_cast<QToolButton*>(ui->browseToolbar->widgetForAction(ui->actionSaveFilterAsPopup))->setPopupMode(QToolButton::InstantPopup);
@@ -1403,12 +1404,18 @@ void TableBrowser::editDisplayFormat()
     }
 }
 
-void TableBrowser::exportFilteredTable()
+void TableBrowser::exportCsvFilteredTable()
 {
     ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatCsv, this, m_model->customQuery(false));
     dialog.exec();
 }
 
+void TableBrowser::exportJsonFilteredTable()
+{
+    ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatJson, this, m_model->customQuery(false));
+    dialog.exec();
+}
+
 void TableBrowser::saveFilterAsView()
 {
     // Save as view a custom query without rowid
diff --git a/src/TableBrowser.h b/src/TableBrowser.h
@@ -130,7 +130,8 @@ private slots:
     void on_actionClearFilters_triggered();
     void on_actionClearSorting_triggered();
     void editDisplayFormat();
-    void exportFilteredTable();
+    void exportCsvFilteredTable();
+    void exportJsonFilteredTable();
     void saveFilterAsView();
     void setTableEncoding(bool forAllTables = false);
     void setDefaultTableEncoding();
diff --git a/src/TableBrowser.ui b/src/TableBrowser.ui
@@ -670,6 +670,20 @@
     <string>This button exports the data of the browsed table as currently displayed (after filters, display formats and order column) as a CSV file.</string>
    </property>
   </action>
+  <action name="actionFilteredTableExportJson">
+   <property name="text">
+    <string>Export to &amp;JSON</string>
+   </property>
+   <property name="toolTip">
+    <string>Export the filtered data to JSON</string>
+   </property>
+   <property name="statusTip">
+    <string>Export the filtered data to JSON</string>
+   </property>
+   <property name="whatsThis">
+    <string>This button exports the data of the browsed table as currently displayed (after filters, display formats and order column) as a JSON file.</string>
+   </property>
+  </action>
   <action name="actionFilterSaveAsView">
    <property name="text">
     <string>Save as &amp;view</string>
@@ -1324,7 +1338,23 @@
    <sender>actionFilteredTableExportCsv</sender>
    <signal>triggered()</signal>
    <receiver>TableBrowser</receiver>
-   <slot>exportFilteredTable()</slot>
+   <slot>exportCsvFilteredTable()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>518</x>
+     <y>314</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionFilteredTableExportJson</sender>
+   <signal>triggered()</signal>
+   <receiver>TableBrowser</receiver>
+   <slot>exportJsonFilteredTable()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -1431,7 +1461,8 @@
   <slot>addRecord()</slot>
   <slot>deleteRecord()</slot>
   <slot>insertValues()</slot>
-  <slot>exportFilteredTable</slot>
+  <slot>exportCsvFilteredTable</slot>
+  <slot>exportJsonFilteredTable</slot>
   <slot>saveFilterAsView</slot>
   <slot>setDefaultTableEncoding()</slot>
   <slot>hideColumns()</slot>

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ TableBrowser::TableBrowser(DBBrowserDB* _db, QWidget* parent) :`
`50`	`50`
`51`	`51`	`popupSaveFilterAsMenu = new QMenu(this);`
`52`	`52`	`popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportCsv);`
	`53`	`+ popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportJson);`
`53`	`54`	`popupSaveFilterAsMenu->addAction(ui->actionFilterSaveAsView);`
`54`	`55`	`ui->actionSaveFilterAsPopup->setMenu(popupSaveFilterAsMenu);`
`55`	`56`	`qobject_cast<QToolButton*>(ui->browseToolbar->widgetForAction(ui->actionSaveFilterAsPopup))->setPopupMode(QToolButton::InstantPopup);`
`@@ -1403,12 +1404,18 @@ void TableBrowser::editDisplayFormat()`
`1403`	`1404`	`}`
`1404`	`1405`	`}`
`1405`	`1406`
`1406`		`-void TableBrowser::exportFilteredTable()`
	`1407`	`+void TableBrowser::exportCsvFilteredTable()`
`1407`	`1408`	`{`
`1408`	`1409`	`ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatCsv, this, m_model->customQuery(false));`
`1409`	`1410`	`dialog.exec();`
`1410`	`1411`	`}`
`1411`	`1412`
	`1413`	`+void TableBrowser::exportJsonFilteredTable()`
	`1414`	`+{`
	`1415`	`+ ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatJson, this, m_model->customQuery(false));`
	`1416`	`+ dialog.exec();`
	`1417`	`+}`
	`1418`	`+`
`1412`	`1419`	`void TableBrowser::saveFilterAsView()`
`1413`	`1420`	`{`
`1414`	`1421`	`// Save as view a custom query without rowid`