Skip to content

Commit

Permalink
Redesign of the about tab
Browse files Browse the repository at this point in the history
Remove default bind for 'delete last run'
  • Loading branch information
oskros committed Oct 7, 2020
1 parent 255d358 commit e53b07f
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 14 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Diablo 2 MF run counter
# MF Run Counter
Run counter for Diablo 2, created by oskros#1889 with ongoing development since August 2019.

You can find a video where I describe the application in detail here
**(NB: Not fully up to date - this video is missing explanation of new features such as "automode", "autocompletion of item names" and "grail tracking")**:
**(NB: Video is outdated and missing several new important features, such as "automode", "autocompletion of item names" and "grail tracking")**:
https://www.youtube.com/watch?v=e4vcg8MdvrY


Expand Down
1 change: 1 addition & 0 deletions build_exe/directory_exe.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ a.datas += [('icon.ico', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\med
a.datas += [('item_library.csv', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\item_library.csv', 'Data')]
a.datas += [('caret-down.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\caret-down.png', 'Data')]
a.datas += [('caret-up.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\caret-up.png', 'Data')]
a.datas += [('about_icon.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\about_icon.png', 'Data')]
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
Expand Down
1 change: 1 addition & 0 deletions build_exe/onefile_exe.spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ a.datas += [('icon.ico', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\med
a.datas += [('item_library.csv', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\item_library.csv', 'Data')]
a.datas += [('caret-down.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\caret-down.png', 'Data')]
a.datas += [('caret-up.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\caret-up.png', 'Data')]
a.datas += [('about_icon.png', 'C:\\Users\\oskro\\PycharmProjects\\MF_run_counter\\media\\about_icon.png', 'Data')]
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
Expand Down
17 changes: 14 additions & 3 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,36 @@
# FIXME: Solve issue with bad synced sound effects (add sound effect when automode is active and starting new run)
# FIXME: Retain order of item table when adding new drops
# FIXME: Figure out why importing psutil is required for reading Game.exe
# FIXME: Solve bug where multiple Game.exe processes are open (reported by SightUp)

# ============= XP TRACKER FEATURES =============
# FIXME: Pause XP timer on pause call
# FIXME: Save relative XP gained in the XP tracker
# FIXME: Save all XP stuff under a character name, so multiple characters wont break it. Also save under individual levels
# FIXME: Save all XP stuff under a character name, so multiple characters wont break it. Also save under individual character levels

# ============ MEMORY READER FEATURES =================
# FIXME: Check if load times can be excluded
# FIXME: Add game IP to advanced stats tracker
# FIXME: Add item by hovering over it in D2 and pressing hotkey (both for items picked up and on ground)
# FIXME; Pause timer when d2 is paused ingame (only for SP)
# FIXME: Pause timer when d2 is paused ingame (only for SP)

# ================== UI FEATURES ====================
# FIXME: Hiding UI elements as another options tab (drops, advanced stats, delete/archive buttons)
# FIXME: Hide scrollbars unless they are hovered over
# FIXME: Consider changing banner image to a GIF
# FIXME: Hide 'tab' bar when not hovered over: https://stackoverflow.com/questions/26923010/how-do-i-hide-the-entire-tab-bar-in-a-tkinter-ttk-notebook-widget
# FIXME: Grammar issues reported by SightUp

# =============== OTHER FEATURES =================
# FIXME: Ability to select which run to archive drop on
# FIXME: Archive reset should always use last update time as stamp
# FIXME: Auto archive should ask before
# FIXME: Format auto archive message with hours properly (same rounding)
# FIXME: Include a timestamp of found grailers (or for all items)
# FIXME: Show active profile on main tab somehow
# FIXME: Add option to export/upload to google sheets

# FIXME: Eth grail support
# FIXME: Output LOG file


class MainFrame(Config):
Expand Down
Binary file added media/about_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 19 additions & 8 deletions tabs/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,24 @@
class About(tkd.Frame):
def __init__(self, parent=None, **kw):
tkd.Frame.__init__(self, parent, kw)
label0 = tkd.Label(self, text="""MF Run Counter for Diablo 2\n\nIn development since July 2019 by\noskros#1889 on Discord.\n\nPlease see the README.md file""")
label0.pack()
tkd.Hyperlink(self, hyperlink=release_repo.rstrip('releases') + 'blob/master/README.md', text="Open Readme").pack()
tkd.Label(self, text="\nVisit the page below for new releases").pack()
tkd.Hyperlink(self, hyperlink=release_repo, text="Release Hyperlink").pack()
top_fr = tkd.Frame(self)
top_fr.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
tkd.Label(top_fr, text="MF Run Counter", font=('Segoe UI', 11, 'bold')).pack(pady=[0,2])

tkd.Label(self, text="\nJoin Sightup's D2 Discord channel").pack()
tkd.Hyperlink(self, hyperlink='https://discord.gg/NTRFy8S', text='Discord invite link').pack()
icon = os.path.join(getattr(sys, '_MEIPASS', os.path.abspath('.')), media_path + 'about_icon.png')
self.img = tk.PhotoImage(file=icon)
tkd.Label(top_fr, image=self.img, borderwidth=0).pack(pady=0)

tkd.Label(self, text="\nCurrent version: %s" % version).pack(side=tk.BOTTOM)
btm_fr = tkd.Frame(self)
btm_fr.pack(side=tk.BOTTOM, fill=tk.X, expand=True, anchor=tk.S)

tkd.Label(btm_fr, text='New releases & README info', borderwidth=0, highlightthickness=0, justify=tk.LEFT).pack(anchor=tk.W)
tkd.Hyperlink(btm_fr, hyperlink=release_repo.rstrip('releases'), text=" Github Repository", borderwidth=0, highlightthickness=0, justify=tk.LEFT).pack(anchor=tk.W, pady=[0, 7])

tkd.Label(btm_fr, text='Created by:', justify=tk.LEFT, borderwidth=0, highlightthickness=0).pack(anchor=tk.W)
tkd.Label(btm_fr, text=' oskros#1889', font=('Segoe UI', 9, 'bold'), borderwidth=0, highlightthickness=0, justify=tk.LEFT).pack(anchor=tk.W)

tkd.Label(btm_fr, text='Find me here:', justify=tk.LEFT, borderwidth=0, highlightthickness=0).pack(anchor=tk.W, pady=[7, 0])
tkd.Hyperlink(btm_fr, hyperlink='https://discord.gg/NTRFy8S', text=' https://discord.gg/NTRFy8S', justify=tk.LEFT, borderwidth=0, highlightthickness=0).pack(anchor=tk.W)

tkd.Label(btm_fr, text="v.%s" % version, justify=tk.RIGHT).pack(side=tk.BOTTOM, anchor=tk.E)
2 changes: 1 addition & 1 deletion utils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def default_config(self):
config.set('KEYBINDS', '# Please only edit keybinds from within the app')
config['KEYBINDS']['start_key'] = str(['Alt', 'Q'])
config['KEYBINDS']['end_key'] = str(['Alt', 'W'])
config['KEYBINDS']['delete_prev_key'] = str(['Control', 'Delete'])
config['KEYBINDS']['delete_prev_key'] = str(['Control', 'NO_BIND'])
config['KEYBINDS']['pause_key'] = str(['Control', 'Space'])
config['KEYBINDS']['drop_key'] = str(['Alt', 'A'])
config['KEYBINDS']['reset_key'] = str(['Alt', 'R'])
Expand Down

0 comments on commit e53b07f

Please sign in to comment.