projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: display type-related improvements
[pulseview.git]
/
pv
/
views
/
trace
/
standardbar.cpp
diff --git
a/pv/views/trace/standardbar.cpp
b/pv/views/trace/standardbar.cpp
index def3ebc594c2e1d860a89b17214909bf020feefb..dc82ff1e1c065fdc918645cf31bffdcd98f1e1b4 100644
(file)
--- a/
pv/views/trace/standardbar.cpp
+++ b/
pv/views/trace/standardbar.cpp
@@
-15,8
+15,7
@@
* 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 <QAction>
@@
-69,7
+68,7
@@
StandardBar::StandardBar(Session &session, QWidget *parent,
QIcon(":/icons/zoom-fit.png")));
action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F));
connect(action_view_zoom_fit_, SIGNAL(triggered(bool)),
QIcon(":/icons/zoom-fit.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",
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",
@@
-86,11
+85,14
@@
StandardBar::StandardBar(Session &session, QWidget *parent,
this, SLOT(on_actionViewShowCursors_triggered()));
action_view_show_cursors_->setText(tr("Show &Cursors"));
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();
}
if (add_default_widgets)
add_toolbar_widgets();
}
-Session &StandardBar::session(
void
) const
+Session &StandardBar::session() const
{
return session_;
}
{
return session_;
}
@@
-141,9
+143,9
@@
void StandardBar::on_actionViewZoomOut_triggered()
view_->zoom(-1);
}
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()
}
void StandardBar::on_actionViewZoomOneToOne_triggered()