diff options
Diffstat (limited to 'src/plugins/qmldesigner/components')
7 files changed, 34 insertions, 64 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 3442599275..b7f5057674 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -49,16 +49,15 @@ #include <formeditorview.h> #include <lineeditaction.h> +#include <utils/fileutils.h> + namespace QmlDesigner { FormEditorWidget::FormEditorWidget(FormEditorView *view) : QWidget(), m_formEditorView(view) { - QFile file(":/qmldesigner/formeditorstylesheet.css"); - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - setStyleSheet(styleSheet); + setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/formeditorstylesheet.css"))); QVBoxLayout *fillLayout = new QVBoxLayout(this); fillLayout->setMargin(0); @@ -152,11 +151,8 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_graphicsView = new FormEditorGraphicsView(this); fillLayout->addWidget(m_graphicsView.data()); - { - QFile file(":/qmldesigner/scrollbar.css"); - file.open(QFile::ReadOnly); - m_graphicsView.data()->setStyleSheet(file.readAll()); - } + m_graphicsView.data()->setStyleSheet( + QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); QList<QAction*> lowerActions; diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp index ba70659bd8..9aa259ad84 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp @@ -57,6 +57,8 @@ #include <variantproperty.h> #include <rewritingexception.h> +#include <utils/fileutils.h> + #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFile> @@ -768,27 +770,17 @@ bool DesignDocumentController::save(QWidget *parent) saveAs(parent); return true; } - QFile file(m_d->fileName); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - showError(tr("Cannot write file: \"%1\".").arg(m_d->fileName), parent); + Utils::FileSaver saver(m_d->fileName, QIODevice::Text); + if (m_d->model) + saver.write(m_d->textEdit->toPlainText().toLatin1()); + if (!saver.finalize()) { + showError(saver.errorString(), parent); return false; } - - QString errorMessage; - bool result = save(&file, &errorMessage); - if (!result) - showError(errorMessage, parent); - return result; -} - -bool DesignDocumentController::save(QIODevice *device, QString * /*errorMessage*/) -{ - if (m_d->model) { - QByteArray data = m_d->textEdit->toPlainText().toLatin1(); - device->write(data); + if (m_d->model) m_d->textEdit->setPlainText(m_d->textEdit->toPlainText()); // clear undo/redo history - } - return false; + + return true; } diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h index 83b532f419..eff24623fc 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h @@ -136,7 +136,6 @@ private: void attachNodeInstanceView(); QWidget *centralWidget() const; class DesignDocumentControllerPrivate *m_d; - bool save(QIODevice *device, QString *errorMessage); }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 7049cb266e..7ddb2f461d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -33,6 +33,7 @@ #include "itemlibrarywidget.h" #include <utils/filterlineedit.h> +#include <utils/fileutils.h> #include <coreplugin/coreconstants.h> #include "itemlibrarycomponents.h" #include "itemlibrarymodel.h" @@ -227,19 +228,9 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : setSearchFilter(QString()); /* style sheets */ - { - QFile file(":/qmldesigner/stylesheet.css"); - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - setStyleSheet(styleSheet); - } - - { - QFile file(":/qmldesigner/scrollbar.css"); - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - m_d->m_resourcesView->setStyleSheet(styleSheet); - } + setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css"))); + m_d->m_resourcesView->setStyleSheet( + QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); } ItemLibraryWidget::~ItemLibraryWidget() diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp index f227335832..59d6297c66 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp @@ -33,11 +33,12 @@ #include <QtGui/QBoxLayout> #include <QtGui/QTreeView> #include <QtGui/QHeaderView> -#include <QFile> #include <model.h> #include "navigatorwidget.h" +#include <utils/fileutils.h> + namespace QmlDesigner { @@ -63,17 +64,9 @@ NavigatorWidget::NavigatorWidget(QWidget* parent) : setWindowTitle(tr("Navigator", "Title of navigator view")); - { - QFile file(":/qmldesigner/stylesheet.css"); - file.open(QFile::ReadOnly); - setStyleSheet(file.readAll()); - } - - { - QFile file(":/qmldesigner/scrollbar.css"); - file.open(QFile::ReadOnly); - m_treeView->setStyleSheet(file.readAll()); - } + setStyleSheet(QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css"))); + m_treeView->setStyleSheet( + QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css"))); } NavigatorWidget::~NavigatorWidget() diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 4415691265..48dd3e8361 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -31,6 +31,7 @@ **************************************************************************/ #include "basicwidgets.h" +#include <utils/fileutils.h> #include <qlayoutobject.h> #include <QDeclarativeContext> #include <QDeclarativeEngine> @@ -442,13 +443,11 @@ public: fileName = (QLatin1Char(':') + _styleSheetFile.toLocalFile().split(QLatin1Char(':')).last()); //try if it is a resource else fileName = (_styleSheetFile.toLocalFile()); - QFile file(fileName); - if (file.open(QIODevice::ReadOnly)) { - QString styleSheet(file.readAll()); - q->setStyleSheet(styleSheet); - } else { - qWarning() << QString::fromLatin1("setStyleSheetFile: %1: %2").arg(fileName, file.errorString()); - } + Utils::FileReader reader; + if (reader.fetch(fileName)) + q->setStyleSheet(QString::fromLatin1(reader.data())); + else + qWarning() << QString::fromLatin1("setStyleSheetFile: %1").arg(reader.errorString()); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index a6fff788f4..bd3319acd0 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -59,6 +59,8 @@ #include "propertyeditortransaction.h" #include "originwidget.h" +#include <utils/fileutils.h> + #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFileSystemWatcher> @@ -278,10 +280,8 @@ PropertyEditor::PropertyEditor(QWidget *parent) : m_updateShortcut = new QShortcut(QKeySequence("F5"), m_stackedWidget); connect(m_updateShortcut, SIGNAL(activated()), this, SLOT(reloadQml())); - QFile file(":/qmldesigner/stylesheet.css"); - file.open(QFile::ReadOnly); - QString styleSheet = QLatin1String(file.readAll()); - m_stackedWidget->setStyleSheet(styleSheet); + m_stackedWidget->setStyleSheet( + QLatin1String(Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css"))); m_stackedWidget->setMinimumWidth(300); m_stackedWidget->move(0, 0); connect(m_stackedWidget, SIGNAL(resized()), this, SLOT(updateSize())); |