rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

added OP Icon to About GCS Version tab

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/openpilotgcs/src/plugins/coreplugin/authorsdialog.cpp
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"));

128
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
View File

@ -43,66 +43,74 @@
// This is a tabbed pane element. Add a nested Rectangle to add a tab. // This is a tabbed pane element. Add a nested Rectangle to add a tab.
TabWidget { TabWidget {
id: tabs id: tabs
width: 640; height: 480 width: 640; height: 480
// This tab is for the GCS version information // This tab is for the GCS version information
Rectangle { Rectangle {
property string title: "OpenPilot GCS" property string title: "OpenPilot GCS"
anchors.fill: parent anchors.fill: parent
color: "#e3e3e3" color: "#e3e3e3"
Rectangle { Rectangle {
anchors.fill: parent; anchors.margins: 20 anchors.fill: parent; anchors.margins: 20
color: "#e3e3e3" color: "#e3e3e3"
Flickable { Image {
anchors.fill: parent source: "../images/openpilot_logo_128.png"
anchors.centerIn: parent x: 0; y: 0
Text { z: 100
id: versionLabel fillMode: Image.PreserveAspectFit
width: parent.width - 20 }
anchors.centerIn: parent; horizontalAlignment: Qt.AlignLeft Flickable {
font.pixelSize: 12 anchors.fill: parent
wrapMode: Text.WordWrap anchors.centerIn: parent
text: version Text {
} id: versionLabel
} x: 156; y: 0
} width: 430; height: 379
} horizontalAlignment: Qt.AlignLeft
// This is a stub for the Plugins if I can ever figure that out. font.pixelSize: 12
// Rectangle { wrapMode: Text.WordWrap
// property string title: "Plugins" text: version
// anchors.fill: parent }
// color: "#e3e3e3"
//
// Rectangle {
// anchors.fill: parent; anchors.margins: 20
// color: "#7fff7f"
// Text {
// width: parent.width - 20
// anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
// text: "Flower stems are green"
// font.pixelSize: 20
// wrapMode: Text.WordWrap
// }
// }
// }
// This tab is for the authors/contributors/credits
Rectangle {
property string title: "Authors"
anchors.fill: parent; color: "#e3e3e3"
Rectangle {
anchors.fill: parent; anchors.margins: 20
color: "#e3e3e3"
FlickableWebView {
id: webView
url: "../CREDITS.html"
// onProgressChanged: header.urlChanged = false
anchors { top: parent.top; left: parent.left; right: parent.right; bottom: parent.bottom }
} }
} }
} }
} // This is a stub for the Plugins.
// Rectangle {
// property string title: "Plugins"
// anchors.fill: parent
// color: "#e3e3e3"
//
// Rectangle {
// anchors.fill: parent; anchors.margins: 20
// color: "#7fff7f"
// Text {
// width: parent.width - 20
// anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
// text: "Flower stems are green"
// font.pixelSize: 20
// wrapMode: Text.WordWrap
// }
// }
// }
// This tab is for the authors/contributors/credits
Rectangle {
property string title: "Authors"
anchors.fill: parent; color: "#e3e3e3"
Rectangle {
anchors.fill: parent; anchors.margins: 20
color: "#e3e3e3"
FlickableWebView {
id: webView
z: 0
url: "../CREDITS.html"
// onProgressChanged: header.urlChanged = false
anchors { top: parent.top; left: parent.left; right: parent.right; bottom: parent.bottom }
}
}
}
}