X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fflag.cpp;h=380ef3273091b1f4d8d29f1bc68a5dd296e581da;hp=2ee8ced4972413439d67ba938014c2dee5617e46;hb=48257a69ffad409c9893605d99cd6e15161dff4f;hpb=dbfae3f1b55b984c7ee7e619a8da53b77db98c90

diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 2ee8ced4..380ef327 100644
--- a/pv/view/flag.cpp
+++ b/pv/view/flag.cpp
@@ -24,8 +24,9 @@
 #include <QColor>
 #include <QFormLayout>
 #include <QLineEdit>
+#include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <pv/widgets/popup.hpp>
 
@@ -36,7 +37,7 @@ namespace view {
 
 const QColor Flag::FillColour(0x73, 0xD2, 0x16);
 
-Flag::Flag(View &view, double time, const QString &text) :
+Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) :
 	TimeMarker(view, FillColour, time),
 	text_(text)
 {
@@ -60,7 +61,12 @@ QString Flag::get_text() const
 
 pv::widgets::Popup* Flag::create_popup(QWidget *parent)
 {
-	pv::widgets::Popup *const popup = TimeMarker::create_popup(parent);
+	using pv::widgets::Popup;
+
+	Popup *const popup = TimeMarker::create_popup(parent);
+	popup->set_position(parent->mapToGlobal(
+		point(parent->rect())), Popup::Bottom);
+
 	QFormLayout *const form = (QFormLayout*)popup->layout();
 
 	QLineEdit *const text_edit = new QLineEdit(popup);
@@ -74,7 +80,24 @@ pv::widgets::Popup* Flag::create_popup(QWidget *parent)
 	return popup;
 }
 
+QMenu* Flag::create_context_menu(QWidget *parent)
+{
+	QMenu *const menu = new QMenu(parent);
+
+	QAction *const del = new QAction(tr("Delete"), this);
+	del->setShortcuts(QKeySequence::Delete);
+	connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
+	menu->addAction(del);
+
+	return menu;
+}
+
 void Flag::delete_pressed()
+{
+	on_delete();
+}
+
+void Flag::on_delete()
 {
 	view_.remove_flag(shared_ptr<Flag>(shared_from_this()));
 }
@@ -85,5 +108,15 @@ void Flag::on_text_changed(const QString &text)
 	view_.time_item_appearance_changed(true, false);
 }
 
+void Flag::drag_by(const QPoint &delta)
+{
+	// Treat trigger markers as immovable
+	if (text_ == "T")
+		return;
+
+	TimeMarker::drag_by(delta);
+}
+
+
 } // namespace view
 } // namespace pv