Skip to content

Commit

Permalink
menu style update
Browse files Browse the repository at this point in the history
  • Loading branch information
matkuki committed Oct 21, 2021
1 parent 1423732 commit e106dd9
Show file tree
Hide file tree
Showing 294 changed files with 353 additions and 15 deletions.
2 changes: 2 additions & 0 deletions gui/customeditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ def __init__(self, parent, main_form, file_with_path=None):
self.set_cursor_line_visibility(
settings.Editor.cursor_line_visible
)
# Make last line scrollable to the top
self.SendScintilla(self.SCI_SETENDATLASTLINE, False)

def __setattr__(self, name, value):
"""
Expand Down
8 changes: 8 additions & 0 deletions gui/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,19 @@ def update_style(self):
QMenu::item:selected {{
background-color: {};
}}
QMenu::right-arrow {{
image: url({});
}}
QMenu::right-arrow:disabled {{
image: url({});
}}
""".format(
data.theme.Indication.PassiveBackGround,
data.theme.Indication.PassiveBorder,
data.theme.Font.DefaultHtml,
data.theme.Indication.Hover,
functions.get_resource_file(data.theme.right_arrow_menu_image),
functions.get_resource_file(data.theme.right_arrow_menu_disabled_image),
))


Expand Down
12 changes: 6 additions & 6 deletions gui/tabwidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ def __init__(self, parent):
self.setFont(data.get_current_font())

def set_style(self):
close_image = functions.get_resource_file("feather/air-grey/x.svg")
close_hover_image = functions.get_resource_file("feather/air-blue/x.svg")
right_arrow_image = functions.get_resource_file("feather/air-grey/chevron-right.svg")
right_arrow_hover_image = functions.get_resource_file("feather/air-blue/chevron-right.svg")
left_arrow_image = functions.get_resource_file("feather/air-grey/chevron-left.svg")
left_arrow_hover_image = functions.get_resource_file("feather/air-blue/chevron-left.svg")
close_image = functions.get_resource_file(data.theme.close_image)
close_hover_image = functions.get_resource_file(data.theme.close_hover_image)
right_arrow_image = functions.get_resource_file(data.theme.right_arrow_image)
right_arrow_hover_image = functions.get_resource_file(data.theme.right_arrow_hover_image)
left_arrow_image = functions.get_resource_file(data.theme.left_arrow_image)
left_arrow_hover_image = functions.get_resource_file(data.theme.left_arrow_hover_image)
style = """
QTabBar::close-button {{
image: url({})
Expand Down
24 changes: 15 additions & 9 deletions gui/treedisplays.py
Original file line number Diff line number Diff line change
Expand Up @@ -2608,17 +2608,23 @@ def __delete_items(self):
return
for it in items:
path = it.path
if os.path.exists(path):
if os.path.isdir(path):
shutil.rmtree(path)
try:
if os.path.exists(path):
if os.path.isdir(path):
shutil.rmtree(path)
else:
os.remove(path)
self.display_directory(self.current_viewed_directory)
else:
os.remove(path)
self.display_directory(self.current_viewed_directory)
else:
self.main_form.display.repl_display_message(
"Item '{}'\n does not seem to exist!!".format(
item.attributes.path),
message_type=data.MessageType.WARNING
)
except:
self.main_form.display.repl_display_message(
"Item '{}'\n does not seem to exist!!".format(
item.attributes.path),
message_type=data.MessageType.WARNING
traceback.format_exc(),
message_type=data.MessageType.ERROR
)

def __open_items(self, model_index=None):
Expand Down
1 change: 1 addition & 0 deletions resources/feather/black/activity.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/airplay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/alert-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/alert-octagon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/alert-triangle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/align-center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/align-justify.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/align-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/align-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/anchor.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/aperture.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/archive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-down-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-down-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-down-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-left-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-right-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-up-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-up-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-up-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/arrow-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/at-sign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/feather/black/award.svg
1 change: 1 addition & 0 deletions resources/feather/black/bar-chart-2.svg
1 change: 1 addition & 0 deletions resources/feather/black/bar-chart.svg
1 change: 1 addition & 0 deletions resources/feather/black/battery-charging.svg
1 change: 1 addition & 0 deletions resources/feather/black/battery.svg
1 change: 1 addition & 0 deletions resources/feather/black/bell-off.svg
1 change: 1 addition & 0 deletions resources/feather/black/bell.svg
1 change: 1 addition & 0 deletions resources/feather/black/bluetooth.svg
1 change: 1 addition & 0 deletions resources/feather/black/bold.svg
1 change: 1 addition & 0 deletions resources/feather/black/book-open.svg
1 change: 1 addition & 0 deletions resources/feather/black/book.svg
1 change: 1 addition & 0 deletions resources/feather/black/bookmark.svg
1 change: 1 addition & 0 deletions resources/feather/black/box.svg
1 change: 1 addition & 0 deletions resources/feather/black/briefcase.svg
1 change: 1 addition & 0 deletions resources/feather/black/calendar.svg
1 change: 1 addition & 0 deletions resources/feather/black/camera-off.svg
Loading

0 comments on commit e106dd9

Please sign in to comment.