Minor improvements
Merged weekdays positions into one and deleted month and weekpaths for images since these are no longer required.
This commit is contained in:
		| @@ -6,7 +6,6 @@ It also contains the positions of these icons on the E-Paper display | |||||||
| """ | """ | ||||||
|  |  | ||||||
| from PIL import Image | from PIL import Image | ||||||
| from settings import language |  | ||||||
| im_open = Image.open | im_open = Image.open | ||||||
| import os | import os | ||||||
|  |  | ||||||
| @@ -15,10 +14,9 @@ if path != "" and path[-1] != "/": | |||||||
|     path += "/" |     path += "/" | ||||||
|  |  | ||||||
| wpath = path+'weather-icons/' | wpath = path+'weather-icons/' | ||||||
| mpath = path+'translations/'+language+'/months/' |  | ||||||
| weekpath = path+'translations/'+language+'/week/' |  | ||||||
| dpath = path+'days/' | dpath = path+'days/' | ||||||
| opath = path+'other/' | opath = path+'other/' | ||||||
|  | fpath = path+'fonts/' | ||||||
|  |  | ||||||
| weekday = im_open(opath+'weekday.png') | weekday = im_open(opath+'weekday.png') | ||||||
| eventicon = im_open(opath+'event.png') | eventicon = im_open(opath+'event.png') | ||||||
| @@ -27,8 +25,6 @@ seperator = im_open(opath+'seperator.jpeg') | |||||||
| seperator2 = im_open(opath+'seperator2.jpeg') | seperator2 = im_open(opath+'seperator2.jpeg') | ||||||
| tempicon = im_open(opath+'temperature.jpeg') | tempicon = im_open(opath+'temperature.jpeg') | ||||||
| humicon = im_open(opath+'humidity.jpeg') | humicon = im_open(opath+'humidity.jpeg') | ||||||
| weekmon = im_open(weekpath+'week-mon.jpeg') |  | ||||||
| weeksun = im_open(weekpath+'week-sun.jpeg') |  | ||||||
| no_response = im_open(opath+'cloud-no-response.jpeg') | no_response = im_open(opath+'cloud-no-response.jpeg') | ||||||
| sunriseicon = im_open(opath+'wi-sunrise.jpeg') | sunriseicon = im_open(opath+'wi-sunrise.jpeg') | ||||||
| sunseticon = im_open(opath+'wi-sunset.jpeg') | sunseticon = im_open(opath+'wi-sunset.jpeg') | ||||||
| @@ -47,6 +43,7 @@ windiconspace = (79, 0) | |||||||
| sunriseplace = (214, 0) | sunriseplace = (214, 0) | ||||||
| sunsetplace = (214, 35) | sunsetplace = (214, 35) | ||||||
|  |  | ||||||
|  |  | ||||||
| col = 0 | col = 0 | ||||||
| agenda_view_lines = { | agenda_view_lines = { | ||||||
|     'line1': (col, 75), 'line2': (col, 100), |     'line1': (col, 75), 'line2': (col, 100), | ||||||
| @@ -125,16 +122,10 @@ positions = { | |||||||
|  |  | ||||||
| week_row = 134 | week_row = 134 | ||||||
|  |  | ||||||
| weekdaysmon = { | weekday_pos = { | ||||||
|     'Mon': (col1, week_row), 'Tue': (col2, week_row), 'Wed': (col3, week_row), |     'pos0': (col1, week_row), 'pos1': (col2, week_row), 'pos2': (col3, week_row), | ||||||
|     'Thu': (col4, week_row), 'Fri': (col5, week_row), 'Sat': (col6, week_row), |     'pos3': (col4, week_row), 'pos4': (col5, week_row), 'pos5': (col6, week_row), | ||||||
|     'Sun': (col7, week_row) |     'pos6': (col7, week_row) | ||||||
|     } |  | ||||||
|  |  | ||||||
| weekdayssun = { |  | ||||||
|     'Sun': (col1, week_row), 'Mon': (col2, week_row), 'Tue': (col3, week_row), |  | ||||||
|     'Wed': (col4, week_row), 'Thu': (col5, week_row), 'Fri': (col6, week_row), |  | ||||||
|     'Sat': (col7, week_row) |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
| weathericons = { | weathericons = { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user