Navigation

← Previous Changeset
Next Changeset →

Changeset 16793a3e2c08dcc51ab63545b12631fccfe9ead6

Timestamp:

27/02/07 23:30:36 (2 years ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1172615436 +0000

git-parent:

[072cd3c8fdf2cfa667dd05da05e6add861035599]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1172615436 +0000

Message:

* Qt4 - Simple Preferences: Start to bind the keys to the preferences. Lots of them still don't work. Why ?

Files:

modules/gui/qt4/components/simple_preferences.cpp (modified) (6 diffs)
modules/gui/qt4/ui/sprefs_audio.ui (modified) (7 diffs)
modules/gui/qt4/ui/sprefs_video.ui (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

modules/gui/qt4/components/simple_preferences.cpp

rb248dab	r16793a3
7	7	* Authors: Clément Stenac <zorglub@videolan.org>
8	8	* Antoine Cellerier <dionoea@videolan.org>
9		*
	9	* Jean-Baptiste Kempf <jb@videolan.org>
10	10	* This program is free software; you can redistribute it and/or modify
11	11	* it under the terms of the GNU General Public License as published by
…	…
39	39	#include "pixmaps/input_and_codecs_50x50.xpm"
40	40	#include "pixmaps/interface_50x50.xpm"
41		~~//#include "pixmaps/playlist_50x50.xpm"~~
42	41	#include "pixmaps/subtitles_50x50.xpm"
43	42	#include "pixmaps/video_50x50.xpm"
…	…
48	47	#include "ui/sprefs_subtitles.h"
49	48	#include "ui/sprefs_hotkeys.h"
50		~~//#include "ui/sprefs_playlist.h"~~
51	49	#include "ui/sprefs_interface.h"
52	50
…	…
134	132	CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
135	133	CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
136
	134	CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames);
137	135	CONFIG_GENERIC( "vout", Module, NULL, outputModule );
138	136
	137	#ifdef WIN32
	138	CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
	139	CONFIG_GENERIC( "directx-device", String, NULL, dXdisplayDevice );
	140	#endif
	141
139	142	CONFIG_GENERIC( "snapshot-path", String, NULL,
140		snapshotsDirectory ); /* FIXME -> use file instead of string */
	143	snapshotsDirectory ); /* FIXME -> use file instead of string */
141	144	CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
142	145	CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
…	…
144	147	CONFIG_GENERIC( "snapshot-format", StringList, NULL,
145	148	snapshotsFormat );
146
147		END_SPREFS_CAT;
	149	END_SPREFS_CAT;
148	150
149	151	START_SPREFS_CAT( Audio, "General audio settings" );
150		#ifndef WIN32
151		ui.DirectXLabel->setVisible( false );
152		ui.DirectXDevice->setVisible( false );
153		#endif
154		#ifdef WIN32
	152	#ifdef WIN32
155	153	ui.OSSBrowse->hide();
156	154	ui.OSSDevice->hide();
…	…
158	156	ui.alsaDevice->hide();
159	157	ui.alsaLabel->hide();
160		#endif
161		CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
	158	#else
	159	ui.DirectXLabel->setVisible( false );
	160	ui.DirectXDevice->setVisible( false );
	161	#endif
	162	CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
	163
	164	/* CONFIG_GENERIC( "volume" , RangedInt, NULL, defaultVolume );*/ //FIXME Why ?
	165	/* CONFIG_GENERIC( "audio-language" , String , NULL,
	166	preferredAudioLanguage ); */ //FIXME WHy ?
	167	CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
	168	/* CONFIG_GENERIC( "force-dolby-surround" , Integer , NULL,
	169	detectionDolby );*/
	170
	171	CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
	172	#ifndef WIN32
	173	/* CONFIG_GENERIC( "alsadev" , String , NULL, alsaDevice );*/
	174	CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File
	175	#else
	176	CONFIG_GENERIC( "directx-audio-device" , Integer, NULL,
	177	DirectXDevice );
	178	#endif
	179	CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File
	180
	181
	182	CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
	183	#if 0 // Not found for normalizer effect
	184	CONFIG_GENERIC( "" , , NULL, );
	185	#endif
	186	CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
162	187
163	188	END_SPREFS_CAT;

modules/gui/qt4/ui/sprefs_audio.ui

r2814bee	r16793a3
43	43	<number>6</number>
44	44	</property>
45		<item row="2" column="0" ~~colspan="2"~~ >
	45	<item row="2" column="0" >
46	46	<widget class="QLabel" name="label_8" >
47	47	<property name="text" >
…	…
50	50	</widget>
51	51	</item>
52		<item row="2" column="2" >
53		<widget class="QComboBox" name="~~preferredAudioLanguage_2~~" >
	52	<item row="2" column="1" >
	53	<widget class="QComboBox" name="detectionDolby" >
54	54	<property name="sizePolicy" >
55	55	<sizepolicy>
…	…
71	71	</widget>
72	72	</item>
73		<item row="1" column="0" colspan="3" >
74		<widget class="QCheckBox" name="~~check~~Box" >
	73	<item row="1" column="0" colspan="2" >
	74	<widget class="QCheckBox" name="spdifBox" >
75	75	<property name="text" >
76	76	<string>Use S/PDIF when available</string>
…	…
78	78	</widget>
79	79	</item>
80		<item row="3" column="2" >
	80	<item row="3" column="1" >
81	81	<widget class="QComboBox" name="preferredAudioLanguage" >
82	82	<property name="sizePolicy" >
…	…
96	96	</widget>
97	97	</item>
98		<item row="3" column="0" ~~colspan="2"~~ >
	98	<item row="3" column="0" >
99	99	<widget class="QLabel" name="label" >
100	100	<property name="text" >
…	…
103	103	</widget>
104	104	</item>
105		<item row="0" column="2" >
	105	<item row="0" column="1" >
106	106	<widget class="QSlider" name="defaultVolume" >
107	107	<property name="sizePolicy" >
…	…
124	124	</widget>
125	125	</item>
126		<item row="0" column="0" ~~colspan="2"~~ >
	126	<item row="0" column="0" >
127	127	<widget class="QLabel" name="label_2" >
128	128	<property name="text" >

modules/gui/qt4/ui/sprefs_video.ui

rb248dab	r16793a3
119	119	</property>
120	120	<item row="1" column="1" colspan="2" >
121		<widget class="QComboBox" name="displayDevice" />
	121	<widget class="QComboBox" name="dXdisplayDevice" />
122	122	</item>
123	123	<item row="1" column="0" >