From 24068a66386f604d52c1fe7f2b2d671f25fc29ce Mon Sep 17 00:00:00 2001 From: Kevin Vertucio Date: Tue, 22 Jan 2013 14:05:02 -0500 Subject: [PATCH] set dialog windowFlags for a frameless window. Signed-off-by: Kevin Vertucio --- .../openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp | 6 +++--- .../src/plugins/coreplugin/qml/AboutDialog.qml | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp b/ground/openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp index 67b3c28f6..dcdb6970a 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp @@ -58,9 +58,9 @@ AuthorsDialog::AuthorsDialog(QWidget *parent) // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/core/images/openpilot_logo_32.png")); - setWindowTitle(tr("About OpenPilot")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + // setWindowIcon(QIcon(":/core/images/openpilot_logo_32.png")); + // setWindowTitle(tr("About OpenPilot")); + setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog); //This loads a QML doc containing a Tabbed view QDeclarativeView *view = new QDeclarativeView(this); view->setSource(QUrl("qrc:/core/qml/AboutDialog.qml")); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml b/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml index b7cf20ee8..a848fd9b7 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml +++ b/ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml @@ -41,10 +41,12 @@ import QtQuick 1.1 import QtWebKit 1.0 + // This is a tabbed pane element. Add a nested Rectangle to add a tab. + TabWidget { id: tabs width: 640; height: 480 - + // This tab is for the GCS version information Rectangle { property string title: "OpenPilot GCS" anchors.fill: parent @@ -67,7 +69,7 @@ } } } - +// This is a stub for the Plugins if I can ever figure that out. // Rectangle { // property string title: "Plugins" // anchors.fill: parent @@ -85,7 +87,7 @@ // } // } // } - +// This tab is for the authors/contributors/credits Rectangle { property string title: "Authors" anchors.fill: parent; color: "#e3e3e3"