Attachment #605 for bug #986

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 986
Collapse All | Expand All

Lines 8-17 Link Here

(-)kdebase/kioslave/media/kcmodule/managermoduleview.ui (-3 / +274 lines)
8	<rect>	8	<rect>
9	<x>0</x>	9	<x>0</x>
10	<y>0</y>	10	<y>0</y>
11	<width>600</width>	11	<width>340</width>
12	<height>480</height>	12	<height>476</height>
13	</rect>	13	</rect>
14	</property>	14	</property>
		15	<property name="caption">
		16	<string>ManagerModuleView</string>
		17	</property>
15	<vbox>	18	<vbox>
16	<property name="name">	19	<property name="name">
17	<cstring>unnamed</cstring>	20	<cstring>unnamed</cstring>
Lines 49-54 Link Here
49	<string>Select this if you want to enable application autostart after mounting a device.</string>	52	<string>Select this if you want to enable application autostart after mounting a device.</string>
50	</property>	53	</property>
51	</widget>	54	</widget>
		55	<widget class="TQGroupBox">
		56	<property name="name">
		57	<cstring>groupbox_mount</cstring>
		58	</property>
		59	<property name="title">
		60	<string>Mount options</string>
		61	</property>
		62	<vbox>
		63	<property name="name">
		64	<cstring>unnamed</cstring>
		65	</property>
		66	<widget class="TQLabel">
		67	<property name="name">
		68	<cstring>textLabel3</cstring>
		69	</property>
		70	<property name="text">
		71	<string>Here you can specify default mount options for your storage media. Please note that some options are not supported for certain filesystems and/or medium. You will be able to redefine all these options on per-volume basis later, using Properties dialog of the corresponding volume.<br>
		72	Some of the options are tristate. Leave them "undefined" to let KDE choose the best value depending on your media.</string>
		73	</property>
		74	<property name="alignment">
		75	<set>WordBreak\|AlignVCenter</set>
		76	</property>
		77	</widget>
		78	<widget class="TQLayoutWidget">
		79	<property name="name">
		80	<cstring>layout30</cstring>
		81	</property>
		82	<grid>
		83	<property name="name">
		84	<cstring>unnamed</cstring>
		85	</property>
		86	<widget class="TQCheckBox" row="1" column="0">
		87	<property name="name">
		88	<cstring>option_ro</cstring>
		89	</property>
		90	<property name="text">
		91	<string>Read only</string>
		92	</property>
		93	<property name="whatsThis" stdset="0">
		94	<string>By default, mount all file systems read-only.</string>
		95	</property>
		96	</widget>
		97	<widget class="TQCheckBox" row="2" column="1">
		98	<property name="name">
		99	<cstring>option_uid</cstring>
		100	</property>
		101	<property name="text">
		102	<string>Mount as user</string>
		103	</property>
		104	<property name="whatsThis" stdset="0">
		105	<string>Mount this file system as user.</string>
		106	</property>
		107	</widget>
		108	<widget class="TQCheckBox" row="0" column="1">
		109	<property name="name">
		110	<cstring>option_flush</cstring>
		111	</property>
		112	<property name="text">
		113	<string>Flushed IO</string>
		114	</property>
		115	<property name="tristate">
		116	<bool>true</bool>
		117	</property>
		118	<property name="whatsThis" stdset="0">
