44# TODO
55# Put documentation on code, its a wasteland out there
66# Remove multi-project support in favor of in-line AOD editing (through a toggle)
7+ # Serialize fprj widgets to improve speed when querying
78# Fix themes
89# Bundle SVG icons
910
@@ -73,6 +74,7 @@ def __init__(self):
7374 self .fileChanged = False
7475 self .clipboard = []
7576 self .stagedChanges = []
77+ self .resourceImages = []
7678 self .selectionDebounce = False
7779
7880 # Setup Settings
@@ -171,7 +173,7 @@ def accepted():
171173 if self .currentCompileState == 0 :
172174 currentProject = self .getCurrentProject ()
173175 currentProject ["data" ]["FaceProject" ]["Screen" ]["@Title" ] = self .compileUi .watchfaceName .text ()
174- currentProject ["data" ]["FaceProject" ]["Screen" ]["@Bitmap" ] = self .compileUi .thumbnailLocation .text ()
176+ currentProject ["data" ]["FaceProject" ]["Screen" ]["@Bitmap" ] = self .compileUi .thumbnailLocation .currentText ()
175177
176178 reply = QMessageBox .question (self , 'Mi Create' , _ ("Save project before building?" ), QMessageBox .StandardButton .Yes , QMessageBox .StandardButton .No )
177179 if reply == QMessageBox .StandardButton .Yes :
@@ -410,14 +412,16 @@ def reloadImages(self, imageFolder):
410412 self .ui .resourceList .clear ()
411413 else :
412414 self .ui .resourceList .clear ()
415+ self .resourceImages .clear ()
413416 for filename in os .listdir (imageFolder ):
414417 file = os .path .join (imageFolder , filename )
415418 if os .path .isfile (file ):
416419 logging .debug ("Creating file entry for " + os .path .basename (file ))
417420 item = QListWidgetItem (QIcon (file ), os .path .basename (file ))
418421 item .setData (0 , os .path .basename (file ))
419422 item .setSizeHint (QSize (64 , 64 ))
420-
423+
424+ self .resourceImages .append (os .path .basename (file ))
421425 self .ui .resourceList .addItem (item )
422426
423427 def setupWorkspace (self ):
@@ -507,7 +511,7 @@ def addResource():
507511 if currentProject == None or not currentProject .get ("imageFolder" ):
508512 return
509513
510- files = QFileDialog .getOpenFileNames (self , ' Add Image...' "%userprofile%\\ " , "Image File (*.png *.jpeg *.jpg)" )
514+ files = QFileDialog .getOpenFileNames (self , _ ( " Add Image..." ) , "%userprofile%\\ " , "Image File (*.png *.jpeg *.jpg)" )
511515
512516 if not files [0 ]:
513517 return
@@ -531,7 +535,8 @@ def openResourceFolder():
531535 return
532536
533537 if platform .system () == "Windows" :
534- os .startfile (currentProject ["imageFolder" ])
538+ path = str .replace (currentProject ["imageFolder" ], "/" , "\\ " )
539+ os .startfile (path )
535540 elif platform .system () == "Darwin" :
536541 subprocess .Popen (["open" , currentProject ["imageFolder" ]])
537542 else :
@@ -597,6 +602,9 @@ def updateProperty(widgetName, property, value):
597602 else :
598603 self .showDialogue ("warning" , "Invalid source name!" )
599604 return
605+ elif property == "@Alignment" :
606+ alignmentList = ["Left" , "Center" , "Right" ]
607+ currentItem [property ] = str (alignmentList .index (value ))
600608 elif property == "@Name" :
601609 if value == widgetName :
602610 return
@@ -629,6 +637,8 @@ def updateProperty(widgetName, property, value):
629637 self .ignoreHistoryInvoke = False
630638 updateProperty (currentSelected .data (0 ,101 ), args [0 ], args [1 ])
631639 else :
640+ if not currentItem .get (args [0 ]):
641+ currentItem [args [0 ]] = ""
632642 command = CommandModifyProperty (currentItem ["@Name" ], args [0 ], currentItem [args [0 ]], args [1 ], updateProperty , f"Change property { args [0 ]} { args [1 ]} )
633643 self .historySystem .undoStack .push (command )
634644 self .ignoreHistoryInvoke = False
@@ -647,7 +657,7 @@ def updateProperties(self, item, itemType=None):
647657 currentProject = self .getCurrentProject ()
648658 for index , object in enumerate (currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ]):
649659 if object ["@Name" ] == item :
650- self .propertiesWidget .loadProperties (self .propertyJson [itemType ], currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ][index ], currentProject ["data" ]["FaceProject" ]["@DeviceType" ])
660+ self .propertiesWidget .loadProperties (self .propertyJson [itemType ], currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ][index ], self . resourceImages , currentProject ["data" ]["FaceProject" ]["@DeviceType" ])
651661 break
652662 else :
653663 return
@@ -791,7 +801,6 @@ def deleteSelectedWatchfaceWidgets(self):
791801 self .ignoreHistoryInvoke = False
792802 else :
793803 def commandFunc (data ):
794- projectWidgets = currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ]
795804 currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ] = data
796805 currentProject ["canvas" ].loadObjects (currentProject ["data" ], currentProject ["imageFolder" ], self .settings ["Canvas" ]["Antialiasing" ]["value" ])
797806 self .Explorer .updateExplorer (currentProject ["data" ])
@@ -825,6 +834,9 @@ def pasteWatchfaceWidgets(self):
825834
826835 for item in self .clipboard :
827836 print (item )
837+ prevData = currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ]
838+ newData = prevData .copy ()
839+
828840 sameNameWidgets = list (filter (lambda widget : widget ["@Name" ] == item ["@Name" ], currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ]))
829841 count = len (sameNameWidgets )
830842
@@ -839,10 +851,16 @@ def pasteWatchfaceWidgets(self):
839851
840852 modifiedItem ["@Name" ] = f"{ item ['@Name' ]} { name_suffix * index }
841853
842- currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ].append (modifiedItem )
843- currentProject ["canvas" ].loadObjects (currentProject ["data" ], currentProject ["imageFolder" ], self .settings ["Canvas" ]["Antialiasing" ]["value" ])
844- self .Explorer .updateExplorer (currentProject ["data" ])
845- currentProject ["canvas" ].selectObject (modifiedItem ["@Name" ])
854+ newData .append (modifiedItem )
855+
856+ def commandFunc (data ):
857+ currentProject ["data" ]["FaceProject" ]["Screen" ]["Widget" ] = data
858+ currentProject ["canvas" ].loadObjects (currentProject ["data" ], currentProject ["imageFolder" ], self .settings ["Canvas" ]["Antialiasing" ]["value" ])
859+ self .Explorer .updateExplorer (currentProject ["data" ])
860+ currentProject ["canvas" ].selectObject (modifiedItem ["@Name" ])
861+
862+ command = CommandModifyProjectData (prevData , newData , commandFunc , f"Paste objects through ModifyProjectData command" )
863+ self .historySystem .undoStack .push (command )
846864
847865 def zoomCanvas (self , zoom ):
848866 currentProject = self .getCurrentProject ()
@@ -1233,7 +1251,8 @@ def compileProject(self):
12331251 self .compileUi .buttonBox .addButton ("Cancel" , QDialogButtonBox .ButtonRole .RejectRole )
12341252
12351253 self .compileUi .watchfaceName .setText (currentProject ["data" ]["FaceProject" ]["Screen" ]["@Title" ])
1236- self .compileUi .thumbnailLocation .setText (currentProject ["data" ]["FaceProject" ]["Screen" ]["@Bitmap" ])
1254+ self .compileUi .thumbnailLocation .addItems (self .resourceImages )
1255+ self .compileUi .thumbnailLocation .setCurrentText (currentProject ["data" ]["FaceProject" ]["Screen" ]["@Bitmap" ])
12371256
12381257 self .compileDialog .setModal (True )
12391258 self .compileDialog .show ()
0 commit comments