Version: (using KDE Devel) Installed from: Compiled sources patch is checked with meinproc Index: svn/kdegraphics/doc/kruler/index.docbook =================================================================== --- svn/kdegraphics/doc/kruler/index.docbook (Revision 460267) +++ svn/kdegraphics/doc/kruler/index.docbook (Arbeitskopie) @@ -56,11 +56,12 @@ measure distances on your screen.</para> <para>To start &kruler;, choose <menuchoice><guimenu>Graphics</guimenu> +<guisubmenu>More Applications</guisubmenu> <guimenuitem>KDE Screen Ruler</guimenuitem></menuchoice> from your <guimenu>K</guimenu> menu.</para> -<para>&LMB; clicking on the &kruler; will turn the cursor into a hand icon, and -enable you to drag &kruler; around the screen.</para> +<para>Clicking with the &LMB; on the &kruler; will change the cursor to a cross with four arrows, and +enables you to drag &kruler; around the screen.</para> <para>When you move the mouse over &kruler;, your cursor will turn into an elongated arrow, with a circle at one end. As you move the cursor, &kruler; will @@ -80,7 +81,7 @@ <chapter id="menu-reference"> <title>Menu Reference</title> -<para>&RMB; clicking on the ruler will pop up a context menu, with the +<para>Clicking with the &RMB; on the ruler will pop up a context menu, with the following entries:</para> <variablelist> @@ -202,7 +203,7 @@ <term> <menuchoice> <shortcut> -&Ctrl;<keycap>S</keycap> +<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guisubmenu>Length</guisubmenu> <guimenuitem>Short</guimenuitem> @@ -216,7 +217,7 @@ <term> <menuchoice> <shortcut> -&Ctrl;<keycap>M</keycap> +<keycombo action="simul">&Ctrl;<keycap>M</keycap></keycombo> </shortcut> <guisubmenu>Length</guisubmenu> <guimenuitem>Medium</guimenuitem> @@ -230,7 +231,7 @@ <term> <menuchoice> <shortcut> -&Ctrl;<keycap>T</keycap> +<keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo> </shortcut> <guisubmenu>Length</guisubmenu> <guimenuitem>Tall</guimenuitem> @@ -244,7 +245,7 @@ <term> <menuchoice> <shortcut> -&Ctrl;<keycap>F</keycap> +<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo> </shortcut> <guisubmenu>Length</guisubmenu> <guimenuitem>Full Screen Width</guimenuitem> @@ -260,70 +261,52 @@ <varlistentry> <term> <menuchoice> +<shortcut> +<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> +</shortcut> <guimenuitem>Choose Color...</guimenuitem> </menuchoice> </term> <listitem> -<para>Opens a normal &kde; color picker dialog, where you can choose the +<para>Displays the standard &kde; color picker dialog, where you can choose the background color for &kruler;.</para> </listitem> </varlistentry> + <varlistentry> <term> <menuchoice> -<guisubmenu>Help</guisubmenu> +<shortcut> +<keycombo action="simul"><keycap>F</keycap></keycombo> +</shortcut> +<guimenuitem>Choose Font...</guimenuitem> </menuchoice> </term> <listitem> -<variablelist> -<varlistentry> -<term> -<menuchoice> -<guisubmenu>Help</guisubmenu> -<guimenuitem>KRuler Handbook</guimenuitem> -</menuchoice> -</term> -<listitem><para>This invokes the &kde; help system starting at the &kruler; help -pages (this document).</para> </listitem> +<para>Displays the standard &kde; font dialog, where you can choose the +font for &kruler;.</para> +</listitem> </varlistentry> + <varlistentry> <term> <menuchoice> <guisubmenu>Help</guisubmenu> -<guimenuitem>What's This?</guimenuitem> -</menuchoice></term> -<listitem><para><action>This changes the mouse cursor to a combination arrow and -question mark.</action> Clicking on items within &kruler; with this arrow will -open a help window (if one exists for the particular item) explaining the item's -function.</para></listitem> -</varlistentry> -<varlistentry> -<term> -<menuchoice> -<guisubmenu>Help</guisubmenu> -<guimenuitem>About KRuler</guimenuitem> </menuchoice> -</term> +</term> <listitem> -<para><action>This will displays version and author information.</action></para> +&help.menu.documentation; </listitem> </varlistentry> -<varlistentry> -<term> -<menuchoice> -<guimenu>Help</guimenu> -<guimenuitem>About KDE</guimenuitem> -</menuchoice> -</term> -<listitem><para><action>This displays the &kde; version and other basic -information.</action></para></listitem> -</varlistentry> </variablelist> -</listitem> -</varlistentry> + +<variablelist> <varlistentry> <term> <menuchoice> +<shortcut> +<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> +</shortcut> <guimenuitem>Quit</guimenuitem> </menuchoice> </term>
SVN commit 479893 by jhall: apply this patch to fix the menu description. BUG:116021 M +54 -33 index.docbook --- trunk/KDE/kdegraphics/doc/kcoloredit/index.docbook #479892:479893 @@ -109,13 +109,13 @@ </para> </listitem> <listitem> -<para>If the <guilabel>After cursor</guilabel> check-box near to the -<guilabel>Add a Color</guilabel> button is checked, a color from the -color chooser is put after the cursor. The color is either inserted +<para>If the <guilabel>At cursor</guilabel> check-box near the +<guilabel>Add Color</guilabel> button is checked, a color from the +color chooser is put at the cursor. The color is either inserted or it overwrites another one, depending on whether the <guilabel>Overwrite</guilabel> mode is chosen. The mode can be chosen by checking the <guilabel>Overwrite</guilabel> check-box, that is next -to the <guilabel>After Cursor</guilabel> one.</para> +to the <guilabel>At Cursor</guilabel> one.</para> </listitem> </itemizedlist> @@ -198,24 +198,23 @@ <variablelist> <varlistentry> <term><menuchoice> +<shortcut><keycombo action="simul">&Ctrl; +<keycap>N</keycap></keycombo></shortcut> <guimenu>File</guimenu> -<guimenuitem>New Window</guimenuitem> +<guimenuitem>New</guimenuitem> </menuchoice></term> <listitem> -<para><action>Open a new window</action></para> +<para><action>Start a new palette in the current window.</action></para> </listitem> </varlistentry> <varlistentry> <term><menuchoice> -<shortcut><keycombo action="simul">&Ctrl; -<keycap>N</keycap></keycombo></shortcut> <guimenu>File</guimenu> -<guimenuitem>New</guimenuitem> +<guimenuitem>New Window</guimenuitem> </menuchoice></term> <listitem> -<para><action>Start a new palette in the current -window.</action></para> +<para><action>Open a new window</action></para> </listitem> </varlistentry> @@ -245,36 +244,35 @@ <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl; -<keycap>W</keycap></keycombo></shortcut> +<keycap>S</keycap></keycombo></shortcut> <guimenu>File</guimenu> -<guimenuitem>Close</guimenuitem> +<guimenuitem>Save</guimenuitem> </menuchoice></term> <listitem> -<para><action>Close</action> the current &kcoloredit; -window.</para> +<para><action>Save the currently open palette.</action></para> </listitem> </varlistentry> <varlistentry> <term><menuchoice> -<shortcut><keycombo action="simul">&Ctrl; -<keycap>S</keycap></keycombo></shortcut> <guimenu>File</guimenu> -<guimenuitem>Save</guimenuitem> +<guimenuitem>Save As...</guimenuitem> </menuchoice></term> <listitem> -<para><action>Save the currently open palette.</action></para> +<para><action>Save the currently open palette with a new +name.</action></para> </listitem> </varlistentry> <varlistentry> <term><menuchoice> +<shortcut><keycombo action="simul">&Ctrl; +<keycap>W</keycap></keycombo></shortcut> <guimenu>File</guimenu> -<guimenuitem>Save As...</guimenuitem> +<guimenuitem>Close</guimenuitem> </menuchoice></term> <listitem> -<para><action>Save the currently open palette with a new -name.</action></para> +<para><action>Close</action> the current &kcoloredit; window</para> </listitem> </varlistentry> @@ -367,40 +365,63 @@ </sect1> -<sect1 id="view-menu"> -<title>The <guimenu>View</guimenu> Menu</title> +<sect1 id="settings-menu"> +<title>The <guimenu>Settings</guimenu> Menu</title> <variablelist> <varlistentry> <term><menuchoice> -<guimenu>Color</guimenu> -<guimenuitem>Color Names</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Hide/Show Toolbar</guimenuitem> </menuchoice></term> <listitem> -<para>If the currently open palette has color names, <action>display +<para><action>Toggle on and off the toolbar icons.</action></para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<guimenu>Settings</guimenu> +<guimenuitem>Hide/Show Statusbar</guimenuitem> +</menuchoice></term> +<listitem> +<para><action>Toggle on and off the status bar.</action></para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<guimenu>Settings</guimenu> +<guimenuitem>Hide/Show Color Names</guimenuitem> +</menuchoice></term> +<listitem> +<para>If the currently open palette has color name, <action>display them alongside the colors</action>.</para> </listitem> </varlistentry> <varlistentry> <term><menuchoice> -<guimenu>View</guimenu> -<guimenuitem>Toolbar</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> <listitem> -<para><action>Toggle on and off the toolbar icons.</action></para> +<para><action>Configure</action> the keyboard keys you use to access the +different actions.</para> </listitem> </varlistentry> <varlistentry> <term><menuchoice> -<guimenu>View</guimenu> -<guimenuitem>Statusbar</guimenuitem> +<guimenu>Settings</guimenu> +<guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term> <listitem> -<para><action>Toggle on and off the status bar.</action></para> +<para><action>Configure</action> the items you want to put in the toolbar +</para> </listitem> </varlistentry> + </variablelist> </sect1>