diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-02-25 21:49:33 +0700 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-02-25 21:49:33 +0700 |
| commit | 71bd29a534261d3ac976a4f2fb2c953172d165b5 (patch) | |
| tree | 826b8762319c30fbcf6d989722d95579a1409e7d /tdeioslave | |
| parent | db51b92c9630e39ccbdff07f978a30370d7272be (diff) | |
| download | tdebase-71bd29a534261d3ac976a4f2fb2c953172d165b5.tar.gz tdebase-71bd29a534261d3ac976a4f2fb2c953172d165b5.zip | |
Added "default" mount option to TDE hardware manager. This resolves bug 2593.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdeioslave')
| -rw-r--r-- | tdeioslave/media/mediamanager/halbackend.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 7 | ||||
| -rw-r--r-- | tdeioslave/media/tdecmodule/managermoduleview.ui | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index 7829ab29e..80d443392 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -1039,9 +1039,9 @@ TQStringList HALBackend::mountoptions(const TQString &name) if (valids.contains("shortname")) { TQString svalue = config.readEntry("shortname", "lower").lower(); - if (svalue == "winnt") + if (svalue == "windows nt") result << "shortname=winnt"; - else if (svalue == "win95") + else if (svalue == "windows 95") result << "shortname=win95"; else if (svalue == "mixed") result << "shortname=mixed"; diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 5510478c7..4746f48cc 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -1051,16 +1051,17 @@ TQStringList TDEBackend::mountoptions(const TQString &name) if (valids.contains("shortname")) { TQString svalue = config.readEntry("shortname", "lower").lower(); - if (svalue == "winnt") { + // If the user choose 'default', no shortname is added to the mount option list + if (svalue == "windows nt") { result << "shortname=winnt"; } - else if (svalue == "win95") { + else if (svalue == "windows 95") { result << "shortname=win95"; } else if (svalue == "mixed") { result << "shortname=mixed"; } - else { + else if (svalue == "lower"){ result << "shortname=lower"; } } diff --git a/tdeioslave/media/tdecmodule/managermoduleview.ui b/tdeioslave/media/tdecmodule/managermoduleview.ui index 708d38c50..febef70f7 100644 --- a/tdeioslave/media/tdecmodule/managermoduleview.ui +++ b/tdeioslave/media/tdecmodule/managermoduleview.ui @@ -195,6 +195,9 @@ Some of the options are tristate. Leave them "undefined" to let TDE choose the b <property name="whatsThis" stdset="0"> <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> +<h3><b>Default</b></h3> +Do not force a short name option at all. + <h3><b>Lower</b></h3> Force the short name to lower case upon display; store a long name when the short name is not all upper case. @@ -257,6 +260,11 @@ Display the short name as is; store a long name when the short name is not all u <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> + <string>Default</string> + </property> + </item> + <item> + <property name="text"> <string>Lower</string> </property> </item> |