X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=e1073144f7f97ca931b4733b27eead0dad3afaa0;hp=7fe09fb732e9789ca8be26a958a4057a50e5a0fe;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=8d466c03419819b02bbbcd591ff6c2847f507d6f diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 7fe09fb..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 . */ #include @@ -280,8 +279,9 @@ void MainWindow::remove_session(shared_ptr 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; } } @@ -336,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();