projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly offset the PopupToolButton popup
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 8e180b8a086cfb6a4e02179726b5ad665089b806..806cc985c3d482877539cc07d6f90ee77c22cea5 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-27,15
+27,15
@@
#include <list>
#include <utility>
#include <list>
#include <utility>
-#include
<QWidget>
+#include
"marginwidget.h"
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Signal
;
+class
Trace
;
class View;
class View;
-class Header : public
Q
Widget
+class Header : public
Margin
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-43,9
+43,11
@@
public:
Header(View &parent);
private:
Header(View &parent);
private:
- boost::shared_ptr<pv::view::
Signal> get_mouse_over_signal
(
+ boost::shared_ptr<pv::view::
Trace> get_mouse_over_trace
(
const QPoint &pt);
const QPoint &pt);
+ void clear_selection();
+
private:
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
@@
-60,10
+62,10
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
-private slots:
- void on_action_set_name_triggered();
+ void keyPressEvent(QKeyEvent *e);
- void on_action_set_colour_triggered();
+private slots:
+ void on_signals_changed();
void on_signals_moved();
void on_signals_moved();
@@
-71,17
+73,12
@@
signals:
void signals_moved();
private:
void signals_moved();
private:
- View &_view;
-
QPoint _mouse_point;
QPoint _mouse_down_point;
QPoint _mouse_point;
QPoint _mouse_down_point;
+ bool _dragging;
- std::list<std::pair<boost::weak_ptr<Signal>, int> >
- _drag_sigs;
-
- boost::shared_ptr<Signal> _context_signal;
- QAction *_action_set_name;
- QAction *_action_set_colour;
+ std::list<std::pair<boost::weak_ptr<Trace>, int> >
+ _drag_traces;
};
} // namespace view
};
} // namespace view