Skip to content

Commit

Permalink
add custom icons; fix endless loop after opening search view.
Browse files Browse the repository at this point in the history
  • Loading branch information
hakaishi committed Nov 26, 2020
1 parent ada9396 commit bd2f1a4
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ File Transfer App for FTP and SFTP written in Python / tkinter
* ssh2-python

### TODO:
* create own icons + Tramet icon
* add search for folder name as option in search view
* translations ?

### Known Problems:
Expand Down
3 changes: 3 additions & 0 deletions Search.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,11 @@ def do_stop(self):

def destroy(self, event=None):
"""close and destroy the search dialog"""
self.stop = True
self.worker.stop_search = True
self.parent.search_open = False
self.parent.search_window = None
self.worker.quit()
super().destroy()


Expand Down
Binary file modified file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified folder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ def __init__(self):
self.quitting = False
self.selected = ""

self.iconphoto(True, PhotoImage(file=join(dirname(executable) if basename(executable) == "tramet" else "", "tramet.png")))

self.f_img = PhotoImage(file=join(dirname(executable) if basename(executable) == "tramet" else "", "file.png"))
self.d_img = PhotoImage(file=join(dirname(executable) if basename(executable) == "tramet" else "", "folder.png"))
self.l_img = PhotoImage(file=join(dirname(executable) if basename(executable) == "tramet" else "", "link.png"))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
base = 'Win32GUI' if sys.platform=='win32' else None

executables = [
Executable('main.py', base=base, targetName = 'tramet')
Executable('main.py', base=base, targetName='tramet', icon="tramet.png")
]

setup(name='Tramet',
Expand Down
3 changes: 3 additions & 0 deletions thread_work.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ def _connect(self):
except Timeout:
self._abort = True
messagebox.showerror("Connection Error", "Connection timeout on login.")
except AuthenticationError as e:
self._abort = True
messagebox.showerror("Authentication Error", "Wrong login credentials.")
except Exception as e:
print(type(e), e.args, str(e))
self._abort = True
Expand Down
Binary file added tramet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bd2f1a4

Please sign in to comment.