diff --git a/ground/gcs/src/plugins/welcome/qml/CommunityPanel.qml b/ground/gcs/src/plugins/welcome/qml/CommunityPanel.qml
index 595366adab..904ee6b9ec 100644
--- a/ground/gcs/src/plugins/welcome/qml/CommunityPanel.qml
+++ b/ground/gcs/src/plugins/welcome/qml/CommunityPanel.qml
@@ -18,7 +18,7 @@ Item {
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
- width: parent.width*0.35
+ width: parent.width*0.6
anchors.margins: 32
onClicked: welcomePlugin.openUrl(url)
@@ -34,30 +34,9 @@ Item {
anchors.margins: 16
color: "#A0A0A0"
}
- ForumNewsPanel {
- id: forumNewsPanel
- anchors.left: gitHubNewsPanel.right
- anchors.top: parent.top
- anchors.bottom: parent.bottom
- width: parent.width*0.35
- anchors.margins: 32
-
- onClicked: welcomePlugin.openUrl(url)
- }
-
- //better to use image instead
- Rectangle {
- id: separator2
- width: 1
- height: parent.height*0.7
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: forumNewsPanel.right
- anchors.margins: 16
- color: "#A0A0A0"
- }
SitesPanel {
transformOrigin: Item.Center
- anchors.left: forumNewsPanel.right
+ anchors.left: gitHubNewsPanel.right
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
diff --git a/ground/gcs/src/plugins/welcome/qml/ForumNewsPanel.qml b/ground/gcs/src/plugins/welcome/qml/ForumNewsPanel.qml
deleted file mode 100644
index 796b17c8ef..0000000000
--- a/ground/gcs/src/plugins/welcome/qml/ForumNewsPanel.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
-
-Item {
- id: container
- width: 100
- height: 62
-
- signal clicked(string url)
-
- Text {
- id: header
- text: "Forum News"
- width: parent.width
- color: "#44515c"
- font {
- pointSize: 14
- weight: Font.Bold
- }
- }
-
- ListView {
- id: view
- width: parent.width
- anchors { top: header.bottom; topMargin: 14; bottom: parent.bottom }
- model: xmlModel
- delegate: listDelegate
- clip: true
- }
-
- ScrollDecorator {
- flickableItem: view
- }
-
- XmlListModel {
- id: xmlModel
- source: "http://forum.taulabs.org/feed.php"
- query: "/feed/entry"
- namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\"; declare default element namespace \"http://www.w3.org/2005/Atom\" ;"
- XmlRole { name: "title"; query: "title/string()" }
- XmlRole { name: "content"; query: "content/string()" }
- XmlRole { name: "author"; query: "author/name/string()" }
- XmlRole { name: "link"; query: "link/@href/string()" }
- }
-
- Component {
- id: listDelegate
-
- Item {
- width: view.width
- height: column.height + 8
- Row {
- id: column
- spacing: 4
- Column
- {
- Text {
- text: author
- font.italic: true
- width: view.width
- textFormat: text.indexOf("&") > 0 ? Text.StyledText : Text.PlainText
- elide: Text.ElideRight
- color: mouseArea.containsMouse ? "#224d81" : "black"
- }
- Text {
- text: title
- width: view.width
- textFormat: text.indexOf("&") < 1 ? Text.StyledText : Text.PlainText
- elide: Text.ElideRight
- font.bold: true
- color: mouseArea.containsMouse ? "#224d81" : "black"
- }
- Text {
- text: content
- width: view.width
- wrapMode: Text.Wrap
- color: mouseArea.containsMouse ? "#224d81" : "black"
- }
-
- }
-
- }
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- hoverEnabled: true
- onClicked: {
- console.log(link)
- container.clicked(link)
- }
- }
- }
- }
-}
diff --git a/ground/gcs/src/plugins/welcome/qml/GitHubNewsPanel.qml b/ground/gcs/src/plugins/welcome/qml/GitHubNewsPanel.qml
index 31d2d86852..bce7af1968 100644
--- a/ground/gcs/src/plugins/welcome/qml/GitHubNewsPanel.qml
+++ b/ground/gcs/src/plugins/welcome/qml/GitHubNewsPanel.qml
@@ -34,7 +34,7 @@ Item {
XmlListModel {
id: xmlModel
- source: "https://github.com/TauLabs/TauLabs/commits/next.atom"
+ source: "https://github.com/d-ronin/dRonin/commits/next.atom"
query: "/feed/entry"
namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\"; declare default element namespace \"http://www.w3.org/2005/Atom\" ;"
XmlRole { name: "title"; query: "title/string()" }
diff --git a/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml b/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml
index f8d4a05c03..5852b1c928 100644
--- a/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml
+++ b/ground/gcs/src/plugins/welcome/qml/SitesPanel.qml
@@ -9,7 +9,7 @@ Item {
Text {
id: header
- text: "Tau Labs Links"
+ text: "dRonin Links"
width: parent.width
color: "#44515c"
font {
@@ -20,11 +20,10 @@ Item {
ListModel {
id: sitesModel
- ListElement { title: "Tau Labs Home"; link: "http://taulabs.org" }
- ListElement { title: "Tau Labs Wiki"; link: "https://github.com/TauLabs/TauLabs/wiki" }
- ListElement { title: "Tau Labs Forums"; link: "https://groups.google.com/forum/#!forum/phoenixpilot" }
- ListElement { title: "Tau Labs Code"; link: "https://github.com/TauLabs/TauLabs" }
- ListElement { title: "Tau Labs Issues"; link: "https://github.com/TauLabs/TauLabs/issues" }
+ ListElement { title: "dRonin Home"; link: "http://dronin.org" }
+ ListElement { title: "dRonin Wiki"; link: "https://github.com/d-ronin/dRonin/wiki" }
+ ListElement { title: "dRonin Code"; link: "https://github.com/d-ronin/dRoni" }
+ ListElement { title: "dRonin Issues"; link: "https://github.com/d-ronin/dRoni/issues" }
}
ListView {
diff --git a/ground/gcs/src/plugins/welcome/welcome.qrc b/ground/gcs/src/plugins/welcome/welcome.qrc
index 6bbdd5d7e9..6a611abde1 100644
--- a/ground/gcs/src/plugins/welcome/welcome.qrc
+++ b/ground/gcs/src/plugins/welcome/welcome.qrc
@@ -30,7 +30,6 @@
qml/images/bttn-vehwizard-off.png
qml/images/wizard-off.png
qml/images/wizard-on.png
- qml/ForumNewsPanel.qml
qml/GitHubNewsPanel.qml