Do not show the titlebar for the Table Browser dock when there is only one

mgrojo · mgrojo · commit c40fb07b8791 · 2022-06-25T01:11:16.000+02:00
This saves space and avoids redundancy in the different places where the table name appears. A new toolbar button for adding a new dock is included, so the functionality is still visible (it might be more discoverable now, indeed). Related to issue #2283. See comment in: #2918 (comment)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -3795,8 +3795,13 @@ void MainWindow::tableBrowserTabClosed()
     // the last dock which is closed instead of if there is no dock remaining.
     if(allTableBrowserDocks().size() == 1)
     {
-        newTableBrowserTab();
+        newTableBrowserTab({}, /* forceHideTitlebar */ true);
     } else {
+        // If only one dock will be left, make sure its titlebar is hidden.
+        if(allTableBrowserDocks().size() == 2) {
+            for(auto dock : allTableBrowserDocks())
+                dock->setTitleBarWidget(new QWidget(dock));
+        }
         // If the currently active tab is closed activate another tab
         if(currentTableBrowser && sender() == currentTableBrowser->parent())
         {
@@ -3807,7 +3812,7 @@ void MainWindow::tableBrowserTabClosed()
     }
 }
 
-TableBrowserDock* MainWindow::newTableBrowserTab(const sqlb::ObjectIdentifier& tableToBrowse)
+TableBrowserDock* MainWindow::newTableBrowserTab(const sqlb::ObjectIdentifier& tableToBrowse, bool forceHideTitleBar)
 {
     // Prepare new dock
     TableBrowserDock* d = new TableBrowserDock(ui->tabBrowsers, this);
@@ -3848,6 +3853,14 @@ TableBrowserDock* MainWindow::newTableBrowserTab(const sqlb::ObjectIdentifier& t
     });
     connect(d->tableBrowser(), &TableBrowser::prepareForFilter, editDock, &EditDialog::promptSaveData);
 
+    // Restore titlebar for any other widget
+    for(auto dock : allTableBrowserDocks())
+        dock->setTitleBarWidget(nullptr);
+
+    // Hide titlebar if it is the only one dock
+    if(allTableBrowserDocks().size() == 0 || forceHideTitleBar)
+        d->setTitleBarWidget(new QWidget(d));
+
     // Set up dock and add it to the tab
     ui->tabBrowsers->addDockWidget(Qt::TopDockWidgetArea, d);
     if(allTableBrowserDocks().size() > 1)
diff --git a/src/MainWindow.h b/src/MainWindow.h
@@ -238,7 +238,7 @@ private slots:
     void renameSqlTab(int index);
     void showContextMenuSqlTabBar(const QPoint& pos);
 
-    TableBrowserDock* newTableBrowserTab(const sqlb::ObjectIdentifier& tableToBrowse = {});
+    TableBrowserDock* newTableBrowserTab(const sqlb::ObjectIdentifier& tableToBrowse = {}, bool forceHideTitleBar = false);
     void tableBrowserTabClosed();
     void changeTableBrowserTab(TableBrowserDock* dock);
 };
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -172,11 +172,13 @@ TableBrowser::TableBrowser(DBBrowserDB* _db, QWidget* parent) :
         emit foreignKeyClicked(table, column, value);
     });
 
+    connect(ui->actionAddDock, &QAction::triggered, this, [this]() {
+        emit newDockRequested();
+    });
     connect(ui->actionRefresh, &QAction::triggered, this, [this]() {
         db->updateSchema();
         refresh();
     });
-
     connect(ui->fontComboBox, &QFontComboBox::currentFontChanged, this, [this](const QFont &font) {
         modifyFormat([font](CondFormat& format) { format.setFontFamily(font.family()); });
     });
diff --git a/src/TableBrowser.h b/src/TableBrowser.h
@@ -98,6 +98,7 @@ public slots:
     void foreignKeyClicked(sqlb::ObjectIdentifier table, std::string column, QByteArray value);
     void dataAboutToBeEdited(const QModelIndex& index);
     void prepareForFilter();
+    void newDockRequested();
 
 private slots:
     void clear();
diff --git a/src/TableBrowser.ui b/src/TableBrowser.ui
@@ -74,6 +74,7 @@
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonIconOnly</enum>
        </property>
+       <addaction name="actionAddDock"/>
        <addaction name="actionRefresh"/>
        <addaction name="actionClearFilters"/>
        <addaction name="actionClearSorting"/>
@@ -808,6 +809,24 @@
     <enum>Qt::WidgetShortcut</enum>
    </property>
   </action>
+  <action name="actionAddDock">
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/new_tab</normaloff>:/icons/new_tab</iconset>
+   </property>
+   <property name="text">
+    <string>New Data Browser</string>
+   </property>
+   <property name="toolTip">
+    <string>Add a new docked Data Browser</string>
+   </property>
+   <property name="statusTip">
+    <string>Add a new docked Data Browser</string>
+   </property>
+   <property name="whatsThis">
+    <string>This button adss a new docked Data Browser, which you can detach and arrange in different layouts.</string>
+   </property>
+  </action>
   <action name="actionRefresh">
    <property name="icon">
     <iconset resource="icons/icons.qrc">
diff --git a/src/TableBrowserDock.cpp b/src/TableBrowserDock.cpp
@@ -34,6 +34,8 @@ TableBrowserDock::TableBrowserDock(QWidget* parent, MainWindow* mainWindow)
             setWindowTitle(QString::fromStdString(table.toDisplayString()));
     });
 
+    connect(browser, &TableBrowser::newDockRequested, this, &TableBrowserDock::newDockRequested);
+
     // Update view
     browser->refresh();
 
