projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Use setting change handler for threshold display
[pulseview.git]
/
pv
/
views
/
trace
/
standardbar.cpp
diff --git
a/pv/views/trace/standardbar.cpp
b/pv/views/trace/standardbar.cpp
index eee00b3f2f642b2d5b9c0a41e22faaf0f8492293..bc2c3ba8a3cb9380710eb7462d51663a9987eca8 100644
(file)
--- 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
* 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 <QAction>
#include <QMessageBox>
#include "standardbar.hpp"
+#include "view.hpp"
#include <pv/mainwindow.hpp>
#include <pv/mainwindow.hpp>
-#include <pv/view/view.hpp>
-using pv::views::
TraceView
::View;
+using pv::views::
trace
::View;
namespace pv {
namespace views {
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_->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)));
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);
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_->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();
}
add_toolbar_widgets();
}
-Session &StandardBar::session(
void
) const
+Session &StandardBar::session() const
{
return session_;
}
{
return session_;
}