Commit 7109e5a6 authored by Christoph Cullmann's avatar Christoph Cullmann

Merge branch 'buildplugin-enhancements' into 'master'

Buildplugin enhancements

See merge request !6
parents af711872 5bb8839f
......@@ -29,6 +29,7 @@
#include <QString>
#include <QStack>
#include <QPointer>
#include <QHash>
#include <KProcess>
#include <KTextEditor/MainWindow>
......@@ -37,6 +38,7 @@
#include <KTextEditor/View>
#include <KTextEditor/SessionConfigInterface>
#include <KTextEditor/Message>
#include <KTextEditor/MarkInterface>
#include <KXMLGUIClient>
#include <KConfigGroup>
......@@ -61,7 +63,8 @@ class KateBuildView : public QObject, public KXMLGUIClient, public KTextEditor::
};
enum TreeWidgetRoles {
ErrorRole = Qt::UserRole+1
ErrorRole = Qt::UserRole+1,
DataRole
};
enum ErrorCategory {
......@@ -111,6 +114,10 @@ class KateBuildView : public QObject, public KXMLGUIClient, public KTextEditor::
void handleEsc(QEvent *e);
void slotViewChanged();
void slotDisplayOption();
void slotMarkClicked(KTextEditor::Document *doc, KTextEditor::Mark mark, bool &handled);
void slotInvalidateMoving(KTextEditor::Document* doc);
/**
* keep track if the project plugin is alive and if the project map did change
*/
......@@ -132,6 +139,9 @@ class KateBuildView : public QObject, public KXMLGUIClient, public KTextEditor::
void displayBuildResult(const QString &message, KTextEditor::Message::MessageType level);
void clearMarks();
void addMarks(KTextEditor::Document *doc, bool mark);
KTextEditor::MainWindow *m_win;
QWidget *m_toolView;
Ui::build m_buildUi;
......@@ -155,6 +165,8 @@ class KateBuildView : public QObject, public KXMLGUIClient, public KTextEditor::
QString m_prevItemContent;
QModelIndex m_previousIndex;
QPointer<KTextEditor::Message> m_infoMessage;
QPointer<QAction> m_showMarks;
QHash<KTextEditor::Document*, QPointer<KTextEditor::Document>> m_markedDocs;
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE kpartgui>
<gui name="katebuild-plugin" library="katebuildplugin" version="10" translationDomain="katebuild-plugin">
<gui name="katebuild-plugin" library="katebuildplugin" version="11" translationDomain="katebuild-plugin">
<MenuBar>
<Menu name="Build Menubar">
<text>&amp;Build</text>
......@@ -11,6 +11,8 @@
<Separator/>
<Action name="goto_prev"/>
<Action name="goto_next"/>
<Separator/>
<Action name="show_marks"/>
</Menu>
</MenuBar>
</gui>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment