forked from qt-creator/qt-creator
Added find support to ResourceEditor.
Change-Id: Icf3770fde8329d8507befeeef89186f86476749d Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
committed by
Eike Ziller
parent
cad2966498
commit
b800aeb3cb
@@ -15,5 +15,6 @@ Alternatively, this plugin may be used under the terms of the GNU Lesser General
|
|||||||
<url>http://qt.nokia.com</url>
|
<url>http://qt.nokia.com</url>
|
||||||
<dependencyList>
|
<dependencyList>
|
||||||
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
|
<dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
|
<dependency name=\"Find\" version=\"$$QTCREATOR_VERSION\"/>
|
||||||
</dependencyList>
|
</dependencyList>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
@@ -6,6 +6,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII
|
|||||||
include(../../qtcreatorplugin.pri)
|
include(../../qtcreatorplugin.pri)
|
||||||
include(../../libs/utils/utils.pri)
|
include(../../libs/utils/utils.pri)
|
||||||
include(../../plugins/coreplugin/coreplugin.pri)
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
|
include(../../plugins/find/find.pri)
|
||||||
include(../../shared/qrceditor/qrceditor.pri)
|
include(../../shared/qrceditor/qrceditor.pri)
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../../tools/utils
|
INCLUDEPATH += $$PWD/../../tools/utils
|
||||||
|
@@ -36,9 +36,11 @@
|
|||||||
|
|
||||||
#include <qrceditor.h>
|
#include <qrceditor.h>
|
||||||
|
|
||||||
|
#include <aggregation/aggregate.h>
|
||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
#include <coreplugin/editormanager/editormanager.h>
|
#include <coreplugin/editormanager/editormanager.h>
|
||||||
#include <coreplugin/documentmanager.h>
|
#include <coreplugin/documentmanager.h>
|
||||||
|
#include <find/treeviewfind.h>
|
||||||
#include <utils/reloadpromptutils.h>
|
#include <utils/reloadpromptutils.h>
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
|
|
||||||
@@ -85,6 +87,10 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
|
|||||||
setContext(context);
|
setContext(context);
|
||||||
setWidget(m_resourceEditor);
|
setWidget(m_resourceEditor);
|
||||||
|
|
||||||
|
Aggregation::Aggregate * agg = new Aggregation::Aggregate;
|
||||||
|
agg->add(m_resourceEditor->treeView());
|
||||||
|
agg->add(new Find::TreeViewFind(m_resourceEditor->treeView()));
|
||||||
|
|
||||||
m_resourceEditor->setResourceDragEnabled(true);
|
m_resourceEditor->setResourceDragEnabled(true);
|
||||||
m_openWithMenu = m_contextMenu->addMenu(tr("Open With"));
|
m_openWithMenu = m_contextMenu->addMenu(tr("Open With"));
|
||||||
// Below we need QueuedConnection because otherwise, if this qrc file
|
// Below we need QueuedConnection because otherwise, if this qrc file
|
||||||
|
@@ -50,6 +50,7 @@ public:
|
|||||||
|
|
||||||
bool load(const QString &fileName);
|
bool load(const QString &fileName);
|
||||||
bool save();
|
bool save();
|
||||||
|
QTreeView *treeView() { return m_treeview; }
|
||||||
QString errorMessage() const { return m_treeview->errorMessage(); }
|
QString errorMessage() const { return m_treeview->errorMessage(); }
|
||||||
|
|
||||||
bool isDirty();
|
bool isDirty();
|
||||||
|
Reference in New Issue
Block a user