X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=bc2c3ba8a3cb9380710eb7462d51663a9987eca8;hb=78bf7ce5aaa1e02717973dc559c24973a313b541;hp=eee00b3f2f642b2d5b9c0a41e22faaf0f8492293;hpb=dfe1bf82619704af27e4cbf83b75c6b5f367f425;p=pulseview.git
diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index eee00b3..bc2c3ba 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -15,19 +15,18 @@
* 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
#include
#include "standardbar.hpp"
+#include "view.hpp"
#include
-#include
-using pv::views::TraceView::View;
+using pv::views::trace::View;
namespace pv {
namespace views {
@@ -65,8 +64,8 @@ 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(bool)));
@@ -79,8 +78,7 @@ 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()));
@@ -93,7 +91,7 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
add_toolbar_widgets();
}
-Session &StandardBar::session(void) const
+Session &StandardBar::session() const
{
return session_;
}