diff --git a/docs/en_US/editgrid.rst b/docs/en_US/editgrid.rst index 749ba2c14..70f7489fb 100644 --- a/docs/en_US/editgrid.rst +++ b/docs/en_US/editgrid.rst @@ -215,11 +215,10 @@ To add new column(s) in data sorting grid, click on the [+] icon. To delete a row from the grid, click the trash icon. -* Click the *Help* button (?) to access online help. -* Click the *Ok* button to save work. +* Click the *Save* button to save work. * Click the *Close* button to discard current changes and close the dialog. .. toctree:: :maxdepth: 2 - viewdata_filter \ No newline at end of file + viewdata_filter diff --git a/docs/en_US/images/editgrid.png b/docs/en_US/images/editgrid.png index 5781f23c2..e37d189c1 100644 Binary files a/docs/en_US/images/editgrid.png and b/docs/en_US/images/editgrid.png differ diff --git a/docs/en_US/images/editgrid_filter_dialog.png b/docs/en_US/images/editgrid_filter_dialog.png index 8c48570e7..3ff25471c 100644 Binary files a/docs/en_US/images/editgrid_filter_dialog.png and b/docs/en_US/images/editgrid_filter_dialog.png differ diff --git a/docs/en_US/images/geometry_viewer.png b/docs/en_US/images/geometry_viewer.png index f996ebc76..3d28fa8d2 100644 Binary files a/docs/en_US/images/geometry_viewer.png and b/docs/en_US/images/geometry_viewer.png differ diff --git a/docs/en_US/images/geometry_viewer_property_table.png b/docs/en_US/images/geometry_viewer_property_table.png index ac38419e4..528ff92b4 100644 Binary files a/docs/en_US/images/geometry_viewer_property_table.png and b/docs/en_US/images/geometry_viewer_property_table.png differ diff --git a/docs/en_US/images/new_connection_dialog.png b/docs/en_US/images/new_connection_dialog.png deleted file mode 100644 index 8cf7ae6aa..000000000 Binary files a/docs/en_US/images/new_connection_dialog.png and /dev/null differ diff --git a/docs/en_US/images/new_connection_options.png b/docs/en_US/images/new_connection_options.png deleted file mode 100644 index 7ca94374b..000000000 Binary files a/docs/en_US/images/new_connection_options.png and /dev/null differ diff --git a/docs/en_US/images/query_autocomplete.png b/docs/en_US/images/query_autocomplete.png index c5161c896..7ede819c8 100644 Binary files a/docs/en_US/images/query_autocomplete.png and b/docs/en_US/images/query_autocomplete.png differ diff --git a/docs/en_US/images/query_data_editing.png b/docs/en_US/images/query_data_editing.png new file mode 100644 index 000000000..74b65682c Binary files /dev/null and b/docs/en_US/images/query_data_editing.png differ diff --git a/docs/en_US/images/query_editing.png b/docs/en_US/images/query_editing.png new file mode 100644 index 000000000..31e66adc2 Binary files /dev/null and b/docs/en_US/images/query_editing.png differ diff --git a/docs/en_US/images/query_execute_section.png b/docs/en_US/images/query_execute_section.png index 1f8467675..f41d9d647 100644 Binary files a/docs/en_US/images/query_execute_section.png and b/docs/en_US/images/query_execute_section.png differ diff --git a/docs/en_US/images/query_execution.png b/docs/en_US/images/query_execution.png new file mode 100644 index 000000000..4f52dfd09 Binary files /dev/null and b/docs/en_US/images/query_execution.png differ diff --git a/docs/en_US/images/query_explain_analyze_statistics.png b/docs/en_US/images/query_explain_analyze_statistics.png index a659cdd12..3029b01ea 100644 Binary files a/docs/en_US/images/query_explain_analyze_statistics.png and b/docs/en_US/images/query_explain_analyze_statistics.png differ diff --git a/docs/en_US/images/query_explain_analyze_table.png b/docs/en_US/images/query_explain_analyze_table.png index dfedb703b..97bbbe867 100644 Binary files a/docs/en_US/images/query_explain_analyze_table.png and b/docs/en_US/images/query_explain_analyze_table.png differ diff --git a/docs/en_US/images/query_output_data.png b/docs/en_US/images/query_output_data.png index 1f8467675..a53546527 100644 Binary files a/docs/en_US/images/query_output_data.png and b/docs/en_US/images/query_output_data.png differ diff --git a/docs/en_US/images/query_output_error.png b/docs/en_US/images/query_output_error.png index e67007259..19e77cecc 100644 Binary files a/docs/en_US/images/query_output_error.png and b/docs/en_US/images/query_output_error.png differ diff --git a/docs/en_US/images/query_output_explain.png b/docs/en_US/images/query_output_explain.png deleted file mode 100644 index 210d5617b..000000000 Binary files a/docs/en_US/images/query_output_explain.png and /dev/null differ diff --git a/docs/en_US/images/query_output_explain_details.png b/docs/en_US/images/query_output_explain_details.png index 16d81b7f0..461255ab4 100644 Binary files a/docs/en_US/images/query_output_explain_details.png and b/docs/en_US/images/query_output_explain_details.png differ diff --git a/docs/en_US/images/query_output_explain_options.png b/docs/en_US/images/query_output_explain_options.png deleted file mode 100644 index c6fe92837..000000000 Binary files a/docs/en_US/images/query_output_explain_options.png and /dev/null differ diff --git a/docs/en_US/images/query_output_history.png b/docs/en_US/images/query_output_history.png index 8f7f3c499..ab84e7d4c 100644 Binary files a/docs/en_US/images/query_output_history.png and b/docs/en_US/images/query_output_history.png differ diff --git a/docs/en_US/images/query_output_messages.png b/docs/en_US/images/query_output_messages.png index 7271bdf46..a8ea664a1 100644 Binary files a/docs/en_US/images/query_output_messages.png and b/docs/en_US/images/query_output_messages.png differ diff --git a/docs/en_US/images/query_output_notifications_listen.png b/docs/en_US/images/query_output_notifications_listen.png index c86f6ca65..b3bf909a4 100644 Binary files a/docs/en_US/images/query_output_notifications_listen.png and b/docs/en_US/images/query_output_notifications_listen.png differ diff --git a/docs/en_US/images/query_output_notifications_notify.png b/docs/en_US/images/query_output_notifications_notify.png index 8ed9e23d5..9e0ba1d94 100644 Binary files a/docs/en_US/images/query_output_notifications_notify.png and b/docs/en_US/images/query_output_notifications_notify.png differ diff --git a/docs/en_US/images/query_output_notifications_panel.png b/docs/en_US/images/query_output_notifications_panel.png index 7f637fe4d..18445b876 100644 Binary files a/docs/en_US/images/query_output_notifications_panel.png and b/docs/en_US/images/query_output_notifications_panel.png differ diff --git a/docs/en_US/images/query_sql_editor.png b/docs/en_US/images/query_sql_editor.png index dd8dc33fa..43116bae2 100644 Binary files a/docs/en_US/images/query_sql_editor.png and b/docs/en_US/images/query_sql_editor.png differ diff --git a/docs/en_US/images/query_status_bar.png b/docs/en_US/images/query_status_bar.png new file mode 100644 index 000000000..5dd38b9b4 Binary files /dev/null and b/docs/en_US/images/query_status_bar.png differ diff --git a/docs/en_US/images/query_tool.png b/docs/en_US/images/query_tool.png index 27c298ad9..6b79205df 100644 Binary files a/docs/en_US/images/query_tool.png and b/docs/en_US/images/query_tool.png differ diff --git a/docs/en_US/images/query_tool_connection_status.png b/docs/en_US/images/query_tool_connection_status.png index 684a6219d..f9d56bb05 100644 Binary files a/docs/en_US/images/query_tool_connection_status.png and b/docs/en_US/images/query_tool_connection_status.png differ diff --git a/docs/en_US/images/query_tool_editable_columns.png b/docs/en_US/images/query_tool_editable_columns.png index bfb701579..3dea445cb 100644 Binary files a/docs/en_US/images/query_tool_editable_columns.png and b/docs/en_US/images/query_tool_editable_columns.png differ diff --git a/docs/en_US/images/query_tool_macros_clear_all.png b/docs/en_US/images/query_tool_macros_clear_all.png deleted file mode 100644 index 00b979e76..000000000 Binary files a/docs/en_US/images/query_tool_macros_clear_all.png and /dev/null differ diff --git a/docs/en_US/images/query_tool_macros_clear_confirmation.png b/docs/en_US/images/query_tool_macros_clear_confirmation.png index c5f40945b..d3d7a4257 100644 Binary files a/docs/en_US/images/query_tool_macros_clear_confirmation.png and b/docs/en_US/images/query_tool_macros_clear_confirmation.png differ diff --git a/docs/en_US/images/query_tool_macros_clear_row.png b/docs/en_US/images/query_tool_macros_clear_row.png deleted file mode 100644 index adf1ace91..000000000 Binary files a/docs/en_US/images/query_tool_macros_clear_row.png and /dev/null differ diff --git a/docs/en_US/images/query_tool_macros_execution.png b/docs/en_US/images/query_tool_macros_execution.png index 34465f5d3..3383a2487 100644 Binary files a/docs/en_US/images/query_tool_macros_execution.png and b/docs/en_US/images/query_tool_macros_execution.png differ diff --git a/docs/en_US/images/query_tool_manage_macros.png b/docs/en_US/images/query_tool_manage_macros.png index bc5bb1ab8..76fbef11c 100644 Binary files a/docs/en_US/images/query_tool_manage_macros.png and b/docs/en_US/images/query_tool_manage_macros.png differ diff --git a/docs/en_US/images/query_tool_manage_macros_dialog.png b/docs/en_US/images/query_tool_manage_macros_dialog.png index a06186d6b..9f47499ba 100644 Binary files a/docs/en_US/images/query_tool_manage_macros_dialog.png and b/docs/en_US/images/query_tool_manage_macros_dialog.png differ diff --git a/docs/en_US/images/query_tool_message.png b/docs/en_US/images/query_tool_message.png index c578638ee..c8a94fdf6 100644 Binary files a/docs/en_US/images/query_tool_message.png and b/docs/en_US/images/query_tool_message.png differ diff --git a/docs/en_US/images/query_tool_new_connection_dialog.png b/docs/en_US/images/query_tool_new_connection_dialog.png new file mode 100644 index 000000000..ceae54fd5 Binary files /dev/null and b/docs/en_US/images/query_tool_new_connection_dialog.png differ diff --git a/docs/en_US/images/query_tool_new_connection_options.png b/docs/en_US/images/query_tool_new_connection_options.png new file mode 100644 index 000000000..6f026110f Binary files /dev/null and b/docs/en_US/images/query_tool_new_connection_options.png differ diff --git a/docs/en_US/images/query_toolbar.png b/docs/en_US/images/query_toolbar.png index 35e183ca6..5d3a22a45 100644 Binary files a/docs/en_US/images/query_toolbar.png and b/docs/en_US/images/query_toolbar.png differ diff --git a/docs/en_US/images/query_toolbar_explain.png b/docs/en_US/images/query_toolbar_explain.png index 08fe600c9..0fcd3bfd0 100644 Binary files a/docs/en_US/images/query_toolbar_explain.png and b/docs/en_US/images/query_toolbar_explain.png differ diff --git a/docs/en_US/query_tool.rst b/docs/en_US/query_tool.rst index 7f4098d63..af8e7cfa0 100644 --- a/docs/en_US/query_tool.rst +++ b/docs/en_US/query_tool.rst @@ -310,8 +310,14 @@ The Query History tab displays information about recent commands: You can show or hide the queries generated internally by pgAdmin (during 'View/Edit Data' or 'Save Data' operations). -To erase the content of the *Query History* tab, select *Clear history* from -the *Clear* drop-down menu. +You can remove a single query by selecting it and clicking on the *Remove* +button. If you would like to remove all of the histories from the +*Query History* tab, then click on the *Remove All* button. + +By using the *Copy* button, you can copy a particular query to the clipboard, +and with the *Copy to Query Editor* button, you can copy a specific query to +the Query Editor tab. During this operation, all existing content in the +Query Editor is erased. Query History is maintained across sessions for each database on a per-user basis when running in Query Tool mode. In View/Edit Data mode, history is not @@ -339,13 +345,13 @@ User can connect to another server or database from existing open session of que * Click on the connection link next to connection status. * Now click on the ** option from the dropdown. -.. image:: images/new_connection_options.png +.. image:: images/query_tool_new_connection_options.png :alt: Query tool connection options :align: center -* Now select server, database, user, and role to connect and click OK. +* Now select server, database, user, and role to connect and click on the 'Save' button. -.. image:: images/new_connection_dialog.png +.. image:: images/query_tool_new_connection_dialog.png :alt: Query tool connection dialog :align: center @@ -367,24 +373,13 @@ To create a macro, select the *Manage Macros* option from the *Macros* menu on t :alt: Query Tool Manage Macros dialogue :align: center -To clear a macro, select the macro on the *Manage Macros* dialogue, and then click the *Clear* button. - -.. image:: images/query_tool_macros_clear_row.png - :alt: Query Tool Manage Macros clear the row - :align: center - -The server will prompt you for confirmation to clear the macro. +To delete a macro, select the macro on the *Manage Macros* dialogue, and then click the *Delete* button. +The server will prompt you for confirmation to delete the macro. .. image:: images/query_tool_macros_clear_confirmation.png :alt: Query Tool Manage Macros Clear row confirmation :align: center -To clear all macros, click on the *Clear* button on left side of the key. The server will prompt you for confirmation to clear all the rows. - -.. image:: images/query_tool_macros_clear_all.png - :alt: Query Tool Macros Clear All - :align: center - To execute a macro, simply select the appropriate shortcut keys, or select it from the *Macros* menu. .. image:: images/query_tool_macros_execution.png diff --git a/docs/en_US/query_tool_toolbar.rst b/docs/en_US/query_tool_toolbar.rst index 2b26bce18..794d4da18 100644 --- a/docs/en_US/query_tool_toolbar.rst +++ b/docs/en_US/query_tool_toolbar.rst @@ -40,8 +40,8 @@ File Options | | selected content of the SQL Editor panel. | | +----------------------+---------------------------------------------------------------------------------------------------+----------------+ -Editing Options -*************** +Filter/Limit Options +******************** .. table:: :class: longtable @@ -50,71 +50,11 @@ Editing Options +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | Icon | Behavior | Shortcut | +======================+===================================================================================================+================+ - | *Save Data Changes* | Click the *Save Data Changes* icon to save data changes (insert, update, or delete) in the Data | F6 | - | | Output Panel to the server. | | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Find* | Use the *Find* menu to search, replace, or navigate the code displayed in the SQL Editor: | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Find* to provide a search target, and search the SQL Editor contents. | Cmd+F | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Find next* to locate the next occurrence of the search target. | Cmd+G | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Find previous* to move to the last occurrence of the search target. | Cmd+Shift+G | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Persistent find* to identify all occurrences of the search target within the editor. | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Replace* to locate and replace (with prompting) individual occurrences of the target. | Cmd+Shift+F | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Replace all* to locate and replace all occurrences of the target within the editor. | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Jump* to navigate to the next occurrence of the search target. | Alt+G | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Copy* | Click the *Copy* icon to copy the content with or without header: | Accesskey + C | + | *Filter* | Click the *Filter* icon to set filtering and sorting criteria for the data when in *View/Edit data| Accesskey + F | + | | mode*. Click the down arrow to access other filtering and sorting options: | | | | | | - | | * Click the *Copy* icon to copy the content that is currently highlighted in the Data Output | | - | | panel. | | - | | | | - | | * Click *Copy with headers* to copy the highlighted content along with the header. | | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Paste* | Click the *Paste* icon to paste a previously copied row into a new row. | Accesskey + P | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Delete* | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted |Accesskey + D | - | | when you click the *Save Data Changes* icon. | | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Edit* | Use options on the *Edit* menu to access text editing tools; the options operate on the text | | - | | displayed in the SQL Editor panel when in Query Tool mode: | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Indent Selection* to indent the currently selected text. | Tab | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Unindent Selection* to remove indentation from the currently selected text. | Shift+Tab | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Inline Comment Selection* to enclose any lines that contain the selection in SQL style | Cmd+/ | - | | comment notation. | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Inline Uncomment Selection* to remove SQL style comment notation from the selected line. | Cmd+. | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Block Comment* to enclose all lines that contain the selection in C style comment | Shift+Cmd+/ | - | | notation. This option acts as a toggle. | | - | +---------------------------------------------------------------------------------------------------+----------------+ - | | Select *Format SQL* to format the selected SQL or all the SQL if none is selected | Shift+Cmd+K | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - -View/Edit Data Resultset Control -******************************** - -.. table:: - :class: longtable - :widths: 1 4 1 - - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | Icon | Behavior | Shortcut | - +======================+===================================================================================================+================+ - | *Filter* | Click the *Filter* icon to set filtering and sorting criteria for the data when in View/Edit data | Accesskey + F | - | | mode. Click the down arrow to access other filtering and sorting options: | | - | | | | - | | * Click *Sort/Filter* to open the sorting and filtering dialogue. In the *SQL Filter*, you can | | - | | enter a SQL query as filtering criteria. In *Data Sorting*, you can select the column and | | - | | specify the order for sorting. | | + | | * In the *SQL Filter*, you can enter a SQL query as filtering criteria. | | + | | In *Data Sorting*, you can select the column and specify the order for sorting. | | | | | | | | * Click *Filter by Selection* to show only the rows containing the values in the selected cells. | | | | | | @@ -125,12 +65,48 @@ View/Edit Data Resultset Control +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | Limit Selector | Select a value in the *Limit Selector* to limit the size of the dataset to a number of rows. | Accesskey + R | +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Stop* | Click the *Stop* icon to cancel the execution of the currently running query. | Accesskey + Q | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + +Query Editing Options +********************* + +.. image:: images/query_editing.png + :alt: Query tool editing options + :align: center + +.. table:: + :class: longtable + :widths: 1 4 1 + + +----------------------+---------------------------------------------------------------------------------------------------+-----------------------+ + | Icon | Behavior | Shortcut | + +======================+===================================================================================================+=======================+ + | *Edit* | Use the *Edit* menu to search, replace, or navigate the code displayed in the SQL Editor: | | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Find* to provide a search target, and search the SQL Editor contents. | Cmd+F | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Replace* to locate and replace (with prompting) individual occurrences of the target. | Option+Cmd+F (MAC) | + | | | Ctrl+Shift+F (Others) | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Jump* to navigate to the next occurrence of the search target. | Alt+G | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Indent Selection* to indent the currently selected text. | Tab | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Unindent Selection* to remove indentation from the currently selected text. | Shift+Tab | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Toggle Comment* to comment/uncomment any lines that contain the selection in SQL style. | Cmd+/ | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Clear Query* to clear the query editor window. | Cmd+. | + | +---------------------------------------------------------------------------------------------------+-----------------------+ + | | Select *Format SQL* to format the selected SQL or all the SQL if none is selected | Shift+Cmd+K | + +----------------------+---------------------------------------------------------------------------------------------------+-----------------------+ Query Execution *************** +.. image:: images/query_execution.png + :alt: Query tool execute options + :align: center + .. table:: :class: longtable :widths: 1 4 1 @@ -138,6 +114,8 @@ Query Execution +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | Icon | Behavior | Shortcut | +======================+===================================================================================================+================+ + | *Stop* | Click the *Stop* icon to cancel the execution of the currently running query. | Accesskey + Q | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | *Execute/Refresh* | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL | F5 | | | editor panel. Click the down arrow to access other execution options: | | | | | | @@ -173,17 +151,59 @@ Query Execution +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | *Rollback* | Click the *Rollback* icon to rollback the transaction. | Shift+CTRL+R | +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Clear* | Use options on the *Clear* drop-down menu to erase display contents: | Accesskey + L | - | | | | - | | * Select *Clear Query Window* to erase the content of the SQL Editor panel. | | - | | | | - | | * Select *Clear History* to erase the content of the *History* tab. | | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ - | *Save results to* | Click the Save results to file icon to save the result set of the current query as a delimited | F8 | - | *file* | text file (CSV, if the field separator is set to a comma). This button will only be enabled when | | - | | a query has been executed and there are results in the data grid. You can specify the CSV/TXT | | - | | settings in the Preference Dialogue under SQL Editor -> CSV/TXT output. | | - +----------------------+---------------------------------------------------------------------------------------------------+----------------+ | *Macros* | Click the *Macros* icon to manage the macros. You can create, edit or clear the macros through | | | | the *Manage Macros* option. | | +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + +Data Editing Options +******************** + +.. image:: images/query_data_editing.png + :alt: Query tool data editing options + :align: center + +.. table:: + :class: longtable + :widths: 1 4 1 + + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | Icon | Behavior | Shortcut | + +======================+===================================================================================================+================+ + | *Add row* | Click the *Add row* icon to add a new row | | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | *Copy* | Click the *Copy* icon to copy the content with or without header: | Accesskey + C | + | | | | + | | * Click the *Copy* icon to copy the content that is currently highlighted in the Data Output | | + | | panel. | | + | | | | + | | * Click *Copy with headers* to copy the highlighted content along with the header. | | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | *Paste* | Click the *Paste* icon to paste a previously copied row into a new row. | Accesskey + P | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | *Delete* | Click the *Delete* icon to mark the selected rows for deletion. These marked rows get deleted | Accesskey + D | + | | when you click the *Save Data Changes* icon. | | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | *Save Data Changes* | Click the *Save Data Changes* icon to save data changes (insert, update, or delete) in the Data | F6 | + | | Output Panel to the server. | | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + | *Save results to* | Click the Save results to file icon to save the result set of the current query as a delimited | F8 | + | *file* | text file (CSV, if the field separator is set to a comma). This button will only be enabled when | | + | | a query has been executed and there are results in the data grid. You can specify the CSV/TXT | | + | | settings in the Preference Dialogue under SQL Editor -> CSV/TXT output. | | + +----------------------+---------------------------------------------------------------------------------------------------+----------------+ + +Status Bar +********** + +.. image:: images/query_status_bar.png + :alt: Query tool status bar + :align: center + +The status bar shows the following information: + +* **Total rows**: The total number of rows returned by the query. +* **Query complete**: The time is taken by the query to complete. +* **Rows selected**: The number of rows selected in the data output panel. +* **Changes staged**: This information showed the number of rows added, deleted, and updated. +* **Ln**: In the Query tab, it is the line number at which the cursor is positioned. +* **Col**: In the Query tab, it is the column number at which the cursor is positioned diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx index e2d6f9bdd..f6ee27b3d 100644 --- a/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx +++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx @@ -549,13 +549,13 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) { onClick={()=>{eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'jumpToLine');}}>{gettext('Jump')} {eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'indentMore');}}>{gettext('Indent')} + onClick={()=>{eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'indentMore');}}>{gettext('Indent Selection')} {eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'indentLess');}}>{gettext('Unindent')} + onClick={()=>{eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'indentLess');}}>{gettext('Unindent Selection')} {eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'toggleComment');}}>{gettext('Toggle comment')} + onClick={()=>{eventBus.fireEvent(QUERY_TOOL_EVENTS.EDITOR_EXEC_CMD, 'toggleComment');}}>{gettext('Toggle Comment')} {gettext('Clear query')} + onClick={clearQuery}>{gettext('Clear Query')} {gettext('Format SQL')}