X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=e1073144f7f97ca931b4733b27eead0dad3afaa0;hp=4a98e4081b68e9999a2f07b3f17d78fdd9276951;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 4a98e40..e107314 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;
@@ -212,15 +211,16 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
 				connect(main_bar.get(), SIGNAL(new_view(Session*)),
 					this, SLOT(on_new_view(Session*)));
+
+				main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
 			} else {
 				/* Additional view, create a standard bar */
-				dock_main->addToolBar(
-					new pv::views::trace::StandardBar(session, this, v.get()));
-			}
-			main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+				pv::views::trace::StandardBar *standard_bar =
+					new pv::views::trace::StandardBar(session, this, v.get());
+				dock_main->addToolBar(standard_bar);
 
-			connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
-				main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+				standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+			}
 		}
 
 		return v;
@@ -279,8 +279,9 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 				// that Qt keeps a pointer to the view around
 				entry.second->setParent(0);
 
-				// Remove this entry from the container
+				// Remove this entry from the container and stop iterating.
 				view_docks_.erase(entry.first);
+				break;
 			}
 	}
 
@@ -335,25 +336,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();