Mercurial > hg > xmms-sid
diff xmms-sid.glade @ 548:ba80c052e425
Configuration widget naming cleanups and GUI-related improvements;
Started planning and implementation of SIDPlay2 filter settings
loading/saving and import/export functionality.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 23 Feb 2007 05:13:05 +0000 |
| parents | 92b6496c73b5 |
| children | 081088695019 |
line wrap: on
line diff
--- a/xmms-sid.glade Fri Feb 23 05:11:02 2007 +0000 +++ b/xmms-sid.glade Fri Feb 23 05:13:05 2007 +0000 @@ -75,7 +75,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame4</name> + <name>cfg_sndres_frame</name> <border_width>4</border_width> <label>Resolution:</label> <label_xalign>0</label_xalign> @@ -127,7 +127,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame5</name> + <name>cfg_channels_frame</name> <border_width>4</border_width> <label>Channels:</label> <label_xalign>0</label_xalign> @@ -195,7 +195,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame8</name> + <name>cfg_samplerate_frame</name> <border_width>4</border_width> <label>Samplerate:</label> <label_xalign>0</label_xalign> @@ -285,7 +285,7 @@ <widget> <class>GtkFrame</class> - <name>cfg_oversample_grp</name> + <name>cfg_oversample_frame</name> <border_width>4</border_width> <label>Oversampling:</label> <label_xalign>0</label_xalign> @@ -324,7 +324,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox16</name> + <name>cfg_oversample_box</name> <border_width>2</border_width> <homogeneous>False</homogeneous> <spacing>4</spacing> @@ -427,7 +427,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame2</name> + <name>cfg_clock_frame</name> <border_width>4</border_width> <label>Clock speed:</label> <label_xalign>0</label_xalign> @@ -496,7 +496,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame3</name> + <name>cfg_sid_model_frame</name> <border_width>4</border_width> <label>SID model:</label> <label_xalign>0</label_xalign> @@ -565,7 +565,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame26</name> + <name>cfg_emulib_frame</name> <border_width>4</border_width> <label>Emulation library selection:</label> <label_xalign>0</label_xalign> @@ -629,7 +629,7 @@ <widget> <class>GtkFrame</class> - <name>w_frame1</name> + <name>cfg_memmode_frame</name> <border_width>4</border_width> <label>Memory mode:</label> <label_xalign>0</label_xalign> @@ -731,7 +731,7 @@ <widget> <class>GtkFrame</class> - <name>cfg_sidplay2_grp</name> + <name>cfg_sidplay2_frame</name> <border_width>4</border_width> <label>SIDPlay 2 options:</label> <label_xalign>0</label_xalign> @@ -751,7 +751,7 @@ <widget> <class>GtkCheckButton</class> - <name>cfg_emu_sidplay2_opt</name> + <name>cfg_emu_sp2_opt</name> <tooltip>This setting can be used to enable libSIDPlay2's "optimization mode", which in downgrades the emulation from cycle-exact to something similar to frame-exact. The result is lower CPU usage, but worse accuracy.</tooltip> <can_focus>True</can_focus> <label>Optimization mode (faster, inaccurate)</label> @@ -766,7 +766,7 @@ <widget> <class>GtkRadioButton</class> - <name>cfg_emu_sidplay2_resid</name> + <name>cfg_emu_sp2_resid</name> <tooltip>reSID is the software SID-chip simulator based on SID reverse-engineering, created by Dag Lem. It is probably the closest thing to real SID available as software-only emulation.</tooltip> <can_focus>True</can_focus> <label>reSID-emulation</label> @@ -782,7 +782,7 @@ <widget> <class>GtkRadioButton</class> - <name>cfg_emu_sidplay2_hardsid</name> + <name>cfg_emu_sp2_hardsid</name> <tooltip>HardSID is a EISA/PCI card for PC-compatibles, which can be fitted with a real SID-chip. Software can be used to control the HardSID and combined with software emulation of rest of C64 via libSIDPlay2 HardSID can be used to achieve "near 100%" similarity to real C64. For more information, see http://www.hardsid.com/</tooltip> <can_focus>True</can_focus> <label>HardSID</label> @@ -800,7 +800,7 @@ <widget> <class>GtkFrame</class> - <name>cfg_resid_grp</name> + <name>cfg_resid_frame</name> <border_width>4</border_width> <label>reSID sampling options:</label> <label_xalign>0</label_xalign> @@ -942,14 +942,14 @@ <widget> <class>GtkHBox</class> - <name>cfg_box_sidplay1</name> + <name>cfg_box_filter_sidplay1</name> <border_width>4</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> <widget> <class>GtkFrame</class> - <name>cfg_frm_fs</name> + <name>cfg_sp1_frm_fs</name> <border_width>2</border_width> <width>45</width> <label>FS</label> @@ -957,13 +957,13 @@ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> <padding>0</padding> - <expand>False</expand> + <expand>True</expand> <fill>True</fill> </child> <widget> <class>GtkVScale</class> - <name>cfg_emu_filt_fs</name> + <name>cfg_sp1_filter_fs</name> <can_focus>True</can_focus> <draw_value>True</draw_value> <value_pos>GTK_POS_TOP</value_pos> @@ -980,7 +980,7 @@ <widget> <class>GtkFrame</class> - <name>cfg_frm_fm</name> + <name>cfg_sp1_frm_fm</name> <border_width>2</border_width> <width>45</width> <label>FM</label> @@ -988,13 +988,13 @@ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> <padding>0</padding> - <expand>False</expand> + <expand>True</expand> <fill>True</fill> </child> <widget> <class>GtkVScale</class> - <name>cfg_emu_filt_fm</name> + <name>cfg_sp1_filter_fm</name> <can_focus>True</can_focus> <draw_value>True</draw_value> <value_pos>GTK_POS_TOP</value_pos> @@ -1011,7 +1011,7 @@ <widget> <class>GtkFrame</class> - <name>cfg_frm_ft</name> + <name>cfg_sp1_frm_ft</name> <border_width>2</border_width> <width>45</width> <label>FT</label> @@ -1019,13 +1019,13 @@ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> <padding>0</padding> - <expand>False</expand> + <expand>True</expand> <fill>True</fill> </child> <widget> <class>GtkVScale</class> - <name>cfg_emu_filt_ft</name> + <name>cfg_sp1_filter_ft</name> <can_focus>True</can_focus> <draw_value>True</draw_value> <value_pos>GTK_POS_TOP</value_pos> @@ -1054,7 +1054,7 @@ <widget> <class>GtkButton</class> - <name>cfg_filter_reset</name> + <name>cfg_sp1_filter_reset</name> <can_focus>True</can_focus> <signal> <name>clicked</name> @@ -1086,16 +1086,93 @@ </widget> <widget> - <class>GtkHBox</class> - <name>cfg_box_sidplay2</name> - <border_width>4</border_width> + <class>GtkVBox</class> + <name>cfg_box_filter_sidplay2</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <widget> + <class>GtkHBox</class> + <name>cfg_sp_filter_controlbox</name> + <border_width>2</border_width> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + + <widget> + <class>GtkCombo</class> + <name>cfg_sp2_filter_combo</name> + <value_in_list>False</value_in_list> + <ok_if_empty>True</ok_if_empty> + <case_sensitive>False</case_sensitive> + <use_arrows>True</use_arrows> + <use_arrows_always>False</use_arrows_always> + <items>6581 (reSID) +8580 (reSID) +6581R1 (alankila) +6581R4 (alankila) +</items> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkEntry</class> + <child_name>GtkCombo:entry</child_name> + <name>cfg_sp2_filter_combo_entry</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text>6581R1 (alankila)</text> + </widget> + </widget> + + <widget> + <class>GtkHButtonBox</class> + <name>hbuttonbox2</name> + <layout_style>GTK_BUTTONBOX_END</layout_style> + <spacing>0</spacing> + <child_min_width>85</child_min_width> + <child_min_height>27</child_min_height> + <child_ipad_x>7</child_ipad_x> + <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkButton</class> + <name>cfg_sp2_filter_load</name> + <can_default>True</can_default> + <can_focus>True</can_focus> + <label>Load</label> + <relief>GTK_RELIEF_NORMAL</relief> + </widget> + + <widget> + <class>GtkButton</class> + <name>cfg_sp2_filter_save</name> + <can_default>True</can_default> + <can_focus>True</can_focus> + <label>Save</label> + <relief>GTK_RELIEF_NORMAL</relief> + </widget> + </widget> + </widget> + + <widget> <class>GtkFrame</class> - <name>w_frame33</name> - <border_width>4</border_width> + <name>cfg_sp2_filter_frame</name> + <border_width>2</border_width> <label>Filter curve:</label> <label_xalign>0</label_xalign> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> @@ -1109,106 +1186,6 @@ <class>Placeholder</class> </widget> </widget> - - <widget> - <class>GtkVBox</class> - <name>w_vbox38</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkFrame</class> - <name>w_frame32</name> - <border_width>4</border_width> - <label>Presets:</label> - <label_xalign>0</label_xalign> - <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkVBox</class> - <name>w_vboxbaz</name> - <border_width>2</border_width> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - - <widget> - <class>GtkCombo</class> - <name>combo1</name> - <value_in_list>False</value_in_list> - <ok_if_empty>True</ok_if_empty> - <case_sensitive>False</case_sensitive> - <use_arrows>True</use_arrows> - <use_arrows_always>False</use_arrows_always> - <items>6581 (reSID) -8580 (reSID) -6581R1 (alankila) -6581R4 (alankila) -</items> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkEntry</class> - <child_name>GtkCombo:entry</child_name> - <name>combo-entry1</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text>6581R1 (alankila)</text> - </widget> - </widget> - - <widget> - <class>GtkHButtonBox</class> - <name>hbuttonbox2</name> - <border_width>2</border_width> - <layout_style>GTK_BUTTONBOX_SPREAD</layout_style> - <spacing>0</spacing> - <child_min_width>85</child_min_width> - <child_min_height>27</child_min_height> - <child_ipad_x>7</child_ipad_x> - <child_ipad_y>0</child_ipad_y> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - - <widget> - <class>GtkButton</class> - <name>button3</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <label>Load</label> - <relief>GTK_RELIEF_NORMAL</relief> - </widget> - - <widget> - <class>GtkButton</class> - <name>button4</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <label>Save</label> - <relief>GTK_RELIEF_NORMAL</relief> - </widget> - </widget> - </widget> - </widget> - </widget> </widget> <widget> @@ -1287,7 +1264,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox18</name> + <name>cfg_mintime_box</name> <homogeneous>False</homogeneous> <spacing>2</spacing> <child> @@ -1418,7 +1395,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox14</name> + <name>cfg_maxtime_box</name> <homogeneous>False</homogeneous> <spacing>2</spacing> <child> @@ -1534,7 +1511,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox13</name> + <name>cfg_sld_box</name> <homogeneous>False</homogeneous> <spacing>4</spacing> <child> @@ -1660,7 +1637,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox3</name> + <name>cfg_stil_box1</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> @@ -1744,7 +1721,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox17</name> + <name>cfg_stil_box2</name> <homogeneous>False</homogeneous> <spacing>0</spacing> <child> @@ -1843,10 +1820,10 @@ <widget> <class>GtkVBox</class> - <name>w_vbox16</name> + <name>vbox1</name> <border_width>2</border_width> <homogeneous>False</homogeneous> - <spacing>2</spacing> + <spacing>0</spacing> <widget> <class>GtkCheckButton</class> @@ -1869,73 +1846,85 @@ </widget> <widget> - <class>GtkEntry</class> - <name>cfg_ftitle_format</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> + <class>GtkVBox</class> + <name>cfg_ftitle_box</name> + <homogeneous>False</homogeneous> + <spacing>2</spacing> <child> - <padding>2</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkHBox</class> - <name>w_hbox9</name> - <homogeneous>True</homogeneous> - <spacing>0</spacing> - <child> - <padding>2</padding> - <expand>False</expand> - <fill>False</fill> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> </child> <widget> - <class>GtkLabel</class> - <name>cfg_ftitle_desc1</name> - <label>%% - '%' character -%p - Performer/composer -%t - Song name (title) -%c - Copyright -%s - File type -%m - SID model</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>0.04</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> + <class>GtkEntry</class> + <name>cfg_ftitle_format</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> <child> - <padding>0</padding> + <padding>2</padding> <expand>False</expand> <fill>False</fill> </child> </widget> <widget> - <class>GtkLabel</class> - <name>cfg_ftitle_desc2</name> - <label>%C - Speed/clock (PAL/NTSC) + <class>GtkHBox</class> + <name>w_hbox9</name> + <homogeneous>True</homogeneous> + <spacing>0</spacing> + <child> + <padding>2</padding> + <expand>False</expand> + <fill>False</fill> + </child> + + <widget> + <class>GtkLabel</class> + <name>cfg_ftitle_desc1</name> + <label>%% - '%' character +%p - Performer/composer +%t - Song name (title) +%c - Copyright +%s - File type +%m - SID model</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0.04</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>cfg_ftitle_desc2</name> + <label>%C - Speed/clock (PAL/NTSC) %n - Subtune %N - Number of subtunes %f - Filename %F - File path %e - File extension</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>0.04</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0.04</xalign> + <yalign>0.5</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> </widget> </widget> @@ -2107,7 +2096,7 @@ <widget> <class>GtkHBox</class> - <name>w_hbox20</name> + <name>cfg_subauto_box</name> <homogeneous>False</homogeneous> <spacing>2</spacing> <child> @@ -2994,4 +2983,20 @@ </widget> </widget> +<widget> + <class>GtkWindow</class> + <name>window1</name> + <title>window1</title> + <type>GTK_WINDOW_TOPLEVEL</type> + <position>GTK_WIN_POS_NONE</position> + <modal>False</modal> + <allow_shrink>False</allow_shrink> + <allow_grow>True</allow_grow> + <auto_shrink>False</auto_shrink> + + <widget> + <class>Placeholder</class> + </widget> +</widget> + </GTK-Interface>