X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=fbf4370c9a212420ed7cf53e662cf5683d5461a6;hp=586b7078efd8853041494b5f95fa06dc081ec70d;hb=677db2b79b0c54ea3d684b975e2e65215b48f54a;hpb=083a8802e608a69d622ff5cda5d21ff61e289a85

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 586b707..fbf4370 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,6 +1,6 @@
 #include "BasicBlockWidget.hxx"
-#include "CustomQGraphicsTextItem.hxx"
 #include "gui/Mainwindow.hxx"
+#include "gui/dialogs/SimpleStringDialog.hxx"
 
 class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
 public:
@@ -12,6 +12,20 @@ private:
 	Mainwindow* mainwindow;
 };
 
+namespace {
+	void addComment(QTextTableCell cell, const QString& title) {
+		SimpleStringDialog dialog(title);
+		int result = dialog.exec();
+		if (QDialog::Accepted == result) {
+			// LOG4CXX_DEBUG(logger, "adding comment " << dialog.result().toStdString()
+			//               << " at row " << cell.row());
+			cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
+		} else {
+			// LOG4CXX_DEBUG(logger, "addComment aborted");
+		}
+	}
+}
+
 void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* event) {
 	QTextCursor c = textCursor();
 	c.setPosition(document()->documentLayout()->hitTest(event->pos(), Qt::FuzzyHit));
@@ -25,6 +39,20 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
 		QObject::connect(act, &QAction::triggered,
 		                 [=]() {mainwindow->requestNewFunctionByAddress(address);});
 	}
+
+	QTextTable* table = c.currentTable();
+	if (NULL != table) {
+		int row = table->cellAt(c).row();
+		QTextTableCell cell = table->cellAt(row, 2);
+		QAction* globalComment = menu.addAction("Add global Comment");
+		QAction* localComment = menu.addAction("Add local Comment");
+
+		QObject::connect(globalComment, &QAction::triggered,
+		                 [=]() { addComment(cell, "Global comment"); });
+		QObject::connect(localComment, &QAction::triggered,
+		                 [=]() { addComment(cell, "Local comment"); });
+	}
+
 	menu.exec(event->screenPos());
 }
 
@@ -81,15 +109,14 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 			                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
 		                 }
 	                 });
+}
 
+void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	           QWidget *widget) {
 	width = 10 + _widget->boundingRect().width();
 	height = 25 + _widget->boundingRect().height();
-
 	if (width < 250) width = 250;
-}
 
-void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-	           QWidget *widget) {
 	painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
 	painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
 	painter->drawRect(0, 0, width, height);