Skip to content

Commit 03ea2b6

Browse files
committed
Keep support for previous versions as per @w8sl comments
1 parent 9bfefe8 commit 03ea2b6

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

src/O4_GUI_Utils.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def __init__(self):
158158
# Widgets instances and placement
159159
# First row (Tile data)
160160
self.lat = tk.StringVar()
161-
self.lat.trace_add("write", self.tile_change)
161+
self.lat.trace_add("write"), self.tile_change)
162162
tk.Label(self.frame_tile, text="Latitude:", bg="light green").grid(
163163
row=0, column=0, padx=5, pady=5, sticky=E + W
164164
)
@@ -172,7 +172,7 @@ def __init__(self):
172172
self.lat_entry.grid(row=0, column=1, padx=5, pady=5, sticky=W)
173173

174174
self.lon = tk.StringVar()
175-
self.lon.trace_add("write", self.tile_change)
175+
self.lon.trace_add("write"), self.tile_change)
176176
tk.Label(
177177
self.frame_tile, anchor=W, text="Longitude:", bg="light green"
178178
).grid(row=0, column=2, padx=5, pady=5, sticky=E + W)
@@ -186,7 +186,7 @@ def __init__(self):
186186
self.lon_entry.grid(row=0, column=3, padx=5, pady=5, sticky=W)
187187

188188
self.default_website = tk.StringVar()
189-
self.default_website.trace_add("write", self.update_cfg)
189+
self.default_website.trace_add("write"), self.update_cfg)
190190
tk.Label(
191191
self.frame_tile, anchor=W, text="Imagery:", bg="light green"
192192
).grid(row=0, column=4, padx=5, pady=5, sticky=E + W)
@@ -201,7 +201,7 @@ def __init__(self):
201201
self.img_combo.grid(row=0, column=5, padx=5, pady=5, sticky=W)
202202

203203
self.default_zl = tk.StringVar()
204-
self.default_zl.trace_add("write", self.update_cfg)
204+
self.default_zl.trace_add("write"), self.update_cfg)
205205
tk.Label(
206206
self.frame_tile, anchor=W, text="Zoomlevel:", bg="light green"
207207
).grid(row=0, column=6, padx=5, pady=5, sticky=E + W)
@@ -898,9 +898,14 @@ def show_tile_preview(self, filepreview, lat, lon):
898898
0, 0, anchor=NW, image=self.photo
899899
)
900900
self.canvas.config(scrollregion=self.canvas.bbox(ALL))
901-
self.canvas.bind("<ButtonPress-3>", self.scroll_start)
902-
self.canvas.bind("<B3-Motion>", self.scroll_move)
903-
self.canvas.bind("<Control-ButtonPress-3>", self.delPol)
901+
if "dar" in sys.platform and tk.TkVersion < 9:
902+
self.canvas.bind("<ButtonPress-2>", self.scroll_start)
903+
self.canvas.bind("<B2-Motion>", self.scroll_move)
904+
self.canvas.bind("<Control-ButtonPress-2>", self.delPol)
905+
else:
906+
self.canvas.bind("<ButtonPress-3>", self.scroll_start)
907+
self.canvas.bind("<B3-Motion>", self.scroll_move)
908+
self.canvas.bind("<Control-ButtonPress-3>", self.delPol)
904909
self.canvas.bind(
905910
"<ButtonPress-1>", lambda event: self.canvas.focus_set()
906911
)
@@ -1361,8 +1366,12 @@ def __init__(self, parent, lat, lon):
13611366
self.canvas.yview_moveto(y0 / self.resolution)
13621367
self.nx0 = int((8 * x0) // self.resolution)
13631368
self.ny0 = int((8 * y0) // self.resolution)
1364-
self.canvas.bind("<ButtonPress-3>", self.scroll_start)
1365-
self.canvas.bind("<B3-Motion>", self.scroll_move)
1369+
if "dar" in sys.platform and tk.TkVersion < 9:
1370+
self.canvas.bind("<ButtonPress-2>", self.scroll_start)
1371+
self.canvas.bind("<B2-Motion>", self.scroll_move)
1372+
else:
1373+
self.canvas.bind("<ButtonPress-3>", self.scroll_start)
1374+
self.canvas.bind("<B3-Motion>", self.scroll_move)
13661375
self.canvas.bind("<Double-Button-1>", self.select_tile)
13671376
self.canvas.bind("<Shift-ButtonPress-1>", self.add_tile)
13681377
self.canvas.bind("<Control-ButtonPress-1>", self.toggle_to_custom)

0 commit comments

Comments
 (0)