From 6438938325dd775f9edc7873fa513a976612db5e Mon Sep 17 00:00:00 2001 From: Nerya Meshulam Date: Thu, 7 Feb 2019 12:17:31 +0200 Subject: [PATCH] Remove FBF; Improve jumps Signed-off-by: Nerya Meshulam --- Poke-A-Bird.py | 17 +++++++++-------- prerequisites/installer.iss | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Poke-A-Bird.py b/Poke-A-Bird.py index 5332bd9..68e5811 100644 --- a/Poke-A-Bird.py +++ b/Poke-A-Bird.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2018 Elad Yacovi, Nerya Meshulam +Copyright (c) 2018-2019 Elad Yacovi, Nerya Meshulam Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -41,7 +41,7 @@ from PIL import Image from Pmw import Balloon -__version__ = '0.4' +__version__ = '0.5' class ControlBlock: def __init__(self): @@ -347,8 +347,8 @@ def __init__(self, parent, *args, **kwargs): self.play = Button(self, image=self.play_icon, command=self.parent.playback_panel.on_play) self.stop_icon = PhotoImage(file='./media/icons8-stop-32.png') self.stop = Button(self, image=self.stop_icon, command=self.parent.playback_panel.on_stop) - self.next_frame_icon = PhotoImage(file='./media/icons8-resume-button-32.png') - self.next_frame = Button(self, image=self.next_frame_icon, command=self.parent.playback_panel.on_next_frame) + # self.next_frame_icon = PhotoImage(file='./media/icons8-resume-button-32.png') + # self.next_frame = Button(self, image=self.next_frame_icon, command=self.parent.playback_panel.on_next_frame) self.speedup_icon = PhotoImage(file='./media/icons8-fast-forward-32.png') self.speedup = Button(self, image=self.speedup_icon, command=self.parent.playback_panel.on_speed_up) self.speeddown_icon = PhotoImage(file='./media/icons8-rewind-32.png') @@ -376,7 +376,7 @@ def __init__(self, parent, *args, **kwargs): self.speeddown.pack(side=LEFT, fill=Y, padx=1, pady=3) self.speedup.pack(side=LEFT, fill=Y, padx=1, pady=3) ttk.Separator(self, orient=VERTICAL).pack(side=LEFT, fill=Y, padx=5) - self.next_frame.pack(side=LEFT, fill=Y, padx=1, pady=3) + # self.next_frame.pack(side=LEFT, fill=Y, padx=1, pady=3) self.jump_backword.pack(side=LEFT, fill=Y, padx=1, pady=3) self.jump_forward.pack(side=LEFT, fill=Y, padx=1, pady=3) ttk.Separator(self, orient=VERTICAL).pack(side=LEFT, fill=Y, padx=5) @@ -1472,8 +1472,8 @@ def DisplayOnLabel(self, event): self.status_label.config(text="Speed Up") elif event.widget == self.parent.control_bar.speeddown: self.status_label.config(text="Speed Down") - elif event.widget == self.parent.control_bar.next_frame: - self.status_label.config(text="Next Frame") + # elif event.widget == self.parent.control_bar.next_frame: + # self.status_label.config(text="Next Frame") elif event.widget == self.parent.control_bar.jump_forward: self.status_label.config(text="Jump Forward") elif event.widget == self.parent.control_bar.jump_backword: @@ -1660,7 +1660,8 @@ def register_hotkeys(self): self.bind_all("", self.playback_panel.on_click) self.bind_all("", self.on_open_event_manager_menu_click) self.bind_all("", self.on_reset) - self.bind_all("", self.playback_panel.on_next_frame) + self.bind_all("", self.control_bar.on_jump_backward) + self.bind_all("", self.control_bar.on_jump_forward) if __name__ == "__main__": diff --git a/prerequisites/installer.iss b/prerequisites/installer.iss index ed7c27f..37df45c 100644 --- a/prerequisites/installer.iss +++ b/prerequisites/installer.iss @@ -1,5 +1,5 @@ #define MyAppName "Poke-A-Bird Prerequisites" -#define MyAppVersion "0.5" +#define MyAppVersion "0.6" #define MyAppPublisher "Elad Yacovi and Nerya Meshulam, Tel Aviv University" #define MyAppURL "https://github.com/nerya21/Poke-A-Bird" @@ -21,7 +21,7 @@ Compression=lzma SolidCompression=yes Uninstallable = no DisableWelcomePage=no -AppCopyright=Copyright (C) 2018 {#MyAppPublisher} +AppCopyright=Copyright (C) 2018-2019 {#MyAppPublisher} ChangesEnvironment=yes [Languages] @@ -34,5 +34,5 @@ Source: ".\bin\*.*"; DestDir: "{tmp}"; Flags: ignoreversion [Run] Filename: "{tmp}\python-3.7.1.exe"; Parameters: "/quiet Include_launcher=0"; StatusMsg: "Installing Python (python-3.7.1.exe)..."; Filename: "{tmp}\install_packages.bat"; Parameters:{tmp} ; StatusMsg: "Installing Python packages (install_packages.bat)..."; -Filename: "{tmp}\vlc-3.0.4-win32.exe"; Parameters: "/S"; StatusMsg: "Installing VLC (vlc-3.0.4-win32.exe)..."; +Filename: "{tmp}\vlc-3.0.6-win32.exe"; Parameters: "/S"; StatusMsg: "Installing VLC (vlc-3.0.6-win32.exe)..."; Filename: "https://github.com/nerya21/Poke-A-Bird/releases"; Description: "Visit Poke-A-Bird website"; Flags: postinstall shellexec runasoriginaluser \ No newline at end of file