now actually show stuff

etotheipi · Mar 12, 2014 · fa2c737 · fa2c737
1 parent 3ef6307
commit fa2c737
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ArmoryQt.py b/ArmoryQt.py
@@ -4174,14 +4174,14 @@ def setupAnnounceTab(self):
    #############################################################################
    def openDLArmory(self):
       dl = self.announceFetcher.getAnnounceFile('downloads')
-      cl = self.announceFetcher.getAnnounceFile('changelogs')
-      UpgradeDownloaderDialog(self,self, 'Armory', dl, cl).exec_()
+      cl = self.announceFetcher.getAnnounceFile('changelog')
+      UpgradeDownloaderDialog(self, 'Armory', dl, cl).exec_()
 
    #############################################################################
    def openDLSatoshi(self):
       dl = self.announceFetcher.getAnnounceFile('downloads')
-      cl = self.announceFetcher.getAnnounceFile('changelogs')
-      UpgradeDownloaderDialog(self,self, 'Satoshi', dl, cl).exec_()
+      cl = self.announceFetcher.getAnnounceFile('changelog')
+      UpgradeDownloaderDialog(self, 'Satoshi', dl, cl).exec_()
 
 
 

diff --git a/ui/UpgradeDownloader.py b/ui/UpgradeDownloader.py
@@ -177,7 +177,7 @@ def onStart():
 
       self.downloadText = downloadText
       self.nestedDownloadMap = downloadLinkParser(filetext=downloadText).downloadMap
-      self.changelog = changeLog
+      self.changelog = changelogParser().parseChangelogText(changeLog)
 
       self.localizedData = { \
          "Ubuntu" : tr("Ubuntu/Debian"), \
@@ -249,8 +249,8 @@ def onStart():
       if showPackage:
          for n in range(0, packages.topLevelItemCount()):
             row = packages.topLevelItem(n)
-            if row.data(0, 32)==n:
-               packages.setCurrentItem(n)
+            if row.data(0, 32)==showPackage:
+               packages.setCurrentItem(row)
                break
 
       self.useSelectedPackage()
@@ -271,7 +271,7 @@ def selectMyOs(self):
          elif OS_VARIANT == "ubuntu":
             self.os.setCurrentIndex(self.os.findData("Ubuntu"))
          else:
-            self.os.setCurrentIndex(self.os.findData("Linux"))
+            self.os.setCurrentIndex(self.os.findData("Ubuntu"))
       elif OS_MACOSX:
          d = self.os.findData("MacOS")
          if d == -1: