Skip to content

Commit c12999a

Browse files
committed
small changes in night mode
1 parent 6e6680f commit c12999a

File tree

4 files changed

+63
-10
lines changed

4 files changed

+63
-10
lines changed

data/day.opc

29 Bytes
Binary file not shown.

data/night.opc

29 Bytes
Binary file not shown.

main.py

Lines changed: 62 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,7 @@ def saveObs():
10061006
top.option_add('*TCombobox*Listbox*Background',colors['bg'])
10071007
top.option_add('*TCombobox*Listbox*Foreground',colors['text'])
10081008
style=ttk.Style(top)
1009+
style.theme_use('alt')
10091010
style.map('TCombobox',selectbackground=[('readonly',colors['bg'])])
10101011
style.map('TCombobox',fieldbackground=[('readonly',colors['bg'])])
10111012
style.map('TCombobox',foreground=[('readonly',colors['text'])])
@@ -1705,6 +1706,7 @@ def saveSet():
17051706
top.option_add('*TCombobox*Listbox*Background',colors['bg'])
17061707
top.option_add('*TCombobox*Listbox*Foreground',colors['text'])
17071708
style=ttk.Style(top)
1709+
style.theme_use('alt')
17081710
style.map('TCombobox',selectbackground=[('readonly',colors['bg'])])
17091711
style.map('TCombobox',fieldbackground=[('readonly',colors['bg'])])
17101712
style.map('TCombobox',foreground=[('readonly',colors['text'])])
@@ -2289,6 +2291,8 @@ def obsselect(evt):
22892291
root.option_add('*TCombobox*Listbox*Foreground',colors['text'])
22902292
root.option_add('*TCombobox*Listbox*Background',colors['bg'])
22912293
style=ttk.Style()
2294+
style.theme_use('alt')
2295+
#style.map('TCombobox',background=[('readonly',colors['bg'])])
22922296
style.map('TCombobox',selectbackground=[('readonly',colors['bg'])])
22932297
style.map('TCombobox',fieldbackground=[('readonly',colors['bg'])])
22942298
style.map('TCombobox',foreground=[('readonly',colors['text'])])
@@ -2327,28 +2331,36 @@ def obsselect(evt):
23272331
Text1.configure(width=256)
23282332
Text1.configure(wrap=tk.WORD)
23292333

2330-
#TODO focus color?, disabled color?
2334+
#TODO focus color?
23312335
Button3_2=tk.Button(Labelframe0)
23322336
Button3_2.place(relx=0.05,rely=0.95,height=24,width=47)
23332337
Button3_2.configure(command=AddObj)
23342338
Button3_2.configure(text='Add')
2335-
Button3_2.configure(background=colors['bg'])
2339+
Button3_2.configure(background=colors['window'])
23362340
Button3_2.configure(fg=colors['text'])
2341+
Button3_2.configure(activebackground=colors['window'])
2342+
Button3_2.configure(activeforeground=colors['text'])
23372343

23382344
Button2=tk.Button(Labelframe0)
23392345
Button2.place(relx=0.35,rely=0.95,height=24,width=47)
23402346
Button2.configure(command=EditObj)
23412347
Button2.configure(text='Edit')
2342-
Button2.configure(background=colors['bg'])
2348+
Button2.configure(background=colors['window'])
23432349
Button2.configure(fg=colors['text'])
2350+
Button2.configure(disabledforeground=colors['text_dis'])
2351+
Button2.configure(activebackground=colors['window'])
2352+
Button2.configure(activeforeground=colors['text'])
23442353
Button2.configure(state=tk.DISABLED)
23452354

23462355
Button3=tk.Button(Labelframe0)
23472356
Button3.place(relx=0.65,rely=0.95,height=24,width=47)
23482357
Button3.configure(command=DelObj)
23492358
Button3.configure(text='Delete')
2350-
Button3.configure(background=colors['bg'])
2359+
Button3.configure(background=colors['window'])
23512360
Button3.configure(fg=colors['text'])
2361+
Button3.configure(disabledforeground=colors['text_dis'])
2362+
Button3.configure(activebackground=colors['window'])
2363+
Button3.configure(activeforeground=colors['text'])
23522364
Button3.configure(state=tk.DISABLED)
23532365

23542366
#pozorovania
@@ -2386,32 +2398,44 @@ def obsselect(evt):
23862398
Button4.place(relx=0.02,rely=0.95,height=24,width=47)
23872399
Button4.configure(command=AddObs)
23882400
Button4.configure(text='Add')
2389-
Button4.configure(background=colors['bg'])
2401+
Button4.configure(background=colors['window'])
23902402
Button4.configure(fg=colors['text'])
2403+
Button4.configure(disabledforeground=colors['text_dis'])
2404+
Button4.configure(activebackground=colors['window'])
2405+
Button4.configure(activeforeground=colors['text'])
23912406
Button4.configure(state=tk.DISABLED)
23922407

23932408
Button5=tk.Button(Labelframe1)
23942409
Button5.place(relx=0.28,rely=0.95,height=24,width=47)
23952410
Button5.configure(command=EditObs)
23962411
Button5.configure(text='Edit')
2397-
Button5.configure(background=colors['bg'])
2412+
Button5.configure(background=colors['window'])
23982413
Button5.configure(fg=colors['text'])
2414+
Button5.configure(disabledforeground=colors['text_dis'])
2415+
Button5.configure(activebackground=colors['window'])
2416+
Button5.configure(activeforeground=colors['text'])
23992417
Button5.configure(state=tk.DISABLED)
24002418

24012419
Button6=tk.Button(Labelframe1)
24022420
Button6.place(relx=0.53,rely=0.95,height=24,width=47)
24032421
Button6.configure(command=DelObs)
24042422
Button6.configure(text='Delete')
2405-
Button6.configure(background=colors['bg'])
2423+
Button6.configure(background=colors['window'])
24062424
Button6.configure(fg=colors['text'])
2425+
Button6.configure(disabledforeground=colors['text_dis'])
2426+
Button6.configure(activebackground=colors['window'])
2427+
Button6.configure(activeforeground=colors['text'])
24072428
Button6.configure(state=tk.DISABLED)
24082429

24092430
Button7=tk.Button(Labelframe1)
24102431
Button7.place(relx=0.78,rely=0.95,height=24,width=47)
24112432
Button7.configure(command=ShowImg)
24122433
Button7.configure(state=tk.DISABLED)
2413-
Button7.configure(background=colors['bg'])
2434+
Button7.configure(background=colors['window'])
24142435
Button7.configure(fg=colors['text'])
2436+
Button7.configure(disabledforeground=colors['text_dis'])
2437+
Button7.configure(activebackground=colors['window'])
2438+
Button7.configure(activeforeground=colors['text'])
24152439
Button7.configure(text='Image')
24162440

24172441
#obrazky a datum
@@ -2433,8 +2457,10 @@ def obsselect(evt):
24332457
Button1=tk.Button(root)
24342458
Button1.place(relx=0.92,rely=0.02,height=24,width=55)
24352459
Button1.configure(command=NowTime)
2436-
Button1.configure(background=colors['bg'])
2460+
Button1.configure(background=colors['window'])
24372461
Button1.configure(fg=colors['text'])
2462+
Button1.configure(activebackground=colors['window'])
2463+
Button1.configure(activeforeground=colors['text'])
24382464
Button1.configure(text='Now')
24392465

24402466
frame2=tk.Frame(root)
@@ -2456,6 +2482,10 @@ def obsselect(evt):
24562482
fileM=tk.Menu(Popupmenu1,tearoff=0)
24572483
fileM.configure(background=colors['window'])
24582484
fileM.configure(fg=colors['text'])
2485+
if colors['text']=='red':
2486+
fileM.configure(activebackground=colors['select_bg'])
2487+
fileM.configure(activeforeground=colors['select_text'])
2488+
#fileM.configure(inactiveselectbackground=colors['select_bg'])
24592489
Popupmenu1.add_cascade(menu=fileM,label='File')
24602490
fileM.add_command(command=NewFile,label='New',accelerator='Ctrl+N')
24612491
root.bind('<Control-n>',NewFile)
@@ -2471,11 +2501,19 @@ def obsselect(evt):
24712501
import_export=tk.Menu(Popupmenu1,tearoff=0)
24722502
import_export.configure(background=colors['window'])
24732503
import_export.configure(fg=colors['text'])
2504+
if colors['text']=='red':
2505+
import_export.configure(activebackground=colors['select_bg'])
2506+
import_export.configure(activeforeground=colors['select_text'])
2507+
#import_export.configure(inactiveselectbackground=colors['select_bg'])
24742508
Popupmenu1.add_cascade(menu=import_export,label='Import/Export')
24752509

24762510
importMenu=tk.Menu(import_export,tearoff=0)
24772511
importMenu.configure(background=colors['window'])
24782512
importMenu.configure(fg=colors['text'])
2513+
if colors['text']=='red':
2514+
importMenu.configure(activebackground=colors['select_bg'])
2515+
importMenu.configure(activeforeground=colors['select_text'])
2516+
#importMenu.configure(inactiveselectbackground=colors['select_bg'])
24792517
import_export.add_cascade(menu=importMenu,label='Import Objects')
24802518
importMenu.add_command(label='from APT',state=tk.DISABLED)
24812519
importMenu.add_command(label='from AstroPlanner',state=tk.DISABLED)
@@ -2489,6 +2527,11 @@ def obsselect(evt):
24892527
exportObj=tk.Menu(import_export,tearoff=0)
24902528
exportObj.configure(background=colors['window'])
24912529
exportObj.configure(fg=colors['text'])
2530+
if colors['text']=='red':
2531+
exportObj.configure(activebackground=colors['select_bg'])
2532+
exportObj.configure(activeforeground=colors['select_text'])
2533+
#exportObj.configure(inactiveselectbackground=colors['select_bg'])
2534+
exportObj.configure(disabledforeground=colors['text_dis'])
24922535
import_export.add_cascade(menu=exportObj,label='Export Selected Objects',state=tk.DISABLED)
24932536
exportObj.add_command(label='to APT',command=aptE)
24942537
exportObj.add_command(label='to Excel',command=excelE)
@@ -2500,13 +2543,23 @@ def obsselect(evt):
25002543
exportObs=tk.Menu(import_export,tearoff=0)
25012544
exportObs.configure(background=colors['window'])
25022545
exportObs.configure(fg=colors['text'])
2546+
if colors['text']=='red':
2547+
exportObs.configure(activebackground=colors['select_bg'])
2548+
exportObs.configure(activeforeground=colors['select_text'])
2549+
#exportObs.configure(inactiveselectbackground=colors['select_bg'])
2550+
exportObs.configure(disabledforeground=colors['text_dis'])
25032551
import_export.add_cascade(menu=exportObs,label='Export Observations of Object',state=tk.DISABLED)
25042552
exportObs.add_command(label='to Excel',command=excelObsE)
25052553
exportObs.add_command(label='to Text File',command=textObsE)
25062554

25072555
exportObsAll=tk.Menu(import_export,tearoff=0)
25082556
exportObsAll.configure(background=colors['window'])
25092557
exportObsAll.configure(fg=colors['text'])
2558+
if colors['text']=='red':
2559+
exportObsAll.configure(activebackground=colors['select_bg'])
2560+
exportObsAll.configure(activeforeground=colors['select_text'])
2561+
#exportObsAll.configure(inactiveselectbackground=colors['select_bg'])
2562+
exportObsAll.configure(disabledforeground=colors['text_dis'])
25102563
import_export.add_cascade(menu=exportObsAll,label='Export All Observations',state=tk.DISABLED)
25112564
exportObsAll.add_command(label='to Excel',command=excelObsAllE)
25122565
exportObsAll.add_command(label='to Text File',command=textObsAllE)

stars.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def plotObject(self,ra,dec,colors,fig=None):
236236
ra=r*np.cos(f)
237237
dec=r*np.sin(f)
238238
if self.prechod and ra>12: ra-=24
239-
self.ax.plot(ra,dec,'ro')
239+
self.ax.plot(ra,dec,'r*',markersize=12,markeredgecolor=colors['fig_bg'])
240240

241241
def load():
242242
constellations={}

0 commit comments

Comments
 (0)