X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=fa02d1677d7cad4de0473571ddb20058d4bcc9c1;hp=def3ebc594c2e1d860a89b17214909bf020feefb;hb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff;hpb=e0ba4f6fb263b4cc1dae96df2a0ff1e1ef8984ce

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index def3ebc5..fa02d167 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -15,17 +15,16 @@
  * 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 <QAction>
 #include <QMessageBox>
 
 #include "standardbar.hpp"
+#include "view.hpp"
 
 #include <pv/mainwindow.hpp>
-#include <pv/view/view.hpp>
 
 using pv::views::TraceView::View;
 
@@ -65,11 +64,11 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 
 	action_view_zoom_fit_->setCheckable(true);
 	action_view_zoom_fit_->setText(tr("Zoom to &Fit"));
-	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit",
-		QIcon(":/icons/zoom-fit.png")));
+	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit-best",
+		QIcon(":/icons/zoom-fit-best.png")));
 	action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F));
 	connect(action_view_zoom_fit_, SIGNAL(triggered(bool)),
-		this, SLOT(on_actionViewZoomFit_triggered()));
+		this, SLOT(on_actionViewZoomFit_triggered(bool)));
 
 	action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One"));
 	action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
@@ -79,18 +78,20 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 		this, SLOT(on_actionViewZoomOneToOne_triggered()));
 
 	action_view_show_cursors_->setCheckable(true);
-	action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
-		QIcon(":/icons/show-cursors.svg")));
+	action_view_show_cursors_->setIcon(QIcon(":/icons/show-cursors.svg"));
 	action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C));
 	connect(action_view_show_cursors_, SIGNAL(triggered(bool)),
 		this, SLOT(on_actionViewShowCursors_triggered()));
 	action_view_show_cursors_->setText(tr("Show &Cursors"));
 
+	connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)),
+		this, SLOT(on_always_zoom_to_fit_changed(bool)));
+
 	if (add_default_widgets)
 		add_toolbar_widgets();
 }
 
-Session &StandardBar::session(void) const
+Session &StandardBar::session() const
 {
 	return session_;
 }
@@ -141,9 +142,9 @@ void StandardBar::on_actionViewZoomOut_triggered()
 	view_->zoom(-1);
 }
 
-void StandardBar::on_actionViewZoomFit_triggered()
+void StandardBar::on_actionViewZoomFit_triggered(bool checked)
 {
-	view_->zoom_fit(action_view_zoom_fit_->isChecked());
+	view_->zoom_fit(checked);
 }
 
 void StandardBar::on_actionViewZoomOneToOne_triggered()