Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for 7.1 #3519

Merged
merged 4 commits into from
Mar 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tribler/dispersy
10 changes: 5 additions & 5 deletions TriblerGUI/qt_resources/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions TriblerGUI/widgets/downloadwidgetitem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tribler.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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')]

Expand Down