Skip to content

Commit ed983eb

Browse files
FishCat233FishCat233
committed
♻️ 修改ui事件的名称
1 parent ba2f8e5 commit ed983eb

File tree

3 files changed

+41
-50
lines changed

3 files changed

+41
-50
lines changed

‎src/SimpleCutMainFrame.py‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from src.model import VideoSequenceModel, VideoModel
1818

19-
VERSION = "0.3.3"
19+
VERSION = "0.3.4"
2020

2121

2222
class FileDropTarget(wx.FileDropTarget):
@@ -61,16 +61,7 @@ def __init__(self, parent=None):
6161
# TODO: 参数初始化
6262
self.ExportBitCtrl.SetValue("6")
6363

64-
@staticmethod
65-
def format_time(time_string: str) -> str:
66-
# 一些提升体验的小更改
67-
# 将空格替换为 ":"
68-
# 将全角 “：” 替换为半角 “:”
69-
time_string = str.replace(time_string, " ", ":")
70-
time_string = str.replace(time_string, "：", ":")
71-
return time_string
72-
73-
def AddFileBtnOnClick(self, event):
64+
def on_add_file_button_click(self, event):
7465
# 文件选择对话框
7566
file_dlg = wx.FileDialog(self, u"选择导入的文件", "", "", "*.mp4", wx.FD_OPEN)
7667
if file_dlg.ShowModal() == wx.ID_OK:
@@ -100,7 +91,7 @@ def list_ctrl_on_drop_files(self, event):
10091
item_no = self.list_ctrl.GetItemCount()
10192
self.add_files(item_no, filename, filename)
10293

103-
def RemoveBtnOnClick(self, event):
94+
def on_remove_file_button_click(self, event):
10495
# 删除列表中的项
10596
index = self.first_selected_index
10697

@@ -127,7 +118,7 @@ def RemoveBtnOnClick(self, event):
127118
# 选中 index
128119
self.list_ctrl.Select(index)
129120

130-
def MovUpBtnOnClick(self, event):
121+
def on_move_up_file_button_click(self, event):
131122
value = self.first_selected_index
132123

133124
if value == -1:
@@ -145,7 +136,7 @@ def MovUpBtnOnClick(self, event):
145136
self.list_ctrl.Select(self.first_selected_index, on=0) # 取消原来的选中
146137
self.list_ctrl.Select(self.first_selected_index - 1)
147138

148-
def MovDownBtnOnClick(self, event):
139+
def on_move_down_file_button_click(self, event):
149140
value = self.first_selected_index
150141

151142
if value == -1:
@@ -164,7 +155,7 @@ def MovDownBtnOnClick(self, event):
164155
self.list_ctrl.Select(self.first_selected_index, on=0) # 取消原来的选中
165156
self.list_ctrl.Select(self.first_selected_index + 1)
166157

167-
def ExportBtnOnClick(self, event):
158+
def on_export_button_click(self, event):
168159
# TODO: 加了码率设置的功能，别忘了测试
169160
# TODO: item list 重写
170161

@@ -255,7 +246,7 @@ def export_video_file(self, export_amix, export_mbps, export_name):
255246
# 导出失败，发送事件
256247
wx.CallAfter(self.on_export_done, ExportMessage(WorkStateEnum.FAIL, e))
257248

258-
def ProjectWebBtnOnClick(self, event):
249+
def on_open_project_website_button_click(self, event):
259250
# TODO: Implement ProjectWebBtnOnClick
260251
pass
261252

@@ -281,12 +272,12 @@ def append_files(self, filename, path):
281272
item_no = self.list_ctrl.GetItemCount()
282273
self.add_files(item_no, filename, path)
283274

284-
def ClearAllBtnClick(self, event):
275+
def on_clear_all_button_click(self, event):
285276
self.video_sequence.clear_all()
286277
logging.debug(f"clear all video: {self.video_sequence.video_list}")
287278
self.update_sequence_model()
288279

289-
def OnStartTimeCtrlText(self, event):
280+
def on_start_time_ctrl_text(self, event):
290281
"""修改开始时间输入框的时候修改itemlist的start_time"""
291282
index = self.first_selected_index
292283
value = self.StartTimeCtrl.GetValue()
@@ -295,7 +286,7 @@ def OnStartTimeCtrlText(self, event):
295286

296287
self.update_video_model_item(index)
297288

