QT: Fixed right-click in ge_item_view.

xtt/lib/ge/qt/ge_item_view_qt.cqt

@@ -46,6 +46,7 @@
 #include "ge_item_view_qt.h"
 #include "ge_graph.h"
 
+#include <QHeaderView>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QScrollArea>
@@ -53,7 +54,7 @@
 
 static pwr_tString80* graph_list_files();
 
-GeItemViewQt::GeItemViewQt(Ge* gectx) : ge_ctx(gectx), tree_widget(0)
+GeItemViewQt::GeItemViewQt(Ge* gectx) : QWidget(), ge_ctx(gectx), tree_widget(0)
 {
   char full_path[256];
 
@@ -64,6 +65,7 @@ GeItemViewQt::GeItemViewQt(Ge* gectx) : ge_ctx(gectx), tree_widget(0)
       SLOT(activate_tree_widget(QTreeWidgetItem*, int)));
 
   tree_widget->setColumnCount(1);
+  tree_widget->header()->hide();
 
   autosave_button = new QCheckBox("Autosave", this);
   connect(autosave_button, SIGNAL(stateChanged(int)), this,
@@ -88,11 +90,6 @@ GeItemViewQt::GeItemViewQt(Ge* gectx) : ge_ctx(gectx), tree_widget(0)
       SLOT(directory_changed(const QString&)));
 }
 
-QWidget* GeItemViewQt::widget()
-{
-  return this;
-}
-
 void GeItemViewQt::update()
 {
   char* texts = (char*)graph_list_files();
@@ -327,47 +324,25 @@ void GeItemViewQt::activate_tree_widget(QTreeWidgetItem* item, int idx)
   }
 }
 
-void GeItemViewQt::focusOutEvent(QFocusEvent* event)
+void GeItemViewQt::contextMenuEvent(QContextMenuEvent *mouseEvent)
 {
-  tree_widget->clearSelection();
-
-  QWidget::focusOutEvent(event);
-}
-
-void GeItemViewQt::mousePressEvent(QMouseEvent* event)
-{
-  static const char* item_text[] = { "Open", " ", "Delete", "" };
-
-  if (event->button() != Qt::RightButton) {
-    return;
-  }
-
   QMenu* menu = new QMenu(this);
-  for (int i = 0; item_text[i][0]; i++) {
-    if (item_text[i][0] == ' ') {
-      menu->addSeparator();
-    } else {
-      QAction* a = menu->addAction(item_text[i]);
-      if (i == 0) {
+  QAction* a = menu->addAction("Open");
   connect(a, SIGNAL(triggered()), this, SLOT(activate_menu_open()));
-      } else if (i == 2) {
+  menu->addSeparator();
+  a = menu->addAction("Delete");
   connect(a, SIGNAL(triggered()), this, SLOT(activate_menu_delete()));
-      }
-    }
-  }
 
-  QList<QTreeWidgetItem*> selection = tree_widget->selectedItems();
-  int sel_count = selection.size();
-  if (sel_count <= 1) {
+  if (tree_widget->selectedItems().size() == 1) {
     /* Get tree path for row that was clicked */
-    QTreeWidgetItem* path = tree_widget->itemAt(event->x(), event->y());
+    QTreeWidgetItem* path = tree_widget->itemAt(tree_widget->mapFromGlobal(mouseEvent->globalPos()));
     tree_widget->clearSelection();
     tree_widget->setCurrentItem(path);
   }
 
-  menu->popup(QPoint());
+  menu->popup(mouseEvent->globalPos());
 
-  QWidget::mousePressEvent(event);
+  QWidget::contextMenuEvent(mouseEvent);
 }
 
 void GeItemViewQt::autosave_toggled(int set)

xtt/lib/ge/qt/ge_item_view_qt.h

@@ -54,15 +54,13 @@ private:
 public:
   GeItemViewQt(Ge* gectx);
 
-  QWidget* widget();
   void update();
   void update(const char*, int);
   QString selected_text();
   QString selected_text(QTreeWidget*);
 
 protected:
-  void focusOutEvent(QFocusEvent* event);
-  void mousePressEvent(QMouseEvent* event);
+  void contextMenuEvent(QContextMenuEvent* event);
 
 private:
   QStringList files;

xtt/lib/ge/qt/ge_qt.cqt

@@ -1965,8 +1965,7 @@ GeQt::GeQt(void* x_parent_ctx, QWidget* x_parent_widget,
   ((GraphQt*)graph)->create_navigator();
   vpaned->addWidget(((GraphQt*)graph)->nav_widget);
 
-  GeItemViewQt* item_view = new GeItemViewQt(this);
-  graph_list = item_view->widget();
+  graph_list = new GeItemViewQt(this);
 
   // Horizontal pane
   QSplitter* hpaned = new QSplitter(Qt::Horizontal);