1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00

added OP Icon to About GCS Version tab

Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
This commit is contained in:
Kevin Vertucio 2013-01-24 07:09:36 -05:00
parent 63657c6586
commit 0cfed60638
2 changed files with 75 additions and 67 deletions

View File

@ -58,9 +58,9 @@ AuthorsDialog::AuthorsDialog(QWidget *parent)
// We need to set the window icon explicitly here since for some reason the // 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) // 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")); setWindowIcon(QIcon(":/core/images/openpilot_logo_32.png"));
// setWindowTitle(tr("About OpenPilot")); setWindowTitle(tr("About OpenPilot"));
setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
//This loads a QML doc containing a Tabbed view //This loads a QML doc containing a Tabbed view
QDeclarativeView *view = new QDeclarativeView(this); QDeclarativeView *view = new QDeclarativeView(this);
view->setSource(QUrl("qrc:/core/qml/AboutDialog.qml")); view->setSource(QUrl("qrc:/core/qml/AboutDialog.qml"));

View File

@ -55,13 +55,20 @@
Rectangle { Rectangle {
anchors.fill: parent; anchors.margins: 20 anchors.fill: parent; anchors.margins: 20
color: "#e3e3e3" color: "#e3e3e3"
Image {
source: "../images/openpilot_logo_128.png"
x: 0; y: 0
z: 100
fillMode: Image.PreserveAspectFit
}
Flickable { Flickable {
anchors.fill: parent anchors.fill: parent
anchors.centerIn: parent anchors.centerIn: parent
Text { Text {
id: versionLabel id: versionLabel
width: parent.width - 20 x: 156; y: 0
anchors.centerIn: parent; horizontalAlignment: Qt.AlignLeft width: 430; height: 379
horizontalAlignment: Qt.AlignLeft
font.pixelSize: 12 font.pixelSize: 12
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: version text: version
@ -69,7 +76,7 @@
} }
} }
} }
// This is a stub for the Plugins if I can ever figure that out. // This is a stub for the Plugins.
// Rectangle { // Rectangle {
// property string title: "Plugins" // property string title: "Plugins"
// anchors.fill: parent // anchors.fill: parent
@ -98,6 +105,7 @@
FlickableWebView { FlickableWebView {
id: webView id: webView
z: 0
url: "../CREDITS.html" url: "../CREDITS.html"
// onProgressChanged: header.urlChanged = false // onProgressChanged: header.urlChanged = false
anchors { top: parent.top; left: parent.left; right: parent.right; bottom: parent.bottom } anchors { top: parent.top; left: parent.left; right: parent.right; bottom: parent.bottom }