projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manpage: Document the new 'b' keyboard shortcut.
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 10475e27f751128d7d11dc82c536e07bfa7550bb..6e2a706833bc566c687e3d20a6bc7da51919de04 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H
-#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#ifndef PULSEVIEW_PV_TOOLBARS_MAINBAR_H
PP
+#define PULSEVIEW_PV_TOOLBARS_MAINBAR_H
PP
#include <stdint.h>
#include <stdint.h>
@@
-38,7
+38,8
@@
#include <pv/widgets/sweeptimingwidget.hpp>
namespace sigrok {
#include <pv/widgets/sweeptimingwidget.hpp>
namespace sigrok {
- class Device;
+class Device;
+class InputFormat;
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
@@
-97,6
+98,7
@@
private:
QAction *configure_button_action_;
pv::widgets::PopupToolButton channels_button_;
QAction *configure_button_action_;
pv::widgets::PopupToolButton channels_button_;
+ QAction *channels_button_action_;
pv::widgets::SweepTimingWidget sample_count_;
pv::widgets::SweepTimingWidget sample_rate_;
pv::widgets::SweepTimingWidget sample_count_;
pv::widgets::SweepTimingWidget sample_rate_;
@@
-109,6
+111,7
@@
private:
QIcon icon_green_;
QIcon icon_grey_;
QToolButton run_stop_button_;
QIcon icon_green_;
QIcon icon_grey_;
QToolButton run_stop_button_;
+ QAction *run_stop_button_action_;
QToolButton menu_button_;
};
QToolButton menu_button_;
};
@@
-116,4
+119,4
@@
private:
} // namespace toolbars
} // namespace pv
} // namespace toolbars
} // namespace pv
-#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H
+#endif // PULSEVIEW_PV_TOOLBARS_MAINBAR_H
PP