298-
def OnEndTimeCtrlText(self, event):
289+
def on_end_time_ctrl_text(self, event):
299290
"""修改结束时间输入框的时候修改itemlist的end_time"""
300291
index = self.first_selected_index
301292
value = self.EndTimeCtrl.GetValue()
@@ -304,7 +295,7 @@ def OnEndTimeCtrlText(self, event):
304295

305296
self.update_video_model_item(index)
306297

307-
def list_ctrl_on_selected(self, event):
298+
def on_list_item_selected(self, event):
308299
index = self.list_ctrl.GetFirstSelected()
309300
self.first_selected_index = index
310301

‎src/SimpleCutPy.fbp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<property name="window_name"></property>
245245
<property name="window_style"></property>
246246
<event name="OnDropFiles">list_ctrl_on_drop_files</event>
247-
<event name="OnListItemSelected">list_ctrl_on_selected</event>
247+
<event name="OnListItemSelected">on_list_item_selected</event>
248248
</object>
249249
</object>
250250
<object class="sizeritem" expanded="true">
@@ -390,7 +390,7 @@
390390
<property name="window_extra_style"></property>
391391
<property name="window_name"></property>
392392
<property name="window_style"></property>
393-
<event name="OnText">OnStartTimeCtrlText</event>
393+
<event name="OnText">on_start_time_ctrl_text</event>
394394
</object>
395395
</object>
396396
</object>
@@ -529,7 +529,7 @@
529529
<property name="window_extra_style"></property>
530530
<property name="window_name"></property>
531531
<property name="window_style"></property>
532-
<event name="OnText">OnEndTimeCtrlText</event>
532+
<event name="OnText">on_end_time_ctrl_text</event>
533533
</object>
534534
</object>
535535
</object>
@@ -617,7 +617,7 @@
617617
<property name="window_extra_style"></property>
618618
<property name="window_name"></property>
619619
<property name="window_style"></property>
620-
<event name="OnButtonClick">AddFileBtnOnClick</event>
620+
<event name="OnButtonClick">on_add_file_button_click</event>
621621
</object>
622622
</object>
623623
<object class="sizeritem" expanded="false">
@@ -692,7 +692,7 @@
692692
<property name="window_extra_style"></property>
693693
<property name="window_name"></property>
694694
<property name="window_style"></property>
695-
<event name="OnButtonClick">RemoveBtnOnClick</event>
695+
<event name="OnButtonClick">on_remove_file_button_click</event>
696696
</object>
697697
</object>
698698
<object class="sizeritem" expanded="false">
@@ -767,7 +767,7 @@
767767
<property name="window_extra_style"></property>
768768
<property name="window_name"></property>
769769
<property name="window_style"></property>
770-
<event name="OnButtonClick">MovUpBtnOnClick</event>
770+
<event name="OnButtonClick">on_move_up_file_button_click</event>
771771
</object>
772772
</object>
773773
<object class="sizeritem" expanded="false">
@@ -842,7 +842,7 @@
842842
<property name="window_extra_style"></property>
843843
<property name="window_name"></property>
844844
<property name="window_style"></property>
845-
<event name="OnButtonClick">MovDownBtnOnClick</event>
845+
<event name="OnButtonClick">on_move_down_file_button_click</event>
846846
</object>
847847
</object>
848848
<object class="sizeritem" expanded="true">
@@ -917,7 +917,7 @@
917917
<property name="window_extra_style"></property>
918918
<property name="window_name"></property>
919919
<property name="window_style"></property>
920-
<event name="OnButtonClick">ClearAllBtnClick</event>
920+
<event name="OnButtonClick">on_clear_all_button_click</event>
921921
</object>
922922
</object>
923923
</object>
@@ -1543,7 +1543,7 @@
15431543
<property name="window_extra_style"></property>
15441544
<property name="window_name"></property>
15451545
<property name="window_style"></property>
1546-
<event name="OnButtonClick">ExportBtnOnClick</event>
1546+
<event name="OnButtonClick">on_export_button_click</event>
15471547
</object>
15481548
</object>
15491549
<object class="sizeritem" expanded="true">
@@ -1999,7 +1999,7 @@
19991999
<property name="window_extra_style"></property>
20002000
<property name="window_name"></property>
20012001
<property name="window_style"></property>
2002-
<event name="OnButtonClick">ProjectWebBtnOnClick</event>
2002+
<event name="OnButtonClick">on_open_project_website_button_click</event>
20032003
</object>
20042004
</object>
20052005
</object>

