Git commit f70ee062b0a74be683538bd29aefb7b97dcee070 by Burkhard Lück. Committed on 18/12/2009 at 15:54. Pushed by lueck into branch 'master'.
doc update for konqui's configuration dialogs, all 21 pages are up to date now :) svn path=/trunk/KDE/kdebase/runtime/; revision=1063455 M +17 -253 doc/kcontrol/filemanager/index.docbook D +- -- doc/kcontrol/filemanager/kfileman1.png D +- -- doc/kcontrol/filemanager/kfileman2.png A +2 -0 doc/kcontrol/khtml-general/CMakeLists.txt A +137 -0 doc/kcontrol/khtml-general/index.docbook http://commits.kde.org/konqueror/f70ee062b0a74be683538bd29aefb7b97dcee070 diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index be620a8..70928c1 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -7,137 +7,33 @@ <article lang="&language;"> <articleinfo> - +<title>File Management</title> <authorgroup> <author>&Mike.McBride; &Mike.McBride.mail;</author> <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> -<date>2002-10-16</date> -<releaseinfo>3.1</releaseinfo> +<date>2009-12-18</date> +<releaseinfo>&kde; 4.4</releaseinfo> <keywordset> <keyword>KDE</keyword> -<keyword>KControl</keyword> +<keyword>Systemsettings</keyword> <keyword>file manager</keyword> </keywordset> </articleinfo> -<sect1 id="file-manager"> -<title>File Manager</title> -<para>In this module, you can configure various aspects of +<para>In these modules, you can configure various aspects of &konqueror;'s file manager functionality. </para> <note><para>&konqueror;'s web browser functionality has its <ulink -url="help:/kcontrol/khtml/index.html">own configuration +url="help:/kcontrol/khtml-behavior/index.html">own configuration modules</ulink>.</para></note> -<sect2 id="fileman-use"> -<title>Use</title> - -<para> The configuration options for the file manager are -organized under tabs as follows:</para> - -<variablelist> -<varlistentry> -<term><guilabel>Appearance</guilabel></term> -<listitem><para>This tab contains options for customizing the appearance of -&konqueror; windows, such as the default font -text color.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Behavior</guilabel></term> -<listitem><para>This tab contains a couple of &konqueror; -global options.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Previews</guilabel></term> -<listitem> -<para>On this tab, you can customize when &konqueror; should show -previews.</para> -</listitem> -</varlistentry> -</variablelist> - -<sect3 id="fileman-appearance"> -<title>Appearance</title> - -<para>The following settings determine how text and colors are displayed in -&konqueror; File Manager mode windows.</para> - -<variablelist> -<varlistentry> -<term><guilabel>Standard font:</guilabel></term> -<listitem> -<para>This is the font used to display text such as file names in -&konqueror; windows.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Font size:</guilabel></term> -<listitem> - -<para>Lets you control the size of text, while the <guilabel>Standard -Font</guilabel> setting determines the font face used.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Normal text color:</guilabel></term> -<listitem> -<para>Determines the standard text color.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Height for icon text:</guilabel></term> -<listitem> -<para>The maximum number of lines that can be used to draw icon text. Long lines are truncated at the end of the last line.</para> -<tip> <para>You can still see word-wrapped filenames by pausing the mouse pointer over the icon.</para></tip> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Width for icon text:</guilabel></term> -<listitem> -<para>The maximum width for the icon text when &konqueror; is in multi-column view mode.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Underline filenames:</guilabel></term> -<listitem> -<para>When <guilabel>Underline filenames</guilabel> is checked, - filenames will be underlined so that they look like links on a web - page.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Display file sizes in bytes:</guilabel></term> -<listitem> -<para>The final check box on this page determines how &konqueror; -displays file sizes, when you are in one of the file manager modes -that normally shows this information. If you check the -<guilabel>Display file sizes in bytes</guilabel> box then file sizes -are always shown in bytes. If you leave it unchecked then file sizes -are shown in bytes, kilobytes or megabytes, depending on their -size.</para> -</listitem> -</varlistentry> -</variablelist> -</sect3> - -<sect3 id="fileman-behav"> -<title>Behavior</title> - <variablelist> <title><guilabel>Misc Options</guilabel></title> <varlistentry> -<term>Open folders in separate windows</term> +<term><guilabel>Open folders in separate windows</guilabel></term> <listitem> <para>If this option is checked, a new &konqueror; window will be created when you open a folder, rather than simply showing that folder's contents in the @@ -146,152 +42,20 @@ window.</para></listitem> </varlistentry> <varlistentry> -<term>Show network operations in a single window</term> +<term><guilabel>Show 'Delete' context menu entries which +bypass the trashcan</guilabel></term> <listitem> -<para>If unchecked, and you download a -file, a dialog box will appear that shows the status of the -download.</para> - -<screenshot> - <screeninfo>Download Dialog Box</screeninfo> - <mediaobject> - <imageobject><imagedata fileref="kfileman2.png" - format="PNG"/></imageobject> - <textobject> <phrase>Download Dialog Box</phrase> </textobject> - <caption> - <para>Individual Download Dialog Box</para> - </caption> - </mediaobject> -</screenshot> - -<para>If you start a new transfer, another dialog box will -appear. (&Netscape; users will be familiar with -this behavior) </para> - -<para>If checked, all transfer status windows will be grouped -together under a single dialog box.</para> -<screenshot> - <screeninfo>Download Dialog Box</screeninfo> - <mediaobject> - <imageobject><imagedata fileref="kfileman1.png" - format="PNG"/></imageobject> - <textobject><phrase>Download Dialog Box</phrase></textobject> - <caption> - <para>Collected Download Dialog Box</para> - </caption> - </mediaobject> -</screenshot> - -<para>If you choose to use the Collected download dialog box, you can -delete transfers by clicking once on the transfer you want to cancel, -then clicking the <guibutton>Delete</guibutton> Button on the -left.</para> - +<para>Check this if you want <quote>Delete</quote> menu commands to be +displayed on the desktop and in the file manager's context menus. +You can always delete files by holding the &Shift; key while calling +<guimenuitem>Move to Trash</guimenuitem>.</para> </listitem> </varlistentry> - -<varlistentry> -<term><guilabel>Show file tips</guilabel></term> -<listitem> -<para> Here you can control if, when moving the mouse over a file, you -want to see a small popup window with additional information about -that file.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Show previews in file tips</guilabel></term> -<listitem> -<para>Here you can control if the file tip should show a -thumbnail preview of the file. -</para> -</listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Home URL</guilabel></term> -<listitem><para>This is the &URL; (⪚ a -folder or a web page) where &konqueror; will jump to -when the <guibutton>Home</guibutton> button is pressed.</para><para>The -default is the users home folder, indicated with a -<literal>~</literal>.</para></listitem> -</varlistentry> </variablelist> -<para>You can set a path that is your <guilabel>Home URL</guilabel> by -typing into the text field, or using the <guiicon>browse</guiicon> -icon. The default is <literal>~</literal> which is a standard -shortcut for your $<envar>HOME</envar> folder. When you choose the -<guiicon>home</guiicon> icon on your panel, in a file open or save -dialog, or from within &konqueror; in file manager mode, this is the -folder you will be shown.</para> - -<para>The <guilabel>Ask confirmation for</guilabel> setting tells -&konqueror; what to do when you choose to <quote>Delete</quote>, -<quote>Trash</quote>, or <quote>Shred</quote> a file in a &konqueror; -window. If any box is checked, &konqueror; asks for confirmation before -performing the corresponding action.</para> - -</sect3> - -<sect3> -<title>Previews</title> - -<para>&konqueror; has a -preview feature for many file types, including <acronym>HTML</acronym> -files, images, &PostScript; and <acronym>PDF</acronym>, sound, web -archives (if you have the appropriate &konqueror; plugin installed) -and text files.</para> - -<para>If you enable previews for one of these, files of that particular -file type will not be represented by standard icons in the filemanager, but -will instead be shown as miniature previews. On slow computers, the -previews can take some time to show up, so you might not want to enable -this feature.</para> - -<para>In this module you can specify which <quote>protocols</quote> -you wish the previews to be available for. Creating the previews -requires that &konqueror; download at least part of the file, in order -to create the preview. &konqueror;, like the rest of &kde; is -entirely network transparent, and will treat a remote &FTP; folder -just as if it was on your local hard drive. This can result in a -delay, especially if you are viewing, for example, a folder full of -images over a slow network connection.</para> - -<para>For each protocol, you can independently enable or disable -previews. For example, you might enable previews for -<acronym>NFS</acronym> mounted drives if you have a fast network, but -disable them for &FTP; because your Internet connection is via a -modem.</para> - -<para>You can further refine the maximum size file that &konqueror; -will attempt to show a preview for. The default is 1 MB. In other -words, by default, if a file is 900 kB in size, and the protocol you -are viewing the folder with is enabled, then &konqueror; will -create a preview icon for it. If the file is 1.1 MB in size, -&konqueror; will not make a preview, even if the protocol is -enabled.</para> - -<para>You can turn on and off previews <quote>on the fly</quote> from -within &konqueror;, using the <guimenu>View</guimenu> menu. For -example, if you normally want to see image previews on every protocol, -but find a particular server is very slow to send you the data, you -might turn it off for the present, and turn it on again later.</para> - -<para>You may also like to enable the checkbox <guilabel>Increase size -of previews relative to icons</guilabel>, in order to see more -information in the thumbnails.</para> - -<para>Many image files already contain a thumbnail. You can enable -the <guilabel>Use thumbnails embedded in files</guilabel> to make use -of these. This will save time waiting for thumbnails to be created -when viewing a folder full of images you have not previously seen in -&konqueror;.</para> - -</sect3> - -</sect2> - -</sect1> +<para>The settings for &konqueror;'s file manager mode on the <guilabel>View Modes</guilabel>, +<guilabel>Navigation</guilabel>, <guilabel>Services</guilabel>, <guilabel>General</guilabel> +and <guilabel>Trash</guilabel> pages are used by &dolphin; as well. +</para> </article> diff --git a/doc/kcontrol/filemanager/kfileman1.png b/doc/kcontrol/filemanager/kfileman1.png deleted file mode 100644 index 33a4257..0000000 Binary files a/doc/kcontrol/filemanager/kfileman1.png and /dev/null differ diff --git a/doc/kcontrol/filemanager/kfileman2.png b/doc/kcontrol/filemanager/kfileman2.png deleted file mode 100644 index b2eebef..0000000 Binary files a/doc/kcontrol/filemanager/kfileman2.png and /dev/null differ diff --git a/doc/kcontrol/khtml-general/CMakeLists.txt b/doc/kcontrol/khtml-general/CMakeLists.txt new file mode 100644 index 0000000..23cdaef --- /dev/null +++ b/doc/kcontrol/khtml-general/CMakeLists.txt @@ -0,0 +1,2 @@ +########### install files ############### +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/khtml-general) diff --git a/doc/kcontrol/khtml-general/index.docbook b/doc/kcontrol/khtml-general/index.docbook new file mode 100644 index 0000000..9532868 --- /dev/null +++ b/doc/kcontrol/khtml-general/index.docbook @@ -0,0 +1,137 @@ +<?xml version="1.0" ?> +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" +"dtd/kdex.dtd" [ +<!ENTITY % addindex "IGNORE"> +<!ENTITY % English "INCLUDE" > <!-- change language only here --> +]> + +<article lang="&language;"> +<articleinfo> + +<authorgroup> +<author>&Burkhard.Lueck;</author> +<!-- TRANS:ROLES_OF_TRANSLATORS --> +</authorgroup> + +<date>2009-12-18</date> +<releaseinfo>&kde; 4.4</releaseinfo> + +<keywordset> +<keyword>KDE</keyword> +<keyword>Systemsettings</keyword> +<keyword>Konqueror</keyword> +<keyword>Behavior</keyword> +</keywordset> + +</articleinfo> +<sect1 id="konq-general-behavior"> +<title>General &konqueror; Behavior</title> + +<para>On this page you find settings for home and start page and the behavior +of tabbed browsing both for &konqueror;'s file manager and browser mode.</para> + +<variablelist> +<varlistentry> +<term><guilabel>When Konqueror starts</guilabel></term> +<listitem> +<para>This option determines which page is displayed when &konqueror; starts, +the introduction page, your home page, a blank page or your bookmarks page. +</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Home page</guilabel></term> +<listitem><para>This is the &URL; (⪚ a +folder or a web page) where &konqueror; in browser mode will jump to +when the <guibutton>Home Page</guibutton> button in the toolbar is pressed. +You can set a path that is your <guilabel>Home page</guilabel> by +typing into the text field, or using the <guiicon>browse</guiicon> +icon to select a local folder. &konqueror; needs to be restarted for +changes to take effect.</para> +<para>When &konqueror; is used in file manager mode, the <guilabel>Home Page</guilabel> +button in the toolbar is replaced by a <guilabel>Home Folder</guilabel> button +which makes it jump to your local home folder instead.</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Open links in +new tab instead of in new window</guilabel></term> +<listitem><para>&konqueror; defaults to a single window per page, but has the +capability to open multiple <firstterm>tabs</firstterm> inside a +single window. &konqueror; also, by default, has a &MMB; shortcut to +open any link in a new window. If you enable <guilabel>Open links in +new tab instead of in new window</guilabel> you can &MMB; click on a +link to have it open in a new tab.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Open popups in new tab instead of in new window</guilabel></term> +<listitem><para>Whether or not JavaScript popups if allowed shall open in a new tab or in a +new window.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Open as tab in existing Konqueror when URL is called externally</guilabel></term> +<listitem><para>When you click a &URL; in another &kde; program or call kfmclient to open a &URL;, +the current desktop will be searched for a non-minimized &konqueror; and, if +found, the &URL; opened as a new tab within it. Otherwise a new &konqueror; +window will be opened with the required &URL;.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Open new tabs in the background</guilabel></term> +<listitem><para>If you are using tabbed browsing, you can choose if a newly +opened tab becomes the active (<quote>front</quote>) tab, or goes to +the back. On a slow Internet connection, or while browsing a page +that has a list of headlines or other links in a list, you may like to +have the new tabs load in the background while you continue reading. +In this case, enable this setting. If you prefer to go +straight to the new page, leaving the old one in the background to +return to later, disable it.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Open new tab after current tab</guilabel></term> +<listitem><para>This will open a new tab opened from a page after the current tab, instead +of after the last tab.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Hide the tab bar when only one tab is open</guilabel></term> +<listitem><para>This will display the tab bar only if there are two or more tabs. Otherwise +it will always be displayed.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Show close button on tabs</guilabel></term> +<listitem><para>This will display close buttons inside each tab instead of websites' icons.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Middle-click on a tab to close it</guilabel></term> +<listitem><para>When you click on a tab using the middle mouse button or mouse wheel, it +will close that tab. &konqueror; needs to be restarted for changes to take +effect.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Confirm when closing windows with multiple tabs</guilabel></term> +<listitem><para>If you close a window in &konqueror; that has multiple tabs +open, &konqueror; will ask you if you're sure that you meant to close +it. You can toggle on and off this behavior with the +<guilabel>Confirm when closing windows with multiple tabs</guilabel> +check box.</para></listitem> +</varlistentry> + +<varlistentry> +<term><guilabel>Activate previously used tab when closing the current tab</guilabel></term> +<listitem><para>When checking this the previous used or opened tab will be activated when +you close the current active tab instead of the one right to the current tab.</para></listitem> +</varlistentry> + +</variablelist> + +</sect1> + +</article>
