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

qmlobserver: hide the toolbar and the crumble path with the -frameless

Browse Source
This commit is contained in:
Olivier Goffart
2010-08-16 19:33:48 +02:00
parent 392f86786d
commit c691e57658
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/qml/qmlobserver/qmlruntime.cpp
View File

@@ -587,17 +587,11 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
} }
canvas = new QmlViewer::QDeclarativeDesignView(this); canvas = new QmlViewer::QDeclarativeDesignView(this);
if (!(flags & Qt::FramelessWindowHint)) {
addToolBar(Qt::TopToolBarArea, canvas->toolbar()); addToolBar(Qt::TopToolBarArea, canvas->toolbar());
canvas->toolbar()->setFloatable(false); canvas->toolbar()->setFloatable(false);
canvas->toolbar()->setMovable(false); canvas->toolbar()->setMovable(false);
m_crumblePathWidget = new Utils::CrumblePath(this); m_crumblePathWidget = new Utils::CrumblePath(this);
m_centralWidget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout(m_centralWidget);
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(m_crumblePathWidget);
#ifndef Q_WS_MAC #ifndef Q_WS_MAC
QFile file(":/toolbarstyle.css"); QFile file(":/toolbarstyle.css");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
@@ -605,6 +599,16 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
canvas->toolbar()->setStyleSheet(toolbarStylesheet); canvas->toolbar()->setStyleSheet(toolbarStylesheet);
m_crumblePathWidget->setStyleSheet("QWidget { border-bottom: 1px solid black; }"); m_crumblePathWidget->setStyleSheet("QWidget { border-bottom: 1px solid black; }");
#endif #endif
}
m_centralWidget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout(m_centralWidget);
layout->setMargin(0);
layout->setSpacing(0);
if (m_crumblePathWidget)
layout->addWidget(m_crumblePathWidget);
layout->addWidget(canvas); layout->addWidget(canvas);
m_centralWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_centralWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -617,11 +621,13 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
QObject::connect(canvas, SIGNAL(reloadRequested()), this, SLOT(reload())); QObject::connect(canvas, SIGNAL(reloadRequested()), this, SLOT(reload()));
QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize))); QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
QObject::connect(canvas, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(statusChanged())); QObject::connect(canvas, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(statusChanged()));
if (m_crumblePathWidget) {
QObject::connect(canvas, SIGNAL(inspectorContextCleared()), m_crumblePathWidget, SLOT(clear())); QObject::connect(canvas, SIGNAL(inspectorContextCleared()), m_crumblePathWidget, SLOT(clear()));
QObject::connect(canvas, SIGNAL(inspectorContextPushed(QString)), m_crumblePathWidget, SLOT(pushElement(QString))); QObject::connect(canvas, SIGNAL(inspectorContextPushed(QString)), m_crumblePathWidget, SLOT(pushElement(QString)));
QObject::connect(canvas, SIGNAL(inspectorContextPopped()), m_crumblePathWidget, SLOT(popElement())); QObject::connect(canvas, SIGNAL(inspectorContextPopped()), m_crumblePathWidget, SLOT(popElement()));
QObject::connect(m_crumblePathWidget, SIGNAL(elementClicked(int)), canvas, SLOT(setInspectorContext(int))); QObject::connect(m_crumblePathWidget, SIGNAL(elementClicked(int)), canvas, SLOT(setInspectorContext(int)));
QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit())); QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit()));
}
QObject::connect(warningsWidget(), SIGNAL(opened()), this, SLOT(warningsWidgetOpened())); QObject::connect(warningsWidget(), SIGNAL(opened()), this, SLOT(warningsWidgetOpened()));
QObject::connect(warningsWidget(), SIGNAL(closed()), this, SLOT(warningsWidgetClosed())); QObject::connect(warningsWidget(), SIGNAL(closed()), this, SLOT(warningsWidgetClosed()));