‎src/SimpleCutPy.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -204,16 +204,16 @@ def __init__( self, parent ):
204204

205205
# Connect Events
206206
self.list_ctrl.Bind( wx.EVT_DROP_FILES, self.list_ctrl_on_drop_files )
207-
self.list_ctrl.Bind( wx.EVT_LIST_ITEM_SELECTED, self.list_ctrl_on_selected )
208-
self.StartTimeCtrl.Bind( wx.EVT_TEXT, self.OnStartTimeCtrlText )
209-
self.EndTimeCtrl.Bind( wx.EVT_TEXT, self.OnEndTimeCtrlText )
210-
self.AddFileBtn.Bind( wx.EVT_BUTTON, self.AddFileBtnOnClick )
211-
self.RemoveBtn.Bind( wx.EVT_BUTTON, self.RemoveBtnOnClick )
212-
self.MovUpBtn.Bind( wx.EVT_BUTTON, self.MovUpBtnOnClick )
213-
self.MovDownBtn.Bind( wx.EVT_BUTTON, self.MovDownBtnOnClick )
214-
self.ClearAllBtn.Bind( wx.EVT_BUTTON, self.ClearAllBtnClick )
215-
self.ExportBtn.Bind( wx.EVT_BUTTON, self.ExportBtnOnClick )
216-
self.ProjectWebBtn.Bind( wx.EVT_BUTTON, self.ProjectWebBtnOnClick )
207+
self.list_ctrl.Bind( wx.EVT_LIST_ITEM_SELECTED, self.on_list_item_selected )
208+
self.StartTimeCtrl.Bind( wx.EVT_TEXT, self.on_start_time_ctrl_text )
209+
self.EndTimeCtrl.Bind( wx.EVT_TEXT, self.on_end_time_ctrl_text )
210+
self.AddFileBtn.Bind( wx.EVT_BUTTON, self.on_add_file_button_click )
211+
self.RemoveBtn.Bind( wx.EVT_BUTTON, self.on_remove_file_button_click )
212+
self.MovUpBtn.Bind( wx.EVT_BUTTON, self.on_move_up_file_button_click )
213+
self.MovDownBtn.Bind( wx.EVT_BUTTON, self.on_move_down_file_button_click )
214+
self.ClearAllBtn.Bind( wx.EVT_BUTTON, self.on_clear_all_button_click )
215+
self.ExportBtn.Bind( wx.EVT_BUTTON, self.on_export_button_click )
216+
self.ProjectWebBtn.Bind( wx.EVT_BUTTON, self.on_open_project_website_button_click )
217217

218218
def __del__( self ):
219219
pass
@@ -223,34 +223,34 @@ def __del__( self ):
223223
def list_ctrl_on_drop_files( self, event ):
224224
event.Skip()
225225

226-
def list_ctrl_on_selected( self, event ):
226+
def on_list_item_selected( self, event ):
227227
event.Skip()
228228

229-
def OnStartTimeCtrlText( self, event ):
229+
def on_start_time_ctrl_text( self, event ):
230230
event.Skip()
231231

232-
def OnEndTimeCtrlText( self, event ):
232+
def on_end_time_ctrl_text( self, event ):
233233
event.Skip()
234234

235-
def AddFileBtnOnClick( self, event ):
235+
def on_add_file_button_click( self, event ):
236236
event.Skip()
237237

238-
def RemoveBtnOnClick( self, event ):
238+
def on_remove_file_button_click( self, event ):
239239
event.Skip()
240240

241-
def MovUpBtnOnClick( self, event ):
241+
def on_move_up_file_button_click( self, event ):
242242
event.Skip()
243243

244-
def MovDownBtnOnClick( self, event ):
244+
def on_move_down_file_button_click( self, event ):
245245
event.Skip()
246246

247-
def ClearAllBtnClick( self, event ):
247+
def on_clear_all_button_click( self, event ):
248248
event.Skip()
249249

250-
def ExportBtnOnClick( self, event ):
250+
def on_export_button_click( self, event ):
251251
event.Skip()
252252

253-
def ProjectWebBtnOnClick( self, event ):
253+
def on_open_project_website_button_click( self, event ):
254254
event.Skip()
255255

256256

0 commit comments

Comments
 (0)