From 0abd29a3b455e9fa0f55be0565ee8a1723473816 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 17 Jul 2015 13:42:25 +0200
Subject: [PATCH] jump to line in source text when clicking on an error in
 error table

---
 apps/opencs/view/world/scripterrortable.cpp | 10 ++++++++++
 apps/opencs/view/world/scripterrortable.hpp |  8 ++++++++
 apps/opencs/view/world/scriptsubview.cpp    | 16 ++++++++++++++++
 apps/opencs/view/world/scriptsubview.hpp    |  2 ++
 4 files changed, 36 insertions(+)

diff --git a/apps/opencs/view/world/scripterrortable.cpp b/apps/opencs/view/world/scripterrortable.cpp
index 460bedefc..242d6c8ac 100644
--- a/apps/opencs/view/world/scripterrortable.cpp
+++ b/apps/opencs/view/world/scripterrortable.cpp
@@ -77,10 +77,14 @@ CSVWorld::ScriptErrorTable::ScriptErrorTable (const CSMDoc::Document& document,
     horizontalHeader()->setStretchLastSection (true);
     verticalHeader()->hide();
 
+    setSelectionMode (QAbstractItemView::NoSelection);
+
     Compiler::registerExtensions (mExtensions);
     mContext.setExtensions (&mExtensions);
 
     setWarningsMode (CSMSettings::UserSettings::instance().settingValue ("script-editor/warnings"));
+
+    connect (this, SIGNAL (cellClicked (int, int)), this, SLOT (cellClicked (int, int)));
 }
 
 void CSVWorld::ScriptErrorTable::updateUserSetting (const QString& name, const QStringList& value)
@@ -112,3 +116,9 @@ void CSVWorld::ScriptErrorTable::update (const std::string& source)
         addMessage (error.what(), CSMDoc::Message::Severity_SeriousError);
     }
 }
+
+void CSVWorld::ScriptErrorTable::cellClicked (int row, int column)
+{
+    int line = item (row, 1)->data (Qt::DisplayRole).toInt();
+    emit highlightError (line-1);
+}
diff --git a/apps/opencs/view/world/scripterrortable.hpp b/apps/opencs/view/world/scripterrortable.hpp
index 99557fb0d..5c6e75164 100644
--- a/apps/opencs/view/world/scripterrortable.hpp
+++ b/apps/opencs/view/world/scripterrortable.hpp
@@ -41,6 +41,14 @@ namespace CSVWorld
             void updateUserSetting (const QString& name, const QStringList& value);
 
             void update (const std::string& source);
+
+        private slots:
+
+            void cellClicked (int row, int column);
+
+        signals:
+
+            void highlightError (int line);
     };
 }
 
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index d48e647d9..36e21d53b 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -98,6 +98,8 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
     connect(mEditor, SIGNAL(cursorPositionChanged()), this, SLOT(updateStatusBar()));
 
     mErrors->update (source.toUtf8().constData());
+
+    connect (mErrors, SIGNAL (highlightError (int)), this, SLOT (highlightError (int)));
 }
 
 void CSVWorld::ScriptSubView::updateUserSetting (const QString& name, const QStringList& value)
@@ -244,3 +246,17 @@ void CSVWorld::ScriptSubView::switchToId (const std::string& id)
 {
     switchToRow (mModel->getModelIndex (id, 0).row());
 }
+
+void CSVWorld::ScriptSubView::highlightError (int line)
+{
+    QTextCursor cursor = mEditor->textCursor();
+
+    cursor.movePosition (QTextCursor::Start);
+    if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
+    {
+//        cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
+    }
+
+    mEditor->setFocus();
+    mEditor->setTextCursor (cursor);
+}
diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp
index 0b6f4d923..6be943bb8 100644
--- a/apps/opencs/view/world/scriptsubview.hpp
+++ b/apps/opencs/view/world/scriptsubview.hpp
@@ -75,6 +75,8 @@ namespace CSVWorld
             void switchToRow (int row);
 
             void switchToId (const std::string& id);
+
+            void highlightError (int line);
     };
 }