diff --git a/data.py b/data.py
index f9f32d3..9064b38 100644
--- a/data.py
+++ b/data.py
@@ -56,23 +56,15 @@ def open_db(filename=FILENAME):
def main(filename):
- print('Initializing db file', filename)
conn = initialize_db_tables(filename)
stars.init_db(conn)
-##def stars():
-## global conn
-## c = conn.cursor()
-## c.execute('select x, y, radius from stars')
-## yield from c.fetchall()
-## c.close()
-
-
if __name__ == '__main__':
import pathlib
if not pathlib.Path(FILENAME).exists():
+ print('Initializing db file', FILENAME)
main(FILENAME)
else:
print(FILENAME, 'already exists! Not overwriting.')
diff --git a/ui.py b/ui.py
index d212b18..1bf3a60 100755
--- a/ui.py
+++ b/ui.py
@@ -19,6 +19,7 @@
# along with game. If not see .
#
from tkinter import *
+from tkinter.ttk import Notebook
import data, stars
@@ -29,32 +30,32 @@ class App:
'''
def __init__(self, master=None, *canvas_args, **canvas_kw):
- frame = self.frame = Frame(root, bg='green')
+ frame = self.frame = Frame(root, background='green')
frame.rowconfigure(0, weight=1)
frame.columnconfigure(0, weight=1)
frame.pack(expand=True, fill=BOTH)
- C = self.canvas = Canvas(frame, *canvas_args, **canvas_kw)
+ canvas = self.canvas = Canvas(frame, *canvas_args, **canvas_kw)
scrollY = self.scrollY = Scrollbar(
frame,
orient=VERTICAL,
- command=C.yview,
+ command=canvas.yview,
)
- C['yscrollcommand'] = scrollY.set
+ canvas['yscrollcommand'] = scrollY.set
scrollX = self.scrollX = Scrollbar(
frame,
orient=HORIZONTAL,
- command=C.xview,
+ command=canvas.xview,
)
- C['xscrollcommand'] = scrollX.set
+ canvas['xscrollcommand'] = scrollX.set
- C.grid(row=0, column=0, sticky=N+S+E+W)
+ canvas.grid(row=0, column=0, sticky=N+S+E+W)
scrollY.grid(row=0, column=1, sticky=N+S)
scrollX.grid(row=1, column=0, sticky=E+W)
- C.bind("", self.handle_canvas_resize)
+ canvas.bind("", self.handle_canvas_resize)
def handle_canvas_resize(self, event):
print(event)
@@ -75,7 +76,7 @@ for x, y, radius in stars.iter_stars(data.conn):
activeoutline='orange',
activewidth=3,
)
- app.canvas.tag_bind(star_id, '', (lambda event, sid=star_id, x=x, y=y: root.title(f'{x}, {y}')))
+ app.canvas.tag_bind(star_id, '', (lambda event, x=x, y=y: root.title(f'{x}, {y}')))
-app.frame.mainloop()
-data.close_db()
+##app.frame.mainloop()
+##data.close_db()