119	<string>Always flush all data to the hot plug devices immediately and don't cache it.</string>
120	</property>
121	</widget>
122	<widget class="TQCheckBox" row="3" column="0">
123	<property name="name">
124	<cstring>option_sync</cstring>
125	</property>
126	<property name="text">
127	<string>Synchronous</string>
128	</property>
129	<property name="tristate">
130	<bool>true</bool>
131	</property>
132	<property name="whatsThis" stdset="0">
133	<string>All I/O to the file system should be done synchronously.</string>
134	</property>
135	</widget>
136	<widget class="TQCheckBox" row="2" column="0">
137	<property name="name">
138	<cstring>option_quiet</cstring>
139	</property>
140	<property name="text">
141	<string>Quiet</string>
142	</property>
143	<property name="whatsThis" stdset="0">
144	<string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string>
145	</property>
146	</widget>
147	<widget class="TQCheckBox" row="1" column="1">
148	<property name="name">
149	<cstring>option_utf8</cstring>
150	</property>
151	<property name="text">
152	<string>UTF-8 charset</string>
153	</property>
154	<property name="whatsThis" stdset="0">
155	<string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string>
156	</property>
157	</widget>
158	<widget class="TQLayoutWidget" row="3" column="1" rowspan="2" colspan="1">
159	<property name="name">
160	<cstring>layout29</cstring>
161	</property>
162	<grid>
163	<property name="name">
164	<cstring>unnamed</cstring>
165	</property>
166	<widget class="TQLabel" row="1" column="0">
167	<property name="name">
168	<cstring>text_shortname</cstring>
169	</property>
170	<property name="text">
171	<string>Short names:</string>
172	</property>
173	<property name="buddy" stdset="0">
174	<cstring>option_shortname</cstring>
175	</property>
176	<property name="whatsThis" stdset="0">
177	<string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2>
178
179	<h3><b>Lower</b></h3>
180	Force the short name to lower case upon display; store a long name when the short name is not all upper case.
181
182	<h3><b>Windows 95</b></h3>
183	Force the short name to upper case upon display; store a long name when the short name is not all upper case.
184
185	<h3><b>Windows NT</b></h3>
186	Display the shortname as is; store a long name when the short name is not all lower case or all upper case.
187
188	<h3><b>Mixed</b></h3>
189	Display the short name as is; store a long name when the short name is not all upper case.</string>
190	</property>
191	</widget>
192	<widget class="TQComboBox" row="0" column="1">
193	<item>
194	<property name="text">
195	<string>All Data</string>
196	</property>
197	</item>
198	<item>
199	<property name="text">
200	<string>Ordered</string>
201	</property>
202	</item>
203	<item>
204	<property name="text">
205	<string>Writeback</string>
206	</property>
207	</item>
208	<property name="name">
209	<cstring>option_journaling</cstring>
210	</property>
211	<property name="currentItem">
212	<number>1</number>
213	</property>
214	</widget>
215	<widget class="TQLabel" row="0" column="0">
216	<property name="name">
217	<cstring>text_journaling</cstring>
218	</property>
219	<property name="text">
220	<string>Journaling:</string>
221	</property>
222	<property name="buddy" stdset="0">
223	<cstring>option_journaling</cstring>
224	</property>
225	<property name="whatsThis" stdset="0">
226	<string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2>
227
228	<h3><b>All Data</b></h3>
229	All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.
230
231	<h3><b>Ordered</b></h3>
232	All data is forced directly out to the main file system prior to its metadata being committed to the journal.
233
234	<h3><b>Write Back</b></h3>
235	Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string>
236	</property>
237	</widget>
238	<widget class="TQComboBox" row="1" column="1">
239	<item>
240	<property name="text">
241	<string>Lower</string>
242	</property>
243	</item>
244	<item>
245	<property name="text">
246	<string>Windows 95</string>
247	</property>
248	</item>
249	<item>
250	<property name="text">
251	<string>Windows NT</string>
252	</property>
253	</item>
254	<item>
255	<property name="text">
256	<string>Mixed</string>
257	</property>
258	</item>
259	<property name="name">
260	<cstring>option_shortname</cstring>
261	</property>
262	</widget>
263	</grid>
264	</widget>
265	<widget class="TQCheckBox" row="0" column="0">
266	<property name="name">
267	<cstring>option_automount</cstring>
268	</property>
269	<property name="text">
270	<string>Mount automatically</string>
271	</property>
272	<property name="whatsThis" stdset="0">
273	<string>By default, mount all file systems automatically.</string>
274	</property>
275	</widget>
276	<widget class="TQCheckBox" row="4" column="0">
277	<property name="name">
278	<cstring>option_atime</cstring>
279	</property>
280	<property name="text">
281	<string>Access time updates</string>
282	</property>
283	<property name="tristate">
284	<bool>true</bool>
285	</property>
286	<property name="whatsThis" stdset="0">
287	<string>Update inode access time for each access.</string>
288	</property>
289	</widget>
290	</grid>
291	</widget>
292	</vbox>
293	</widget>
52	<spacer>	294	<spacer>
53	<property name="name">	295	<property name="name">
54	<cstring>spacer1</cstring>	296	<cstring>spacer1</cstring>
Lines 62-72 Link Here
62	<property name="tqsizeHint">	304	<property name="tqsizeHint">
63	<size>	305	<size>
64	<width>21</width>	306	<width>21</width>
65	<height>360</height>	307	<height>130</height>
66	</size>	308	</size>
67	</property>	309	</property>
68	</spacer>	310	</spacer>
69	</vbox>	311	</vbox>
70	</widget>	312	</widget>
		313	<connections>
		314	<connection>
		315	<sender>kcfg_HalBackendEnabled</sender>
		316	<signal>toggled(bool)</signal>
		317	<receiver>groupbox_mount</receiver>
		318	<slot>setEnabled(bool)</slot>
		319	</connection>
		320	</connections>
		321	<tabstops>
		322	<tabstop>kcfg_HalBackendEnabled</tabstop>
		323	<tabstop>kcfg_CdPollingEnabled</tabstop>
		324	<tabstop>kcfg_AutostartEnabled</tabstop>
		325	<tabstop>option_automount</tabstop>
		326	<tabstop>option_ro</tabstop>
		327	<tabstop>option_quiet</tabstop>
		328	<tabstop>option_sync</tabstop>
		329	<tabstop>option_atime</tabstop>
		330	<tabstop>option_flush</tabstop>
		331	<tabstop>option_utf8</tabstop>
		332	<tabstop>option_uid</tabstop>
		333	<tabstop>option_journaling</tabstop>
		334	<tabstop>option_shortname</tabstop>
		335	</tabstops>
		336	<includes>
		337	<include location="local" impldecl="in implementation">managermoduleview.ui.h</include>
		338	</includes>
		339	<functions>
		340	<function access="private" specifier="non virtual">init()</function>
		341	</functions>
71	<layoutdefaults spacing="6" margin="11"/>	342	<layoutdefaults spacing="6" margin="11"/>
72	</UI>	343	</UI>

