feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlConsole: Fix bug: Jump to location in editor

Browse Source 
Since the file path starts with file:/// use QUrl to
get local file name.

Task-number: QTCREATORBUG-9337
Change-Id: Icf591fdcab8cb626cfbf844c451a2c87c07b853a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Aurindam Jana
2013-05-24 16:31:01 +02:00
committed by Kai Koehne
parent 25dd94808d
commit b0854e3c71
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
View File

@@ -33,6 +33,7 @@
#include <QPainter> #include <QPainter>
#include <QTreeView> #include <QTreeView>
#include <QScrollBar> #include <QScrollBar>
#include <QUrl>
const char CONSOLE_LOG_BACKGROUND_COLOR[] = "#E8EEF2"; const char CONSOLE_LOG_BACKGROUND_COLOR[] = "#E8EEF2";
const char CONSOLE_WARNING_BACKGROUND_COLOR[] = "#F6F4EB"; const char CONSOLE_WARNING_BACKGROUND_COLOR[] = "#F6F4EB";
@@ -215,6 +216,9 @@ void QmlConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
if (showFileLineInfo) { if (showFileLineInfo) {
// Check for file info // Check for file info
QString file = index.data(QmlConsoleItemModel::FileRole).toString(); QString file = index.data(QmlConsoleItemModel::FileRole).toString();
const QUrl fileUrl = QUrl(file);
if (fileUrl.isLocalFile())
file = fileUrl.toLocalFile();
if (!file.isEmpty()) { if (!file.isEmpty()) {
QFontMetrics fm(option.font); QFontMetrics fm(option.font);
// Paint FileArea // Paint FileArea

12
src/plugins/qmljstools/qmlconsoleview.cpp
View File

@@ -226,8 +226,10 @@ void QmlConsoleView::onRowActivated(const QModelIndex &index)
return; return;
// See if we have file and line Info // See if we have file and line Info
QString filePath = model()->data(index, QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString();
QmlConsoleItemModel::FileRole).toString(); const QUrl fileUrl = QUrl(filePath);
if (fileUrl.isLocalFile())
filePath = fileUrl.toLocalFile();
if (!filePath.isEmpty()) { if (!filePath.isEmpty()) {
QFileInfo fi(filePath); QFileInfo fi(filePath);
if (fi.exists() && fi.isFile() && fi.isReadable()) { if (fi.exists() && fi.isFile() && fi.isReadable()) {
@@ -245,6 +247,9 @@ void QmlConsoleView::copyToClipboard(const QModelIndex &index)
QString contents = model()->data(index, QmlConsoleItemModel::ExpressionRole).toString(); QString contents = model()->data(index, QmlConsoleItemModel::ExpressionRole).toString();
// See if we have file and line Info // See if we have file and line Info
QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString(); QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString();
const QUrl fileUrl = QUrl(filePath);
if (fileUrl.isLocalFile())
filePath = fileUrl.toLocalFile();
if (!filePath.isEmpty()) { if (!filePath.isEmpty()) {
contents = QString(QLatin1String("%1 %2: %3")).arg(contents).arg(filePath).arg( contents = QString(QLatin1String("%1 %2: %3")).arg(contents).arg(filePath).arg(
model()->data(index, QmlConsoleItemModel::LineRole).toString()); model()->data(index, QmlConsoleItemModel::LineRole).toString());
@@ -260,6 +265,9 @@ bool QmlConsoleView::canShowItemInTextEditor(const QModelIndex &index)
// See if we have file and line Info // See if we have file and line Info
QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString(); QString filePath = model()->data(index, QmlConsoleItemModel::FileRole).toString();
const QUrl fileUrl = QUrl(filePath);
if (fileUrl.isLocalFile())
filePath = fileUrl.toLocalFile();
if (!filePath.isEmpty()) { if (!filePath.isEmpty()) {
QFileInfo fi(filePath); QFileInfo fi(filePath);
if (fi.exists() && fi.isFile() && fi.isReadable()) if (fi.exists() && fi.isFile() && fi.isReadable())