From 32922ab196619231819f2b77b9ba9e9182a19114 Mon Sep 17 00:00:00 2001
From: Martijn de Vos <mdmartijndevos@gmail.com>
Date: Wed, 21 Mar 2018 16:08:29 +0100
Subject: [PATCH 1/4] Updated Dispersy submodule

---
 Tribler/dispersy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tribler/dispersy b/Tribler/dispersy
index 7c8c5df85c6..d10ead8ba26 160000
--- a/Tribler/dispersy
+++ b/Tribler/dispersy
@@ -1 +1 @@
-Subproject commit 7c8c5df85c6ecad7e49370d7b7262c64095746b0
+Subproject commit d10ead8ba26bce15f6ebb1d4e621e0e02f1be2fa

From 3a4bbe7c98d8df3167a89c8e417269cb050e99d5 Mon Sep 17 00:00:00 2001
From: Martijn de Vos <mdmartijndevos@gmail.com>
Date: Wed, 21 Mar 2018 16:49:36 +0100
Subject: [PATCH 2/4] Fixed progress bar on Mac

---
 TriblerGUI/widgets/downloadwidgetitem.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TriblerGUI/widgets/downloadwidgetitem.py b/TriblerGUI/widgets/downloadwidgetitem.py
index 8ec2aec6fe9..93eb58fd2a4 100644
--- a/TriblerGUI/widgets/downloadwidgetitem.py
+++ b/TriblerGUI/widgets/downloadwidgetitem.py
@@ -23,12 +23,15 @@ def __init__(self):
         bar_container.setStyleSheet("background-color: transparent;")
 
         self.progress_slider = QProgressBar()
+
+        # We have to set a zero pixel border to get the background working on Mac.
         self.progress_slider.setStyleSheet("""
         QProgressBar {
             background-color: white;
             color: black;
             font-size: 12px;
             text-align: center;
+            border: 0px solid transparent;
         }
 
         QProgressBar::chunk {

From 2802c7f64dfbed65ee8b9f94ed6e8987c77bf362 Mon Sep 17 00:00:00 2001
From: Martijn de Vos <mdmartijndevos@gmail.com>
Date: Wed, 21 Mar 2018 16:53:07 +0100
Subject: [PATCH 3/4] Fixed Mac builder for 7.1

---
 tribler.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tribler.spec b/tribler.spec
index 801e3265a13..cfba44e5c7b 100644
--- a/tribler.spec
+++ b/tribler.spec
@@ -17,7 +17,7 @@ for file in os.listdir("TriblerGUI/widgets"):
     if file.endswith(".py"):
         widget_files.append('TriblerGUI.widgets.%s' % file[:-3])
 
-data_to_copy = [('Tribler/dispersy/libnacl/libnacl', 'libnacl'), ('electrum', 'electrum'), ('TriblerGUI/qt_resources', 'qt_resources'), ('TriblerGUI/images', 'images'), ('TriblerGUI/scripts', 'scripts'), ('twisted', 'twisted'), ('Tribler', 'tribler_source/Tribler'), ('logger.conf', '.')]
+data_to_copy = [('electrum', 'electrum'), ('TriblerGUI/qt_resources', 'qt_resources'), ('TriblerGUI/images', 'images'), ('TriblerGUI/scripts', 'scripts'), ('twisted', 'twisted'), ('Tribler', 'tribler_source/Tribler'), ('logger.conf', '.')]
 if sys.platform.startswith('darwin'):
     data_to_copy += [('/Applications/VLC.app/Contents/MacOS/lib', 'vlc/lib'), ('/Applications/VLC.app/Contents/MacOS/plugins', 'vlc/plugins')]
 

From 0416feec74c5e54cca88f41a8128047768b39fa3 Mon Sep 17 00:00:00 2001
From: Martijn de Vos <mdmartijndevos@gmail.com>
Date: Wed, 21 Mar 2018 17:07:54 +0100
Subject: [PATCH 4/4] Updated text in GUI

---
 TriblerGUI/qt_resources/mainwindow.ui | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TriblerGUI/qt_resources/mainwindow.ui b/TriblerGUI/qt_resources/mainwindow.ui
index 391ee5c5a89..e1a2526b0f6 100644
--- a/TriblerGUI/qt_resources/mainwindow.ui
+++ b/TriblerGUI/qt_resources/mainwindow.ui
@@ -1050,7 +1050,7 @@ background-color: #e67300;
       <item>
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="currentIndex">
-         <number>15</number>
+         <number>4</number>
         </property>
         <widget class="HomePage" name="home_page">
          <layout class="QVBoxLayout" name="verticalLayout">
@@ -6322,14 +6322,14 @@ High anonymity</string>
 color: white;</string>
                 </property>
                 <property name="text">
-                 <string>Trustchain mining</string>
+                 <string>Token mining</string>
                 </property>
                </widget>
               </item>
               <item>
                <widget class="QCheckBox" name="credit_mining_enabled_checkbox">
                 <property name="text">
-                 <string>Enable Trustchain mining</string>
+                 <string>Enable token mining</string>
                 </property>
                </widget>
               </item>
@@ -6342,8 +6342,8 @@ color: white;</string>
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Trustchain is a blockchain-based way to keep track of sharing ratio, and eventually prevent freeriding. It is currently still in an early phase of development.
-Trustchain mining is the automated process of uploading to swarms in order increase your reputation. Go to channels and choose a channel from which to select swarms.</string>
+                 <string>Tribler uses a blockchain to keep track of your sharing ratio, which eventually prevents freeriding. It is currently still in an early phase of development.
+Token mining is the automated process of uploading to swarms in order increase your sharing ratio and your reputation. Go to your discovered channels and pick a channel to mine from.</string>
                 </property>
                 <property name="wordWrap">
                  <bool>true</bool>