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

PR: Implement Profile Sidebar and New Setting Interface #1809

Merged
merged 32 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8e6aaff
sidebar created, settings tab created
bigtedde Sep 6, 2023
2155997
Refactored profile combobox to a list, added settings wheel icon, mod…
bigtedde Sep 6, 2023
38467c1
added aboutTab
bigtedde Sep 7, 2023
6c6918a
cleanup XML
bigtedde Sep 7, 2023
9acd029
toggle_settings_tab streamlined
bigtedde Sep 7, 2023
e756cbd
toggle_settings_tab streamlined
bigtedde Sep 7, 2023
58b95de
dynamically resize profile selector
bigtedde Sep 7, 2023
d14a59c
settings button renamed to Misc, change all occurences
bigtedde Sep 7, 2023
51e47e4
profile selection closes misc tab
bigtedde Sep 7, 2023
58e97b2
Merge remote-tracking branch 'upstream/master' into sidebar
bigtedde Sep 8, 2023
cee91aa
swap trash can for minus sign, right allign add/remove
bigtedde Sep 10, 2023
b03f725
remove repo management tab, resized buttons, rename misc button
bigtedde Sep 25, 2023
caf9502
Merge remote-tracking branch 'upstream/master' into sidebar
bigtedde Sep 29, 2023
b8ef1bd
added logos to about tab
bigtedde Sep 30, 2023
9b5f5a2
Merge branch 'master' into sidebar
bigtedde Oct 14, 2023
aadcfbc
added copyright, description, and link to repo/docs
bigtedde Oct 15, 2023
6ffbbac
updated tests for new profile sidebar
bigtedde Oct 15, 2023
1288c1c
minor correction
bigtedde Oct 15, 2023
0feeee8
reorganized about tab links
bigtedde Oct 15, 2023
2bfdb75
minor fixes
bigtedde Oct 15, 2023
cebfb61
path to borg moved below borg version number
bigtedde Oct 15, 2023
7e5f3b7
rearranged profile action buttons
bigtedde Oct 15, 2023
45c4c2f
clicking same profile will now toggle settings tab visability
bigtedde Oct 15, 2023
46b2b1e
added highlight to 'settings / about' button to indicate selected state
bigtedde Oct 15, 2023
0fab569
removed setting button background color, added bold upon selection
bigtedde Oct 18, 2023
d1a21e0
began test_about module
bigtedde Oct 18, 2023
8003325
fixed aboutTab test
bigtedde Oct 20, 2023
fea5086
removed test_about - was not adding value.
bigtedde Oct 20, 2023
2051bab
simplified about_tab __init__
bigtedde Oct 20, 2023
2c72dd5
switched to Material setting wheel, removed unused icon
bigtedde Oct 21, 2023
98af58b
rewrote get_colored_icon, removed get_colored_pixmap
bigtedde Oct 21, 2023
be0258e
revert scaled height default
bigtedde Oct 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vorta/views/about_tab.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from vorta._version import __version__
from vorta.store.models import BackupProfileMixin
from vorta.utils import get_asset
from vorta.views.utils import get_colored_pixmap
from vorta.views.utils import get_colored_icon

uifile = get_asset('UI/abouttab.ui')
AboutTabUI, AboutTabBase = uic.loadUiType(uifile)
Expand All @@ -26,8 +26,8 @@ def __init__(self, parent=None):
f'<a href="file://{config.LOG_DIR}"><span style="text-decoration:'
'underline; color:#0984e3;">Click here</span></a> to view the logs.'
)
self.gpl_logo.setPixmap(get_colored_pixmap('gpl_logo', 40))
self.python_logo.setPixmap(get_colored_pixmap('python_logo', 40))
self.gpl_logo.setPixmap(get_colored_icon('gpl_logo', scaled_height=40, return_qpixmap=True))
self.python_logo.setPixmap(get_colored_icon('python_logo', scaled_height=40, return_qpixmap=True))

def set_borg_details(self, version, path):
self.borgVersion.setText(version)
Expand Down
21 changes: 5 additions & 16 deletions src/vorta/views/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from vorta.utils import get_asset, uses_dark_mode


def get_colored_icon(icon_name):
def get_colored_icon(icon_name, scaled_height=120, return_qpixmap=False):
real-yfprojects marked this conversation as resolved.
Show resolved Hide resolved
"""
Return SVG icon in the correct color.
"""
Expand All @@ -12,20 +12,9 @@ def get_colored_icon(icon_name):
if uses_dark_mode():
svg_str = svg_str.replace(b'#000000', b'#ffffff')
# Reduce image size to 128 height
svg_img = QImage.fromData(svg_str).scaledToHeight(128)

return QIcon(QPixmap(svg_img))


def get_colored_pixmap(icon_name, scaled_height):
"""
Return SVG icon in the correct color.
"""
with open(get_asset(f"icons/{icon_name}.svg"), 'rb') as svg_file:
svg_str = svg_file.read()
if uses_dark_mode():
svg_str = svg_str.replace(b'#000000', b'#ffffff')
# Reduce image size to specified scaled height
svg_img = QImage.fromData(svg_str).scaledToHeight(scaled_height)

return QPixmap(svg_img)
if return_qpixmap:
return QPixmap(svg_img)
else:
return QIcon(QPixmap(svg_img))