X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=8aaa1635c737d376321b8ebcb9202572182cde98;hb=f30eb549fe91dde6a56f69c24f2f8169039c12a2;hp=a47089620c6c1239f2adc5a565d8346bbec007f3;hpb=dfe1bf82619704af27e4cbf83b75c6b5f367f425;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a470896..8aaa163 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -161,7 +160,7 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	views::ViewType type, Session &session)
 {
-	QMainWindow *main_window;
+	QMainWindow *main_window = nullptr;
 	for (auto entry : session_windows_)
 		if (entry.first.get() == &session)
 			main_window = entry.second;
@@ -230,6 +229,34 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	return nullptr;
 }
 
+void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
+{
+	for (shared_ptr<Session> session : sessions_) {
+		if (!session->has_view(view))
+			continue;
+
+		// Find the dock the view is contained in and remove it
+		for (auto entry : view_docks_)
+			if (entry.second == view) {
+				// Remove the view from the session
+				session->deregister_view(view);
+
+				// Remove the view from its parent; otherwise, Qt will
+				// call deleteLater() on it, which causes a double free
+				// since the shared_ptr in view_docks_ doesn't know
+				// that Qt keeps a pointer to the view around
+				view->setParent(0);
+
+				// Delete the view's dock widget and all widgets inside it
+				entry.first->deleteLater();
+
+				// Remove the dock widget from the list and stop iterating
+				view_docks_.erase(entry.first);
+				break;
+			}
+	}
+}
+
 shared_ptr<Session> MainWindow::add_session()
 {
 	static int last_session_id = 1;
@@ -267,23 +294,8 @@ 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_)
-			if (entry.second == view) {
-				// Remove the view from the session
-				session->deregister_view(view);
-
-				// Remove the view from its parent; otherwise, Qt will
-				// call deleteLater() on it, which causes a double free
-				// since the shared_ptr in view_docks_ doesn't know
-				// that Qt keeps a pointer to the view around
-				entry.second->setParent(0);
-
-				// Remove this entry from the container
-				view_docks_.erase(entry.first);
-			}
-	}
+	for (shared_ptr<views::ViewBase> view : session->views())
+		remove_view(view);
 
 	QMainWindow *window = session_windows_.at(session);
 	session_selector_.removeTab(session_selector_.indexOf(window));
@@ -336,25 +348,28 @@ void MainWindow::setup_ui()
 	action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
 	action_view_coloured_bg_->setObjectName(
 		QString::fromUtf8("actionViewColouredBg"));
-	action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+	action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
 
 	action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-	action_about_->setText(tr("&About..."));
+	action_about_->setToolTip(tr("&About..."));
 
 	// 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_->setToolTip(tr("Create New Session"));
 	new_session_button_->setAutoRaise(true);
 
 	run_stop_button_ = new QToolButton();
 	run_stop_button_->setAutoRaise(true);
 	run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 	run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+	run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
 
 	settings_button_ = new QToolButton();
 	settings_button_->setIcon(QIcon::fromTheme("configure",
 		QIcon(":/icons/configure.png")));
+	settings_button_->setToolTip(tr("Settings"));
 	settings_button_->setAutoRaise(true);
 
 	QFrame *separator1 = new QFrame();
@@ -652,7 +667,7 @@ void MainWindow::on_view_close_clicked()
 			remove_session(session);
 			break;
 		} else
-			session->deregister_view(view);
+			remove_view(view);
 	}
 }