Skip to content

Commit 878065a

Browse files
authored
fix menu keyboard shortcuts. (AtsushiSakai#29)
* Fixed Menu Keyboard Shortcuts * Pass empty arg in collapse_all()
1 parent 6b5f036 commit 878065a

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

pyjsonviewer/pyjsonviewer.py

+14-5
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,20 @@ def click_item(self, _):
120120
if self.is_url(item_text):
121121
webbrowser.open(item_text)
122122

123-
def select_json_file(self):
123+
def select_json_file(self, _):
124+
#:param _: event arg (not used)
124125
file_path = filedialog.askopenfilename(
125126
initialdir=self.initial_dir,
126127
filetypes=FILETYPES)
127128
self.set_table_data_from_json(file_path)
128129

129-
def expand_all(self):
130+
def expand_all(self, _):
131+
#:param _: event arg (not used)
130132
for item in self.get_all_children(self.tree):
131133
self.tree.item(item, open=True)
132134

133-
def collapse_all(self):
135+
def collapse_all(self, _):
136+
#:param _: event arg (not used)
134137
for item in self.get_all_children(self.tree):
135138
self.tree.item(item, open=False)
136139

@@ -146,7 +149,7 @@ def find_word(self, _):
146149
def find(self, search_text):
147150
if not search_text:
148151
return
149-
self.collapse_all()
152+
self.collapse_all(None)
150153
for item_id in self.get_all_children(self.tree):
151154
item_text = self.tree.item(item_id, 'text')
152155
if search_text.lower() in item_text.lower():
@@ -165,7 +168,8 @@ def select_listbox_item(self, evt):
165168
self.set_table_data_from_json(value)
166169
self.sub_win.destroy() # close window
167170

168-
def select_json_file_from_history(self):
171+
def select_json_file_from_history(self, _):
172+
#:param _: event arg (not used)
169173
self.sub_win = tk.Toplevel()
170174
lb = self.Listbox(self.sub_win)
171175
with open(HISTORY_FILE_PATH) as f:
@@ -305,6 +309,11 @@ def main():
305309
app.init_search_box()
306310

307311
root.config(menu=menubar)
312+
root.bind_all("<Control-o>",app.select_json_file)
313+
root.bind_all("<Control-h>",app.select_json_file_from_history)
314+
root.bind_all("<Control-e>",app.expand_all)
315+
root.bind_all("<Control-l>",app.collapse_all)
316+
308317
root.mainloop()
309318

310319

0 commit comments

Comments
 (0)