Lines 1-5 Link Here

(-)kdebase/kioslave/media/kcmodule/managermodule.cpp (-1 / +140 lines)
1	/* This file is part of the KDE Project	1	/* This file is part of the KDE Project
2	Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>	2	Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>
		3	Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
3		4
4	This library is free software; you can redistribute it and/or	5	This library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Library General Public	6	modify it under the terms of the GNU Library General Public
Lines 20-28 Link Here
20		21
21	#include "managermodule.h"	22	#include "managermodule.h"
22		23
		24	#include <kconfig.h>
23	#include <klocale.h>	25	#include <klocale.h>
24	#include <dcopref.h>	26	#include <dcopref.h>
		27	#include <tqbutton.h>
25	#include <tqcheckbox.h>	28	#include <tqcheckbox.h>
		29	#include <tqcombobox.h>
		30	#include <tqobjectlist.h>
26	#include <kdirnotify_stub.h>	31	#include <kdirnotify_stub.h>
27		32
28	#include "managermoduleview.h"	33	#include "managermoduleview.h"
Lines 31-37 Link Here
31	ManagerModule::ManagerModule( TQWidget* parent, const char* name )	36	ManagerModule::ManagerModule( TQWidget* parent, const char* name )
32	: KCModule( parent, name )	37	: KCModule( parent, name )
33	{	38	{
34	ManagerModuleView *view = new ManagerModuleView( this );	39	view = new ManagerModuleView( this );
35		40
36	addConfig( MediaManagerSettings::self(), view );	41	addConfig( MediaManagerSettings::self(), view );
37		42
Lines 49-60 Link Here
49	#endif	54	#endif
50	view->kcfg_CdPollingEnabled->setEnabled( false );	55	view->kcfg_CdPollingEnabled->setEnabled( false );
51		56
		57	connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		58	connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		59	connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		60	connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		61	connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		62	connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		63	connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		64	connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) );
		65	connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
		66	connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) );
		67
52	load();	68	load();
		69	}
		70
		71
		72	void ManagerModule::load()
		73	{
		74	KCModule::load();
		75
		76	KConfig config("mediamanagerrc");
		77	config.setGroup("DefaultOptions");
		78
		79	view->option_automount->setChecked( config.readBoolEntry("automount", false) );
		80	view->option_ro->setChecked( config.readBoolEntry("ro", false) );
		81	view->option_quiet->setChecked( config.readBoolEntry("quiet", false) );
		82	if (config.hasKey("flush"))
		83	view->option_flush->setChecked( config.readBoolEntry("flush") );
		84	else
		85	view->option_flush->setNoChange();
		86	view->option_uid->setChecked( config.readBoolEntry("uid", true) );
		87	view->option_utf8->setChecked( config.readBoolEntry("utf8", true) );
		88	if (config.hasKey("sync"))
		89	view->option_sync->setChecked( config.readBoolEntry("sync") );
		90	else
		91	view->option_sync->setNoChange();
		92	if (config.hasKey("atime"))
		93	view->option_atime->setChecked( config.readBoolEntry("atime") );
		94	else
		95	view->option_atime->setNoChange();
		96
		97	QString value;
		98
		99	value = config.readEntry("shortname", "lower").lower();
		100	for (int i = 0; i < view->option_shortname->count(); i++)
		101	if (view->option_shortname->text(i).lower() == value) view->option_shortname->setCurrentItem(i);
		102
		103	value = config.readEntry("journaling", "ordered").lower();
		104	for (int i = 0; i < view->option_journaling->count(); i++)
		105	if (view->option_journaling->text(i).lower() == value) view->option_journaling->setCurrentItem(i);
		106
		107	rememberSettings();
53	}	108	}
54		109
55	void ManagerModule::save()	110	void ManagerModule::save()
56	{	111	{
57	KCModule::save();	112	KCModule::save();
		113
		114	KConfig config("mediamanagerrc");
		115	config.setGroup("DefaultOptions");
		116
		117	config.writeEntry("automount", view->option_automount->isChecked());
		118	config.writeEntry("ro", view->option_ro->isChecked());
		119	config.writeEntry("quiet", view->option_quiet->isChecked());
		120	if (view->option_flush->state() == QButton::NoChange)
		121	config.deleteEntry("flush");
		122	else
		123	config.writeEntry("flush", view->option_flush->isChecked());
		124	config.writeEntry("uid", view->option_uid->isChecked());
		125	config.writeEntry("utf8", view->option_utf8->isChecked());
		126	if (view->option_sync->state() == QButton::NoChange)
		127	config.deleteEntry("sync");
		128	else
		129	config.writeEntry("sync", view->option_sync->isChecked());
		130	if (view->option_atime->state() == QButton::NoChange)
		131	config.deleteEntry("atime");
		132	else
		133	config.writeEntry("atime", view->option_atime->isChecked());
		134	config.writeEntry("journaling", view->option_journaling->currentText().lower());
		135	config.writeEntry("shortname", view->option_shortname->currentText().lower());
		136
		137	rememberSettings();
58		138
59	//Well... reloadBackends is buggy with HAL, it seems to be linked	139	//Well... reloadBackends is buggy with HAL, it seems to be linked
60	//to a bug in the unmaintained Qt3 DBUS binding ;-/	140	//to a bug in the unmaintained Qt3 DBUS binding ;-/
Lines 70-74 Link Here
70	notifier.FilesAdded( "media:/" );	150	notifier.FilesAdded( "media:/" );
71	}	151	}
72		152
		153	void ManagerModule::defaults()
		154	{
		155	KCModule::defaults();
		156
		157	view->option_automount->setChecked(false);
		158	view->option_ro->setChecked(false);
		159	view->option_quiet->setChecked(false);
		160	view->option_flush->setNoChange();
		161	view->option_uid->setChecked(true);
		162	view->option_utf8->setChecked(true);
		163	view->option_sync->setNoChange();
		164	view->option_atime->setNoChange();
		165	view->option_journaling->setCurrentItem(1);
		166	view->option_shortname->setCurrentItem(0);
		167	}
73		168
		169	void ManagerModule::rememberSettings()
		170	{
		171	QObjectList *options = view->queryList(0, "^option_");
		172	QObject *current = 0;
		173	QObjectListIterator it(*options);
		174
		175	settings.clear();
		176	while ( (current = it.current()) != 0 ) {
		177	if (current->isA("QCheckBox"))
		178	settings[current] = ((QCheckBox *)current)->state();
		179	else if (current->isA("QComboBox"))
		180	settings[current] = ((QComboBox *)current)->currentItem();
		181	++it;
		182	}
		183	delete options;
		184
		185	}
		186
		187	void ManagerModule::emitChanged()
		188	{
		189	QObjectList *options = view->queryList(0, "^option_");
		190	QObject *current = 0;
		191	QObjectListIterator it(*options);
		192	int value = -1;
		193	bool somethingChanged = false;
		194
		195	while ( (current = it.current()) != 0 ) {
		196	if (current->isA("QCheckBox"))
		197	value = ((QCheckBox *)current)->state();
		198	else if (current->isA("QComboBox"))
		199	value = ((QComboBox *)current)->currentItem();
		200
		201	if (settings[current] != value) {
		202	somethingChanged = true;
		203	break;
		204	}
		205
		206	++it;
		207	}
		208	delete options;
		209
		210	emit changed(somethingChanged);
		211	}
		212
74	#include "managermodule.moc"	213	#include "managermodule.moc"

Lines 67-72 Link Here

(-)kdebase/kioslave/media/kcmodule/main.cpp (+1 lines)
67	I18N_NOOP("(c) 2005 Jean-Remy Falleri"));	67	I18N_NOOP("(c) 2005 Jean-Remy Falleri"));
68	about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net");	68	about->addAuthor("Jean-Remy Falleri", I18N_NOOP("Maintainer"), "jr.falleri@laposte.net");
69	about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net");	69	about->addAuthor("Kevin Ottens", 0, "ervin ipsquad net");
		70	about->addAuthor("Valentine Sinitsyn", 0, "e_val@inbox.ru");
70	about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design"));	71	about->addCredit("Achim Bohnet", I18N_NOOP("Help for the application design"));
71		72
72	setAboutData( about );	73	setAboutData( about );

Lines 1-5 Link Here

(-)kdebase/kioslave/media/kcmodule/managermodule.h (+15 lines)
1	/* This file is part of the KDE Project	1	/* This file is part of the KDE Project
2	Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>	2	Copyright (c) 2005 Kévin Ottens <ervin ipsquad net>
		3	Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
3		4
4	This library is free software; you can redistribute it and/or	5	This library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Library General Public	6	modify it under the terms of the GNU Library General Public
Lines 19-26 Link Here
19	#ifndef _MANAGERMODULE_H_	20	#ifndef _MANAGERMODULE_H_
20	#define _MANAGERMODULE_H_	21	#define _MANAGERMODULE_H_
21		22
		23	#include <tqmap.h>
22	#include <kcmodule.h>	24	#include <kcmodule.h>
23		25
		26	class ManagerModuleView;
		27
24	class ManagerModule : public KCModule	28	class ManagerModule : public KCModule
25	{	29	{
26	Q_OBJECT	30	Q_OBJECT
Lines 28-34 Link Here
28	public:	32	public:
29	ManagerModule( TQWidget* parent = 0, const char* name = 0);	33	ManagerModule( TQWidget* parent = 0, const char* name = 0);
30		34
		35	void load();
31	void save();	36	void save();
		37	void defaults();
		38
		39	private:
		40	void rememberSettings();
		41
		42	ManagerModuleView *view;
		43	TQMap<TQObject *, int> settings;
		44
		45	private slots:
		46	void emitChanged();
32	};	47	};
33		48
34	#endif	49	#endif




/****************************************************************************
** ui.h extension file, included from the uic-generated form implementation.
**
** If you want to add, delete, or rename functions or slots, use
** Qt Designer to update this file, preserving your code.
**
** You should not define a constructor or destructor in this file.
** Instead, write your code in functions called init() and destroy().
** These will automatically be called by the form's constructor and
** destructor.
*****************************************************************************/

