A bit of polishing of the main window user-interface

Reorder the context menu of the table header and use separators for coherent grouping: column actions, misc and encoding. Set buttons invisible in the DB Structure toolbar when the object is different to the supported ones. Disabling wasn't enough because the logic for changing icon and text wasn't working well for fields and other items. Separate Print from object actions in that same toolbar. New icon for Project Save so it uses the same metaphor (floppy disk) as other save actions. Improved the look in the clear filters icon by editing it in gimp. It had a glitch in the funnel base.
sqlitebrowser · Sep 29, 2018 · f42b614 · f42b614
1 parent 071f963
commit f42b614
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -233,13 +233,14 @@ void MainWindow::init()
 
     popupBrowseDataHeaderMenu = new QMenu(this);
     popupBrowseDataHeaderMenu->addAction(ui->actionShowRowidColumn);
+    popupBrowseDataHeaderMenu->addAction(ui->actionHideColumns);
+    popupBrowseDataHeaderMenu->addAction(ui->actionShowAllColumns);
+    popupBrowseDataHeaderMenu->addSeparator();
     popupBrowseDataHeaderMenu->addAction(ui->actionUnlockViewEditing);
     popupBrowseDataHeaderMenu->addAction(ui->actionBrowseTableEditDisplayFormat);
-    popupBrowseDataHeaderMenu->addAction(ui->actionSetTableEncoding);
     popupBrowseDataHeaderMenu->addSeparator();
+    popupBrowseDataHeaderMenu->addAction(ui->actionSetTableEncoding);
     popupBrowseDataHeaderMenu->addAction(ui->actionSetAllTablesEncoding);
-    popupBrowseDataHeaderMenu->addAction(ui->actionHideColumns);
-    popupBrowseDataHeaderMenu->addAction(ui->actionShowAllColumns);
 
     QShortcut* dittoRecordShortcut = new QShortcut(QKeySequence("Ctrl+\""), this);
     connect(dittoRecordShortcut, &QShortcut::activated, [this]() {
@@ -1744,11 +1745,19 @@ void MainWindow::changeTreeSelection()
     } else if(type == "index") {
         ui->editDeleteObjectAction->setText(tr("Delete Index"));
         ui->editModifyObjectAction->setText(tr("Modify Index"));
-    } else {
+    } else if(type == "table") {
         ui->editDeleteObjectAction->setText(tr("Delete Table"));
         ui->editModifyObjectAction->setText(tr("Modify Table"));
+    } else {
+        // Nothing to do for other types. Set the buttons not visible and return.
+        ui->editDeleteObjectAction->setVisible(false);
+        ui->editModifyObjectAction->setVisible(false);
+        return;
     }
 
+    ui->editDeleteObjectAction->setVisible(true);
+    ui->editModifyObjectAction->setVisible(true);
+
     // Activate actions
     if(type == "table" || type == "index")
     {

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
@@ -56,6 +56,7 @@
           <addaction name="editCreateIndexAction"/>
           <addaction name="editModifyObjectAction"/>
           <addaction name="editDeleteObjectAction"/>
+          <addaction name="separator"/>
           <addaction name="actionDbPrint"/>
          </widget>
         </item>

diff --git a/src/icons/clear_filters.png b/src/icons/clear_filters.png
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
@@ -37,7 +37,7 @@
         <file alias="up">bullet_arrow_up.png</file>
         <file alias="appicon">sqlitebrowser.png</file>
         <file alias="browser_open">internet-web-browser.png</file>
-        <file alias="project_save">package.png</file>
+        <file>package.png</file>
         <file alias="project_open">package_go.png</file>
         <file alias="field_key">page_key.png</file>
         <file alias="encryption">key.png</file>
@@ -67,5 +67,6 @@
         <file alias="db_attach">database_link.png</file>
         <file alias="text_indent">text_indent.png</file>
         <file alias="print">printer.png</file>
+        <file alias="project_save">package_save.png</file>
     </qresource>
 </RCC>
diff --git a/src/icons/package_save.png b/src/icons/package_save.png