#include <QApplication>
#include <QCloseEvent>
#include <QDockWidget>
+#include <QHBoxLayout>
#include <QSettings>
#include <QWidget>
dock_main->addToolBar(main_bar.get());
session.set_main_bar(main_bar);
- connect(main_bar.get(), SIGNAL(new_session()),
- this, SLOT(on_new_session()));
connect(main_bar.get(), SIGNAL(new_view(Session*)),
this, SLOT(on_new_view(Session*)));
}
session_windows_[session] = window;
session_selector_.addTab(window, name);
+ window->setDockNestingEnabled(true);
+
shared_ptr<views::ViewBase> main_view =
add_view(name, views::ViewTypeTrace, *session);
void MainWindow::remove_session(shared_ptr<Session> session)
{
+ int h = new_session_button_->height();
+
for (shared_ptr<views::ViewBase> view : session->views()) {
// Find the dock the view is contained in and remove it
for (auto entry : view_docks_)
sessions_.remove_if([&](shared_ptr<Session> s) {
return s == session; });
- // Update the window title if there is no view left to
- // generate focus change events
- if (sessions_.empty())
+ if (sessions_.empty()) {
+ // When there are no more tabs, the height of the QTabWidget
+ // drops to zero. We must prevent this to keep the static
+ // widgets visible
+ for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())
+ w->setMinimumHeight(h);
+
+ int margin = static_tab_widget_->layout()->contentsMargins().bottom();
+ static_tab_widget_->setMinimumHeight(h + 2 * margin);
+ session_selector_.setMinimumHeight(h + 2 * margin);
+
+ // Update the window title if there is no view left to
+ // generate focus change events
setWindowTitle(WindowTitle);
+ }
}
void MainWindow::setup_ui()
action_about_->setObjectName(QString::fromUtf8("actionAbout"));
action_about_->setText(tr("&About..."));
- setDockNestingEnabled(true);
+ // Set up the tab area
+ new_session_button_ = new QToolButton();
+ new_session_button_->setIcon(QIcon::fromTheme("document-new",
+ QIcon(":/icons/document-new.png")));
+ new_session_button_->setAutoRaise(true);
+
+ QHBoxLayout* layout = new QHBoxLayout();
+ layout->setContentsMargins(2, 2, 2, 2);
+ layout->addWidget(new_session_button_);
+
+ static_tab_widget_ = new QWidget();
+ static_tab_widget_->setLayout(layout);
+
+ session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
+ session_selector_.setTabsClosable(true);
+
+ connect(new_session_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_new_session_clicked()));
+
+ connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(on_tab_close_requested(int)));
+ connect(&session_selector_, SIGNAL(currentChanged(int)),
+ this, SLOT(on_tab_changed(int)));
+
connect(static_cast<QApplication *>(QCoreApplication::instance()),
SIGNAL(focusChanged(QWidget*, QWidget*)),
}
}
+std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+{
+ // Find the session that belongs to the tab's main window
+ for (auto entry : session_windows_)
+ if (entry.second == session_selector_.widget(index))
+ return entry.first;
+
+ return nullptr;
+}
+
void MainWindow::closeEvent(QCloseEvent *event)
{
save_ui_settings();
void MainWindow::on_focus_changed()
{
- shared_ptr<views::ViewBase> view;
- bool title_set = false;
-
- view = get_active_view();
-
- for (shared_ptr<Session> session : sessions_) {
- if (!session->has_view(view))
- continue;
-
- setWindowTitle(session->name() + " - " + WindowTitle);
- title_set = true;
+ static shared_ptr<Session> prev_session;
+
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view) {
+ for (shared_ptr<Session> session : sessions_) {
+ if (session->has_view(view)) {
+ if (session != prev_session) {
+ // Activate correct tab if necessary
+ shared_ptr<Session> tab_session = get_tab_session(
+ session_selector_.currentIndex());
+ if (tab_session != session)
+ session_selector_.setCurrentWidget(
+ session_windows_.at(session));
+
+ on_focused_session_changed(session);
+ }
+
+ prev_session = session;
+ break;
+ }
+ }
}
- if (!title_set)
+ if (sessions_.empty())
setWindowTitle(WindowTitle);
}
-void MainWindow::on_new_session()
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
+{
+ setWindowTitle(session->name() + " - " + WindowTitle);
+}
+
+void MainWindow::on_new_session_clicked()
{
add_session();
}
}
// Refresh window title if the affected session has focus
- on_focus_changed();
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view && session->has_view(view))
+ setWindowTitle(session->name() + " - " + WindowTitle);
}
void MainWindow::on_new_view(Session *session)
}
}
+void MainWindow::on_tab_changed(int index)
+{
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ on_focused_session_changed(session);
+}
+
+void MainWindow::on_tab_close_requested(int index)
+{
+ // TODO Ask user if this is intended in case data is unsaved
+
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ remove_session(session);
+}
+
void MainWindow::on_actionViewStickyScrolling_triggered()
{
shared_ptr<views::ViewBase> viewbase = get_active_view();