void ManagerModuleView::init() 
{
    option_flush->setNoChange();
    option_sync->setNoChange();
    option_atime->setNoChange();
}




    option_automount->setChecked(options["automount"] == "true");
    connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );

    bool has_groupbox_specific = true;
    if (!options.contains("journaling") &&
	!options.contains("shortname") &&
	!options.contains("uid") &&
	!options.contains("utf8") &&
	!options.contains("flush")) {
      groupbox_specific->hide();
      has_groupbox_specific = false;
    }

    // The order is important - we want groupboxes to hide automatically depending on use_defaults
    // but don't want to emit changed() until user actually changes something.
    connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
    if (has_groupbox_specific)
      connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
    option_defaults->setChecked(options["use_defaults"] == "true");
    connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );    

  } else {


    }
  result << TQString("mountpoint=%1").arg(mp);
  result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");
  result << TQString("use_defaults=%1").arg(option_defaults->isChecked() ? "true" : "false");

  kdDebug() << result << endl;





        <rect>
            <x>0</x>
            <y>0</y>
            <width>219</width>
            <height>446</height>
        </rect>
    </property>
    <property name="caption">
        <string>PropertiesPageGUI</string>
    </property>
    <vbox>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <widget class="TQCheckBox">
            <number>0</number>
        </property>
        <widget class="TQLayoutWidget">
            <property name="name">
                <cstring>option_defaults</cstring>
            </property>
            <property name="text">
                <string>Use default mount options</string>
            </property>
        </widget>
        <widget class="TQGroupBox">
            <property name="name">
                <cstring>groupbox_generic</cstring>
            </property>
            <property name="title">
                <string>Generic Mount Options</string>
            </property>
            <vbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQLayoutWidget">
                    <property name="name">
                        <cstring>layout15</cstring>
                    </property>
                    <property name="title">
                        <string>Generic Mount Options</string>
                    </property>
                    <vbox>
                        <property name="name">
                            <cstring>unnamed</cstring>
                        </property>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_ro</cstring>
                            </property>
                            <property name="text">
                                <string>Read only</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Mount the file system read-only.</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_quiet</cstring>
                            </property>
                            <property name="text">
                                <string>Quiet</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_sync</cstring>
                            </property>
                            <property name="text">
                                <string>Synchronous</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>All I/O to the file system should be done synchronously.</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_atime</cstring>
                            </property>
                            <property name="text">
                                <string>Access time updates</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Update inode access time for each access.</string>
                            </property>
                        </widget>
                        <widget class="TQLayoutWidget">
                            <property name="name">
                                <cstring>layout14</cstring>
                            </property>
                            <hbox>
                                <property name="name">
                                    <cstring>unnamed</cstring>
                                </property>
                                <widget class="TQLabel">
                                    <property name="name">
                                        <cstring>textLabel3</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Mountpoint:</string>
                                    </property>
                                    <property name="buddy" stdset="0">
                                        <cstring>option_mountpoint</cstring>
                                    </property>
                                </widget>
                                <widget class="TQCheckBox">
                                    <property name="name">
                                        <cstring>option_quiet</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Quiet</string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string>
                                    </property>
                                </widget>
                                <widget class="TQLineEdit">
                                    <property name="name">
                                        <cstring>option_mountpoint</cstring>
                                    </property>
                                    <property name="text">
                                        <string></string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>All I/O to the file system should be done synchronously.</string>
                                    </property>
                                </widget>
                            </hbox>
                                    <property name="name">
                                        <cstring>option_atime</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Access time updates</string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>Update inode access time for each access.</string>
                                    </property>
                                </widget>
                                <widget class="TQLayoutWidget">
                                    <property name="name">
                                        <cstring>layout14</cstring>
                                    </property>
                                    <hbox>
                                        <property name="name">
                                            <cstring>unnamed</cstring>
                                        </property>
                                        <widget class="TQLabel">
                                            <property name="name">
                                                <cstring>textLabel3</cstring>
                                            </property>
                                            <property name="text">
                                                <string>Mountpoint:</string>
                                            </property>
                                            <property name="buddy" stdset="0">
                                                <cstring>option_mountpoint</cstring>
                                            </property>
                                            <property name="whatsThis" stdset="0">
                                                <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string>
                                            </property>
                                        </widget>
                                        <widget class="TQLineEdit">
                                            <property name="name">
                                                <cstring>option_mountpoint</cstring>
                                            </property>
                                            <property name="text">
                                                <string></string>
                                            </property>
                                        </widget>
                                    </hbox>
                                </widget>
                                <widget class="TQCheckBox">
                                    <property name="name">
                                        <cstring>option_automount</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Mount automatically</string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>Mount this file system automatically.</string>
                                    </property>
                                </widget>
                            </vbox>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_automount</cstring>
                            </property>
                            <property name="text">
                                <string>Mount automatically</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Mount this file system automatically.</string>
                            </property>
                        </widget>
                    </vbox>
                </widget>
            </vbox>
        </widget>
        <widget class="TQGroupBox">
            <property name="name">
                <cstring>groupbox_specific</cstring>
            </property>
            <property name="title">
                <string>Filesystem Specific Mount Options</string>
            </property>
            <vbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQLayoutWidget">
                    <property name="name">
                        <cstring>layout11</cstring>
                    </property>
                    <property name="title">
                        <string>Filesystem Specific Mount Options</string>
                    </property>
                    <vbox>
                        <property name="name">
                            <cstring>unnamed</cstring>
                        </property>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_flush</cstring>
                            </property>
                            <property name="text">
                                <string>Flushed IO</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Always flush all data to the hot plug devices immediately and don't cache it.</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_utf8</cstring>
                            </property>
                            <property name="text">
                                <string>UTF-8 charset</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string>
                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                            <property name="name">
                                <cstring>option_uid</cstring>
                            </property>
                            <property name="text">
                                <string>Mount as user</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>Mount this file system as user.</string>
                            </property>
                        </widget>
                        <widget class="TQLayoutWidget">
                            <property name="name">
                                <cstring>layout7</cstring>
                            </property>
                            <hbox>
                                <property name="name">
                                    <cstring>unnamed</cstring>
                                </property>
                                <widget class="TQLabel">
                                    <property name="name">
                                        <cstring>text_journaling</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Journaling:</string>
                                    </property>
                                    <property name="buddy" stdset="0">
                                        <cstring>option_journaling</cstring>
                                    </property>
                                </widget>
                                <widget class="TQCheckBox">
                                    <property name="name">
                                        <cstring>option_utf8</cstring>
                                    </property>
                                    <property name="text">
                                        <string>UTF-8 charset</string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
                                    </property>
                                </widget>
                                <widget class="TQCheckBox">
                                    <property name="name">
                                        <cstring>option_uid</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Mount as user</string>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>Mount this file system as user.</string>
                                    </property>
                                </widget>
                                <widget class="TQLayoutWidget">
                                    <property name="name">
                                        <cstring>layout7</cstring>
                                    </property>
                                    <hbox>
                                        <property name="name">
                                            <cstring>unnamed</cstring>
                                        </property>
                                        <widget class="TQLabel">
                                            <property name="name">
                                                <cstring>text_journaling</cstring>
                                            </property>
                                            <property name="text">
                                                <string>Journaling:</string>
                                            </property>
                                            <property name="buddy" stdset="0">
                                                <cstring>option_journaling</cstring>
                                            </property>
                                            <property name="whatsThis" stdset="0">
                                                <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
           
