TriM-Organization/Linglun-Converter
2
0
Fork 0
mirror of https://github.com/TriM-Organization/Linglun-Converter.git synced 2024-09-20 21:22:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ok、

Browse Source
This commit is contained in:
EillesWan 2024-05-02 01:59:32 +08:00
parent 67ca76f408
commit 4791dcd63d
3 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
llc_win_wxPython.py
View File

@ -279,17 +279,17 @@ on_exit_saving: bool = True
ignore_midi_mismatch_error: bool = True ignore_midi_mismatch_error: bool = True
convert_tables = { convert_tables = {
"PITCHED": { "PITCHED": {
"“偷吃”的对照表": Musicreater.MM_TOUCH_PITCHED_INSTRUMENT_TABLE, "“偷吃”对照表": Musicreater.MM_TOUCH_PITCHED_INSTRUMENT_TABLE,
"“经典”对照表": Musicreater.MM_CLASSIC_PITCHED_INSTRUMENT_TABLE, "“经典”对照表": Musicreater.MM_CLASSIC_PITCHED_INSTRUMENT_TABLE,
}, },
"PERCUSSION": { "PERCUSSION": {
"“偷吃”的对照表": Musicreater.MM_TOUCH_PERCUSSION_INSTRUMENT_TABLE, "“偷吃”对照表": Musicreater.MM_TOUCH_PERCUSSION_INSTRUMENT_TABLE,
"“经典”对照表": Musicreater.MM_CLASSIC_PERCUSSION_INSTRUMENT_TABLE, "“经典”对照表": Musicreater.MM_CLASSIC_PERCUSSION_INSTRUMENT_TABLE,
}, },
} }
convert_table_selection = { convert_table_selection = {
"PITCHED": "“偷吃”的对照表", "PITCHED": "“偷吃”对照表",
"PERCUSSION": "“偷吃”的对照表", "PERCUSSION": "“偷吃”对照表",
} }
ConvertClass = (Musicreater.MidiConvert, "常规转换") ConvertClass = (Musicreater.MidiConvert, "常规转换")
@ -454,6 +454,7 @@ class LingLunMainFrame(wx.Frame):
wx.DefaultSize, wx.DefaultSize,
wx.ALIGN_CENTER_HORIZONTAL | wx.ST_ELLIPSIZE_MIDDLE | wx.ST_NO_AUTORESIZE, wx.ALIGN_CENTER_HORIZONTAL | wx.ST_ELLIPSIZE_MIDDLE | wx.ST_NO_AUTORESIZE,
) )
self.yanlun_now = random.randrange(0, yanlun_length)
self.m_LinglunWords_staticText1.Wrap(-1) self.m_LinglunWords_staticText1.Wrap(-1)
self.m_LinglunWords_staticText1.SetFont( self.m_LinglunWords_staticText1.SetFont(
@ -1776,8 +1777,11 @@ class SettingPagePannel(wx.Panel):
wx.ID_ANY, wx.ID_ANY,
wx.DefaultPosition, wx.DefaultPosition,
wx.DefaultSize, wx.DefaultSize,
pg.PG_BOLD_MODIFIED | pg.PG_DEFAULT_STYLE, pg.PG_BOLD_MODIFIED
| pg.PG_HIDE_MARGIN
| pg.PG_SPLITTER_AUTO_CENTER,
) )
self.m_pitched_notes_table_propertyGrid1.SetFont( self.m_pitched_notes_table_propertyGrid1.SetFont(
wx.Font( wx.Font(
wx.NORMAL_FONT.GetPointSize(), wx.NORMAL_FONT.GetPointSize(),
@ -1789,6 +1793,8 @@ class SettingPagePannel(wx.Panel):
) )
) )
# self.m_pitched_notes_table_propertyGrid1.SetColumnProportion(0,1)
for midi_inst, mc_inst_patern in convert_tables["PITCHED"][ for midi_inst, mc_inst_patern in convert_tables["PITCHED"][
convert_table_selection["PITCHED"] convert_table_selection["PITCHED"]
].items(): ].items():
@ -1796,7 +1802,7 @@ class SettingPagePannel(wx.Panel):
pg.StringProperty( pg.StringProperty(
Musicreater.MIDI_PITCHED_NOTE_NAME_TABLE[midi_inst + 1][0], Musicreater.MIDI_PITCHED_NOTE_NAME_TABLE[midi_inst + 1][0],
"pitched_inst_{}".format(midi_inst), "pitched_inst_{}".format(midi_inst),
mc_inst_patern[0], mc_inst_patern,
) )
) )
@ -1856,8 +1862,11 @@ class SettingPagePannel(wx.Panel):
wx.ID_ANY, wx.ID_ANY,
wx.DefaultPosition, wx.DefaultPosition,
wx.DefaultSize, wx.DefaultSize,
pg.PG_BOLD_MODIFIED | pg.PG_DEFAULT_STYLE, pg.PG_BOLD_MODIFIED
| pg.PG_HIDE_MARGIN
| pg.PG_SPLITTER_AUTO_CENTER,
) )
self.m_percussion_notes_table_propertyGrid11.SetFont( self.m_percussion_notes_table_propertyGrid11.SetFont(
wx.Font( wx.Font(
wx.NORMAL_FONT.GetPointSize(), wx.NORMAL_FONT.GetPointSize(),
@ -1876,7 +1885,7 @@ class SettingPagePannel(wx.Panel):
pg.StringProperty( pg.StringProperty(
Musicreater.MIDI_PERCUSSION_NOTE_NAME_TABLE[midi_inst + 1][0], Musicreater.MIDI_PERCUSSION_NOTE_NAME_TABLE[midi_inst + 1][0],
"percussion_inst_{}".format(midi_inst), "percussion_inst_{}".format(midi_inst),
mc_inst_patern[0], mc_inst_patern,
) )
) )
@ -1989,7 +1998,7 @@ class SettingPagePannel(wx.Panel):
self.m_pitched_notes_table_propertyGrid1.SetPropertyValues( self.m_pitched_notes_table_propertyGrid1.SetPropertyValues(
dict( dict(
[ [
("pitched_inst_{}".format(midi_inst), mc_inst_patern[0]) ("pitched_inst_{}".format(midi_inst), mc_inst_patern)
for midi_inst, mc_inst_patern in convert_tables["PITCHED"][ for midi_inst, mc_inst_patern in convert_tables["PITCHED"][
convert_table_selection["PITCHED"] convert_table_selection["PITCHED"]
].items() ].items()
@ -2039,7 +2048,7 @@ class SettingPagePannel(wx.Panel):
self.m_percussion_notes_table_propertyGrid11.SetPropertyValues( self.m_percussion_notes_table_propertyGrid11.SetPropertyValues(
dict( dict(
[ [
("percussion_inst_{}".format(midi_inst), mc_inst_patern[0]) ("percussion_inst_{}".format(midi_inst), mc_inst_patern)
for midi_inst, mc_inst_patern in convert_tables["PERCUSSION"][ for midi_inst, mc_inst_patern in convert_tables["PERCUSSION"][
convert_table_selection["PERCUSSION"] convert_table_selection["PERCUSSION"]
].items() ].items()

22
wxFB_Project/LingLunConverter2.fbp
View File

@ -2590,16 +2590,16 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property> <property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">setting_page_sizer</property> <property name="name">setting_page_sizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property> <property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxNotebook" expanded="0"> <object class="wxNotebook" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -3187,11 +3187,11 @@
</object> </object>
</object> </object>
</object> </object>
<object class="notebookpage" expanded="0"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">乐音乐器对照表</property> <property name="label">乐音乐器对照表</property>
<property name="select">1</property> <property name="select">1</property>
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -3242,7 +3242,7 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property> <property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">setting_page2_box_sizer</property> <property name="name">setting_page2_box_sizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
@ -3364,7 +3364,7 @@
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxPG_BOLD_MODIFIED|wxPG_DEFAULT_STYLE</property> <property name="style">wxPG_BOLD_MODIFIED|wxPG_HIDE_MARGIN|wxPG_SPLITTER_AUTO_CENTER</property>
<property name="subclass">; ; forward_declare</property> <property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>
@ -3392,11 +3392,11 @@
</object> </object>
</object> </object>
</object> </object>
<object class="notebookpage" expanded="0"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">打击乐器对照表</property> <property name="label">打击乐器对照表</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxPanel" expanded="0"> <object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -3447,7 +3447,7 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property> <property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">setting_page3_box_sizer</property> <property name="name">setting_page3_box_sizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
@ -3569,7 +3569,7 @@
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxPG_BOLD_MODIFIED|wxPG_DEFAULT_STYLE</property> <property name="style">wxPG_BOLD_MODIFIED|wxPG_HIDE_MARGIN|wxPG_SPLITTER_AUTO_CENTER</property>
<property name="subclass">; ; forward_declare</property> <property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>

8
wxFB_Project/noname.py
View File

@ -1135,7 +1135,9 @@ class SettingPagePannel(wx.Panel):
wx.ID_ANY, wx.ID_ANY,
wx.DefaultPosition, wx.DefaultPosition,
wx.DefaultSize, wx.DefaultSize,
pg.PG_BOLD_MODIFIED | pg.PG_DEFAULT_STYLE, pg.PG_BOLD_MODIFIED
| pg.PG_HIDE_MARGIN
| pg.PG_SPLITTER_AUTO_CENTER,
) )
self.m_pitched_notes_table_propertyGrid1.SetFont( self.m_pitched_notes_table_propertyGrid1.SetFont(
wx.Font( wx.Font(
@ -1204,7 +1206,9 @@ class SettingPagePannel(wx.Panel):
wx.ID_ANY, wx.ID_ANY,
wx.DefaultPosition, wx.DefaultPosition,
wx.DefaultSize, wx.DefaultSize,
pg.PG_BOLD_MODIFIED | pg.PG_DEFAULT_STYLE, pg.PG_BOLD_MODIFIED
| pg.PG_HIDE_MARGIN
| pg.PG_SPLITTER_AUTO_CENTER,
) )
self.m_percussion_notes_table_propertyGrid11.SetFont( self.m_percussion_notes_table_propertyGrid11.SetFont(
wx.Font( wx.Font(