From cd1b6715b6cd01e31cd760140d0b81e723aabed3 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 29 Sep 2017 19:53:04 +0100
Subject: [PATCH] fix merge comments

---
 openlp/core/api/http/server.py | 8 ++++----
 openlp/core/api/tab.py         | 2 ++
 openlp/core/common/settings.py | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openlp/core/api/http/server.py b/openlp/core/api/http/server.py
index 916aedddd..2a2ec7292 100644
--- a/openlp/core/api/http/server.py
+++ b/openlp/core/api/http/server.py
@@ -89,7 +89,7 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
         self.thread.start()
         Registry().register_function('download_website', self.first_time)
         Registry().register_function('get_website_version', self.website_version)
-        Registry().set_flag('website_version', '0001_01_01')
+        Registry().set_flag('website_version', '0.0')
 
     def bootstrap_post_set_up(self):
         """
@@ -126,7 +126,7 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
         Import web site code if active
         """
         self.application.process_events()
-        progress = Progress(self)
+        progress = DownloadProgressDialog(self)
         progress.forceShow()
         self.application.process_events()
         time.sleep(1)
@@ -147,12 +147,12 @@ class HttpServer(RegistryMixin, RegistryProperties, OpenLPMixin):
         Registry().set_flag('website_version', self.version)
 
 
-class Progress(QtWidgets.QProgressDialog):
+class DownloadProgressDialog(QtWidgets.QProgressDialog):
     """
     Local class to handle download display based and supporting httputils:get_web_page
     """
     def __init__(self, parent):
-        super(Progress, self).__init__(parent.main_window)
+        super(DownloadProgressDialog, self).__init__(parent.main_window)
         self.parent = parent
         self.setWindowModality(QtCore.Qt.WindowModal)
         self.setWindowTitle(translate('RemotePlugin', 'Importing Website'))
diff --git a/openlp/core/api/tab.py b/openlp/core/api/tab.py
index 3ec8c4515..e10a68238 100644
--- a/openlp/core/api/tab.py
+++ b/openlp/core/api/tab.py
@@ -222,6 +222,8 @@ class ApiTab(SettingsTab):
         self.remote_url.setText('<a href="{url}">{url}</a>'.format(url=http_url))
         http_url_temp = http_url + 'stage'
         self.stage_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
+        http_url_temp = http_url + 'chords'
+        self.chords_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
         http_url_temp = http_url + 'main'
         self.live_url.setText('<a href="{url}">{url}</a>'.format(url=http_url_temp))
 
diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py
index 477925280..87efd10d3 100644
--- a/openlp/core/common/settings.py
+++ b/openlp/core/common/settings.py
@@ -177,7 +177,7 @@ class Settings(QtCore.QSettings):
         'images/background color': '#000000',
         'media/players': 'system,webkit',
         'media/override player': QtCore.Qt.Unchecked,
-        'remotes/download version': '0000_00_00',
+        'remotes/download version': '0.0',
         'players/background color': '#000000',
         'servicemanager/last directory': None,
         'servicemanager/last file': None,