&lt;h3&gt;&lt;b&gt;All Data&lt;/b&gt;&lt;/h3&gt;
           All  data  is  committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.


&lt;h3&gt;&lt;b&gt;Write Back&lt;/b&gt;&lt;/h3&gt;
           Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal.  This is rumoured to  be the  highest-throughput option.  It guarantees internal file system integrity,  however it can allow old data to appear in files after  a  crash  and  journal recovery.</string>
                                    </property>
                                </widget>
                                <widget class="TQComboBox">
                                    <item>
                                        <property name="text">
                                            <string>All Data</string>
                                        </property>
                                    </item>
                                    <item>
                                        <property name="text">
                                            <string>Ordered</string>
                                        </property>
                                    </item>
                                    <item>
                                        <property name="text">
                                            <string>Write Back</string>
                                        </property>
                                    </item>
                                    <property name="name">
                                        <cstring>option_journaling</cstring>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>&lt;h2&gt;Specifies  the journalling mode for file data. Metadata is always journaled. &lt;/h2&gt;
           
&lt;h3&gt;&lt;b&gt;All Data&lt;/b&gt;&lt;/h3&gt;
           All  data  is  committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security.


&lt;h3&gt;&lt;b&gt;Write Back&lt;/b&gt;&lt;/h3&gt;
           Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal.  This is rumoured to  be the  highest-throughput option.  It guarantees internal file system integrity,  however it can allow old data to appear in files after  a  crash  and  journal recovery.</string>
                                    </property>
                                        </widget>
                                    </hbox>
                                </widget>
                            </hbox>
                        </widget>
                        <widget class="TQLayoutWidget">
                            <property name="name">
                                <cstring>layout14</cstring>
                            </property>
                            <hbox>
                                <property name="name">
                                    <cstring>unnamed</cstring>
                                </property>
                                <widget class="TQLabel">
                                    <property name="name">
                                        <cstring>text_shortname</cstring>
                                    </property>
                                    <property name="text">
                                        <string>Short names:</string>
                                    </property>
                                    <property name="buddy" stdset="0">
                                        <cstring>option_shortname</cstring>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;
                                            <property name="text">
                                                <string>Short names:</string>
                                            </property>
                                            <property name="buddy" stdset="0">
                                                <cstring>option_shortname</cstring>
                                            </property>
                                            <property name="whatsThis" stdset="0">
                                                <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;

&lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
Force the short name to lower case upon display; store a long name when the short name is not all upper case.


&lt;h3&gt;&lt;b&gt;Mixed&lt;/b&gt;&lt;/h3&gt;
Display the short name as is; store a long name when the short name is not all upper case.</string>
                                    </property>
                                </widget>
                                <widget class="TQComboBox">
                                    <item>
                                        <property name="text">
                                            <string>Lower</string>
                                        </property>
                                    </item>
                                    <item>
                                        <property name="text">
                                            <string>Windows 95</string>
                                        </property>
                                    </item>
                                    <item>
                                        <property name="text">
                                            <string>Windows NT</string>
                                        </property>
                                    </item>
                                    <item>
                                        <property name="text">
                                            <string>Mixed</string>
                                        </property>
                                    </item>
                                    <property name="name">
                                        <cstring>option_shortname</cstring>
                                    </property>
                                    <property name="whatsThis" stdset="0">
                                        <string>&lt;h2&gt;Defines  the  behaviour  for  creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.&lt;/h2&gt;

&lt;h3&gt;&lt;b&gt;Lower&lt;/b&gt;&lt;/h3&gt;
Force the short name to lower case upon display; store a long name when the short name is not all upper case.


&lt;h3&gt;&lt;b&gt;Mixed&lt;/b&gt;&lt;/h3&gt;
Display the short name as is; store a long name when the short name is not all upper case.</string>
                                    </property>
                                        </widget>
                                    </hbox>
                                </widget>
                            </hbox>
                        </widget>
                    </vbox>
                </widget>
                <widget class="TQLabel">
                    <property name="name">
                        <cstring>label_filesystem</cstring>
                    </property>
                    <property name="text">
                        <string>Filesystem: iso9660</string>
                    </property>
                </widget>
                <spacer>
                    <property name="name">
                        <cstring>spacer1</cstring>
                    </property>
                    <property name="orientation">
                        <enum>Vertical</enum>
                    </property>
                    <property name="sizeType">
                        <enum>Expanding</enum>
                    </property>
                    <property name="tqsizeHint">
                        <size>
                            <width>20</width>
                            <height>20</height>
                        </size>
                    </property>
                </spacer>
            </vbox>
        </widget>
        <widget class="TQLabel">
            <property name="name">
                <cstring>label_filesystem</cstring>
            </property>
            <property name="text">
                <string>Filesystem: iso9660</string>
            </property>
        </widget>
        <spacer>
            <property name="name">
                <cstring>spacer1</cstring>
            </property>
            <property name="orientation">
                <enum>Vertical</enum>
            </property>
            <property name="sizeType">
                <enum>Expanding</enum>
            </property>
            <property name="tqsizeHint">
                <size>
                    <width>20</width>
                    <height>20</height>
                </size>
            </property>
        </spacer>
    </vbox>
</widget>
<connections>
    <connection>




/* This file is part of the KDE Project
   Copyright (c) 2004-2005 JÃ©rÃ´me Lodewyck <jerome dot lodewyck at normalesup dot org>
   Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>

   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public

{
    char*   _ppt_string;
    TQString _ppt_QString;
    _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL);
    dbus_error_init(&error);
    _ppt_string = libhal_device_get_property_string(ctx, udi, key, &error);
    if ( _ppt_string )
        _ppt_QString = _ppt_string;
    libhal_free_string(_ppt_string);

    }

    KConfig config("mediamanagerrc");
    
    bool use_defaults = true;    
    if (config.hasGroup(name)) 
    {
	config.setGroup(name);
	use_defaults = config.readBoolEntry("use_defaults", false);
    }
    
    if (use_defaults)
	config.setGroup("DefaultOptions");    

    char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
    TQMap<TQString,bool> valids;

    libhal_free_string_array(array);
    TQStringList result;
    TQString tmp;
    
    result << TQString("use_defaults=%1").arg(use_defaults ? "true" : "false");    

    TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
    if (fstype.isNull())

        removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
                     || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);

    bool value;
    if (use_defaults)
    {
	value = config.readBoolEntry("automount", false);
    }
    else
    {
	QString current_group = config.group();
	config.setGroup(drive_udi);
	value = config.readBoolEntry("automount", false);
	config.setGroup(current_group);
    }

    if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)
        || libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)


    TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);

    const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
    for (int index = 0; names[index]; ++index)
        if (valids.contains(names[index]))
            config.writeEntry(names[index], valids[names[index]] == "true");

Return to bug 986

Line 0 Link Here

(-)kdebase/kioslave/media/kcmodule/managermoduleview.ui.h (+18 lines)
	1	/****************************************************************************
	2	** ui.h extension file, included from the uic-generated form implementation.
	3	**
	4	** If you want to add, delete, or rename functions or slots, use
	5	** Qt Designer to update this file, preserving your code.
	6	**
	7	** You should not define a constructor or destructor in this file.
	8	** Instead, write your code in functions called init() and destroy().
	9	** These will automatically be called by the form's constructor and
	10	** destructor.
	11	*****************************************************************************/
	12
	13	void ManagerModuleView::init()
	14	{
	15	option_flush->setNoChange();
	16	option_sync->setNoChange();
	17	option_atime->setNoChange();
	18	}

Lines 140-151 Link Here

(-)kdebase/kioslave/media/propsdlgplugin/propertiespage.cpp (-1 / +13 lines)
140	option_automount->setChecked(options["automount"] == "true");	140	option_automount->setChecked(options["automount"] == "true");
141	connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );	141	connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
142		142
		143	bool has_groupbox_specific = true;
