X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fmarginwidget.cpp;h=0d35c5fc6e981718513e7c56d421fd3d8be98ada;hb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;hp=e20e7b9f00afe664e72439969b73fe5894b6eca7;hpb=6a2cc8dd37f6d128ad7e16b9a7a78bb44d5a5aa5;p=pulseview.git
diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index e20e7b9..0d35c5f 100644
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -14,11 +14,9 @@
* 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
@@ -31,16 +29,19 @@
using std::shared_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
MarginWidget::MarginWidget(View &parent) :
- QWidget(&parent),
- view_(parent),
- dragging_(false)
+ ViewWidget(parent)
{
setAttribute(Qt::WA_NoSystemBackground, true);
- setFocusPolicy(Qt::ClickFocus);
- setMouseTracking(true);
+}
+
+void MarginWidget::item_clicked(const shared_ptr &item)
+{
+ if (item && item->enabled())
+ show_popup(item);
}
void MarginWidget::show_popup(const shared_ptr &item)
@@ -50,53 +51,6 @@ void MarginWidget::show_popup(const shared_ptr &item)
p->show();
}
-void MarginWidget::mouse_left_press_event(QMouseEvent *event)
-{
- (void)event;
-
- const bool ctrl_pressed =
- QApplication::keyboardModifiers() & Qt::ControlModifier;
-
- // Clear selection if control is not pressed and this item is unselected
- if ((!mouse_down_item_ || !mouse_down_item_->selected()) &&
- !ctrl_pressed)
- clear_selection();
-
- // Set the signal selection state if the item has been clicked
- if (mouse_down_item_) {
- if (ctrl_pressed)
- mouse_down_item_->select(!mouse_down_item_->selected());
- else
- mouse_down_item_->select(true);
- }
-
- // Save the offsets of any signals which will be dragged
- const auto items = this->items();
- for (auto &i : items)
- if (i->selected())
- i->drag();
-
- selection_changed();
- update();
-}
-
-void MarginWidget::mousePressEvent(QMouseEvent *event)
-{
- assert(event);
-
- mouse_down_point_ = event->pos();
- mouse_down_item_ = get_mouse_over_item(event->pos());
-
- if (event->button() & Qt::LeftButton)
- mouse_left_press_event(event);
-}
-
-void MarginWidget::leaveEvent(QEvent*)
-{
- mouse_point_ = QPoint(-1, -1);
- update();
-}
-
void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
{
const shared_ptr r = get_mouse_over_item(mouse_point_);
@@ -108,13 +62,18 @@ void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
menu->exec(event->globalPos());
}
-void MarginWidget::clear_selection()
+void MarginWidget::keyPressEvent(QKeyEvent *event)
{
- const auto items = this->items();
- for (auto &i : items)
- i->select(false);
- update();
+ assert(event);
+
+ if (event->key() == Qt::Key_Delete) {
+ const auto items = this->items();
+ for (auto &i : items)
+ if (i->selected())
+ i->delete_pressed();
+ }
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv