@@ -221,6 +221,7 @@ def createWindow(self):
221
221
222
222
self .properties : dict [typing .Literal [
223
223
'labelFrame' ,
224
+ 'notebook' ,
224
225
'scrollFrame' ,
225
226
'frame' ,
226
227
'panned' ,
@@ -231,7 +232,12 @@ def createWindow(self):
231
232
}
232
233
self .side_pane .add (self .properties ['labelFrame' ])
233
234
235
+ # self.properties['notebook'] = ttk.Notebook(self.properties['labelFrame'])
236
+
234
237
self .properties ['scrollFrame' ] = ScrollFrame (self .properties ['labelFrame' ], usettk = True , width = side_pane_width ,)
238
+ # self.properties['notebook'].pack(fill='both', expand=True)
239
+ # self.properties['notebook'].add(self.properties['scrollFrame'], text='Object Properties')
240
+ # self.properties['notebook'].add(ttk.Frame(self.properties['notebook']), text='Level Properties')
235
241
self .properties ['scrollFrame' ].pack (fill = 'both' , expand = True )
236
242
self .properties ['frame' ] = self .properties ['scrollFrame' ].viewPort
237
243
@@ -609,6 +615,7 @@ def addProperty(
609
615
show_button = True ,
610
616
row = 0 ,
611
617
label_prefix : str = '' ,
618
+ label_editable : bool = True ,
612
619
entry_callback : typing .Callable [[str ], typing .Any ] = None ,
613
620
label_callback : typing .Callable [[str ], bool ] = None ,
614
621
button_callback : typing .Callable = None ,
@@ -624,7 +631,7 @@ def addProperty(
624
631
625
632
label_frame = ttk .Frame (self .properties ['left' ])
626
633
627
- if show_button :
634
+ if label_editable :
628
635
name = tkwidgets .EditableLabel (
629
636
label_frame ,
630
637
text = property ,
@@ -791,6 +798,7 @@ def updatePosition(value, column):
791
798
'Name' ,
792
799
obj .name ,
793
800
'text' ,
801
+ label_editable = False ,
794
802
show_button = False ,
795
803
row = 0 ,
796
804
)['size' ])
@@ -799,6 +807,7 @@ def updatePosition(value, column):
799
807
'Pos' ,
800
808
obj .pos ,
801
809
['number' , 'number' ],
810
+ label_editable = False ,
802
811
show_button = False ,
803
812
row = 1 ,
804
813
entry_callback = lambda value , col : updatePosition (value , col ),
@@ -813,6 +822,7 @@ def updatePosition(value, column):
813
822
'Angle' ,
814
823
angle ,
815
824
'number' ,
825
+ label_editable = False ,
816
826
show_button = False ,
817
827
row = 2 ,
818
828
from_ = - 360 ,
@@ -842,6 +852,7 @@ def updatePosition(value, column):
842
852
obj .properties [property ],
843
853
row = row ,
844
854
button_text = button_text ,
855
+ label_editable = property not in obj .defaultProperties ,
845
856
entry_callback = lambda value , prop = property : updateProperty (prop , value ),
846
857
label_callback = lambda name , prop = property : updatePropertyName (prop , name ),
847
858
button_callback = button_callback ,
@@ -1134,7 +1145,6 @@ def saveLevel(self, *args, filename = None):
1134
1145
self .game .gamepath ,
1135
1146
self .game .assets ,
1136
1147
self .game .baseassets ,
1137
- '/Levels/' ,
1138
1148
self .level .filename ,
1139
1149
)
1140
1150
0 commit comments