143	if (!options.contains("journaling") &&	144	if (!options.contains("journaling") &&
144	!options.contains("shortname") &&	145	!options.contains("shortname") &&
145	!options.contains("uid") &&	146	!options.contains("uid") &&
146	!options.contains("utf8") &&	147	!options.contains("utf8") &&
147	!options.contains("flush"))	148	!options.contains("flush")) {
148	groupbox_specific->hide();	149	groupbox_specific->hide();
		150	has_groupbox_specific = false;
		151	}
		152
		153	// The order is important - we want groupboxes to hide automatically depending on use_defaults
		154	// but don't want to emit changed() until user actually changes something.
		155	connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) );
		156	if (has_groupbox_specific)
		157	connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) );
		158	option_defaults->setChecked(options["use_defaults"] == "true");
		159	connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) );
149		160
150	} else {	161	} else {
151		162
Lines 198-203 Link Here
198	}	210	}
199	result << TQString("mountpoint=%1").arg(mp);	211	result << TQString("mountpoint=%1").arg(mp);
200	result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");	212	result << TQString("automount=%1").arg(option_automount->isChecked() ? "true" : "false");
		213	result << TQString("use_defaults=%1").arg(option_defaults->isChecked() ? "true" : "false");
201		214
202	kdDebug() << result << endl;	215	kdDebug() << result << endl;
203		216

Lines 1-5 Link Here

(-)kdebase/kioslave/media/mediamanager/halbackend.cpp (-8 / +27 lines)
1	/* This file is part of the KDE Project	1	/* This file is part of the KDE Project
2	Copyright (c) 2004-2005 JÃ©rÃ´me Lodewyck <jerome dot lodewyck at normalesup dot org>	2	Copyright (c) 2004-2005 JÃ©rÃ´me Lodewyck <jerome dot lodewyck at normalesup dot org>
		3	Copyright (c) 2006 Valentine Sinitsyn <e_val@inbox.ru>
3		4
4	This library is free software; you can redistribute it and/or	5	This library is free software; you can redistribute it and/or
5	modify it under the terms of the GNU Library General Public	6	modify it under the terms of the GNU Library General Public
Lines 56-64 Link Here
56	{	57	{
57	char* _ppt_string;	58	char* _ppt_string;
58	TQString _ppt_QString;	59	TQString _ppt_QString;
59	DBusError error;	60	_ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL);
60	dbus_error_init(&error);
61	_ppt_string = libhal_device_get_property_string(ctx, udi, key, &error);
62	if ( _ppt_string )	61	if ( _ppt_string )
63	_ppt_QString = _ppt_string;	62	_ppt_QString = _ppt_string;
64	libhal_free_string(_ppt_string);	63	libhal_free_string(_ppt_string);
Lines 929-935 Link Here
929	}	928	}
930		929
931	KConfig config("mediamanagerrc");	930	KConfig config("mediamanagerrc");
932	config.setGroup(name);	931
		932	bool use_defaults = true;
		933	if (config.hasGroup(name))
		934	{
		935	config.setGroup(name);
		936	use_defaults = config.readBoolEntry("use_defaults", false);
		937	}
		938
		939	if (use_defaults)
		940	config.setGroup("DefaultOptions");
933		941
934	char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);	942	char ** array = libhal_device_get_property_strlist(m_halContext, volume_udi.latin1(), "volume.mount.valid_options", NULL);
935	TQMap<TQString,bool> valids;	943	TQMap<TQString,bool> valids;
Lines 944-949 Link Here
944	libhal_free_string_array(array);	952	libhal_free_string_array(array);
945	TQStringList result;	953	TQStringList result;
946	TQString tmp;	954	TQString tmp;
		955
		956	result << TQString("use_defaults=%1").arg(use_defaults ? "true" : "false");
947		957
948	TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");	958	TQString fstype = libhal_device_get_property_QString(m_halContext, volume_udi.latin1(), "volume.fstype");
949	if (fstype.isNull())	959	if (fstype.isNull())
Lines 956-964 Link Here
956	removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)	966	removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL)
957	\|\| libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);	967	\|\| libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL);
958		968
959	config.setGroup(drive_udi);	969	bool value;
960	bool value = config.readBoolEntry("automount", false);	970	if (use_defaults)
961	config.setGroup(name);	971	{
		972	value = config.readBoolEntry("automount", false);
		973	}
		974	else
		975	{
		976	QString current_group = config.group();
		977	config.setGroup(drive_udi);
		978	value = config.readBoolEntry("automount", false);
		979	config.setGroup(current_group);
		980	}
962		981
963	if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)	982	if (libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_blank", NULL)
964	\|\| libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)	983	\|\| libhal_device_get_property_bool(m_halContext, volume_udi.latin1(), "volume.disc.is_vcd", NULL)
Lines 1083-1089 Link Here
1083		1099
1084	TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);	1100	TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
1085		1101
1086	const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };	1102	const char *names[] = { "use_defaults", "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
1087	for (int index = 0; names[index]; ++index)	1103	for (int index = 0; names[index]; ++index)
1088	if (valids.contains(names[index]))	1104	if (valids.contains(names[index]))
1089	config.writeEntry(names[index], valids[names[index]] == "true");	1105	config.writeEntry(names[index], valids[names[index]] == "true");