Merge pull request #178 from tracernz/detau

GCS:Welcome: Remove Tau Labs content
d-ronin · Dec 7, 2015 · 3618f54 · 3618f54
2 parents 3c33027 + 9c05617
commit 3618f54
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 125 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -30,7 +30,6 @@
         <file>qml/images/bttn-vehwizard-off.png</file>
         <file>qml/images/wizard-off.png</file>
         <file>qml/images/wizard-on.png</file>
-        <file>qml/ForumNewsPanel.qml</file>
         <file>qml/GitHubNewsPanel.qml</file>
     </qresource>
 </RCC>