Git commit 56007d8fddc7ad977b095a4873c8aa1f7f2fb092 by T.C. Hollingsworth. Committed on 29/11/2013 at 05:23. Pushed by hollingsworth into branch 'master'.
remove all references to power mode this no longer exists in KWrite M +0 -3 doc/kate/configuring-part.docbook M +0 -2 doc/kate/index.docbook M +4 -4 doc/kate/part.docbook M +0 -9 doc/kwrite/index.docbook M +39 -45 doc/kwrite/menus.docbook http://commits.kde.org/kate/56007d8fddc7ad977b095a4873c8aa1f7f2fb092 diff --git a/doc/kate/configuring-part.docbook b/doc/kate/configuring-part.docbook index 61603c0..b00abff 100644 --- a/doc/kate/configuring-part.docbook +++ b/doc/kate/configuring-part.docbook @@ -66,9 +66,6 @@ whitespace at the end of lines.</para></listitem> </guilabel></term> <listitem><para> <variablelist> -<!--FIXME missing -Enable power user mode (KDE 3 mode) - --> <varlistentry> <term><guilabel>Show indentation lines </guilabel></term> diff --git a/doc/kate/index.docbook b/doc/kate/index.docbook index 7a97152..d97e4c6 100644 --- a/doc/kate/index.docbook +++ b/doc/kate/index.docbook @@ -3,8 +3,6 @@ "dtd/kdex.dtd" [ <!ENTITY kappname "&kate;"> <!ENTITY package "kdesdk"> - <!ENTITY copy-this-msg " "> - <!ENTITY i18n-powermode "©-this-msg;"> <!ENTITY imgpath "./"> <!ENTITY rcfile "katerc"> <!ENTITY gdb "<acronym>GDB</acronym>"> diff --git a/doc/kate/part.docbook b/doc/kate/part.docbook index 36e14e0..283b7a8 100644 --- a/doc/kate/part.docbook +++ b/doc/kate/part.docbook @@ -64,7 +64,7 @@ Numbers</guimenuitem></menuchoice> menu item.</para> </varlistentry> <varlistentry> -<term>The Folding Pane &i18n-powermode;</term> +<term>The Folding Pane</term> <listitem> <para>The folding pane allows you to collapse or expand foldable blocks of lines. The calculation of the foldable regions is done according to @@ -184,7 +184,7 @@ action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo>), or click with the &LMB; in the editor.</para> <sect2 id="kate-part-selection-block"> -<title>Using Block Selection &i18n-powermode;</title> +<title>Using Block Selection</title> <para>When Block Selection is enabled, you can make <quote>vertical selections</quote> in the text, meaning selecting limited columns from @@ -449,7 +449,7 @@ on those.</para> </sect1> <sect1 id="kate-part-bookmarks"> -<title>Using Bookmarks &i18n-powermode;</title> +<title>Using Bookmarks</title> <para>The bookmarks feature allows you to mark certain lines, to be able to easily find them again.</para> @@ -520,7 +520,7 @@ the feature on a per document level. This will be fixed in a future version of & </sect1> <sect1 id="kate-part-autoindent"> -<title>Using automatic indenting &i18n-powermode;</title> +<title>Using automatic indenting</title> <para>&kappname;s editor component supports a variety of autoindenting modes, designed for different text formats. You can pick from the available modes using diff --git a/doc/kwrite/index.docbook b/doc/kwrite/index.docbook index d2942cf..2b00d6f 100644 --- a/doc/kwrite/index.docbook +++ b/doc/kwrite/index.docbook @@ -3,7 +3,6 @@ "dtd/kdex.dtd" [ <!ENTITY kappname "&kwrite;"> <!ENTITY package "kdebase"> - <!ENTITY i18n-powermode "(power user mode)"> <!ENTITY imgpath "../kate/"> <!ENTITY rcfile "kwriterc"> <!ENTITY fundamentals-chapter SYSTEM "fundamentals.docbook"> @@ -86,14 +85,6 @@ Bash, Modula 2, &HTML;, and Ada. <para>&kwrite; has a single document interface (<acronym>SDI</acronym>) allowing you to edit one file at the time per window. </para> -<para> -&kwrite; features two different modes, a simple mode with a straightforward interface -and an advanced mode with more features and more extensive menu items. -The advanced mode is enabled by checking the option <link linkend="appearance"> -Enable power user mode (&kde; 3 mode)</link> -on the <guilabel>Appearance</guilabel> page in &kappname;s -settings. -</para> </chapter> &fundamentals-chapter; diff --git a/doc/kwrite/menus.docbook b/doc/kwrite/menus.docbook index 4a5ea51..bbd41d5 100644 --- a/doc/kwrite/menus.docbook +++ b/doc/kwrite/menus.docbook @@ -1,10 +1,6 @@ <chapter id="the-menu-entries"> <title>The Menu Entries</title> -<para>There are different menus and menu items in simple and advanced mode. -The advanced mode is enabled by checking the option <link linkend="appearance"> -Enable power user mode (&kde; 3 mode)</link> -on the <guilabel>Appearance</guilabel> page in &kappname;s settings.</para> <!-- This is also valid for kates menu file, kate has additional Save All Ctrl+L, Reload All, Close Other, Close All--> <sect1 id="file"> <title>The File Menu</title> @@ -300,13 +296,13 @@ copying the entire file to another application.</para> <para>Deselects the selected text in the editor if any.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term><anchor id="block-selection-mode"/><menuchoice> <shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>B</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu><guimenuitem>Block -Selection Mode</guimenuitem></menuchoice> (Power user mode)</term> +Selection Mode</guimenuitem></menuchoice></term> <listitem> <para>Toggles Selection Mode. When the Selection Mode is <guilabel>BLOCK</guilabel>, you can make vertical selections, ⪚ select column 5 to 10 in lines 9 to 15. @@ -314,13 +310,13 @@ The status bar shows the current state of the Selection Mode, either <guilabel>B <guilabel>LINE</guilabel>.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term><anchor id="vi-input-mode"/><menuchoice> <shortcut> <keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu><guimenuitem>VI input -Mode</guimenuitem></menuchoice> (Power user mode)</term> +Mode</guimenuitem></menuchoice></term> <listitem> <para>Switch to a vi-like, modal editing mode. This mode supports the most used commands and motions from vim's normal and visual mode and has an optional vi mode statusbar. @@ -508,13 +504,13 @@ document in one window are reflected in the other window and vice versa.</para> <varlistentry> <term> -<anchor id="view-command-line"/><!-- only in power user mode --> +<anchor id="view-command-line"/> <menuchoice> <shortcut><keycombo action="simul"><keycap>F7</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Switch to Command Line</guimenuitem> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>Displays the Katepart command line at the bottom of the window. @@ -525,23 +521,23 @@ Component Command Line</ulink>.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term><menuchoice> <guimenu>View</guimenu><guimenuitem>Show the Javascript Console</guimenuitem> -</menuchoice> (Power user mode)</term> +</menuchoice></term> <listitem><para>This opens a tool view that allows you to run Javascript code interactively. For more information, see <ulink url="help:/kate/dev-scripting.html">Extending &kate; with Scripts</ulink> </para></listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-schema"/> <menuchoice> <guimenu>View</guimenu> <guisubmenu>Schema</guisubmenu> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>Select a font schema.</para> @@ -563,13 +559,13 @@ border on the screen.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-dynamic-word-wrap-indicators"/> <menuchoice> <guimenu>View</guimenu> <guisubmenu>Dynamic Word Wrap Indicators</guisubmenu> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>Choose when and how the dynamic word wrap indicators should be @@ -578,13 +574,13 @@ Wrap</guilabel> option is checked.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-show-static-word-wrap"/> <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Static Word Wrap Marker</guimenuitem> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>If this option is checked, a vertical line will be drawn at the @@ -596,14 +592,14 @@ use a fixed pitch font.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-show-icon-border"/> <menuchoice> <shortcut><keycombo action="simul"><keycap>F6</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Icon Border</guimenuitem> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>This is a toggle item. Setting it on checked will make the Icon Border @@ -628,13 +624,13 @@ editor, and vice versa.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-scrollbar-marks"/> <menuchoice> <guimenu>View</guimenu> <guisubmenu>Show Scrollbar Marks</guisubmenu> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>If this option is checked, the view will show marks on the vertical @@ -643,22 +639,22 @@ linkend="view-show-icon-border">Icon Border</link>.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term><menuchoice><guimenu>View</guimenu><guimenuitem>Show Scrollbar -Minimap</guimenuitem></menuchoice> (Power user mode)</term> +Minimap</guimenuitem></menuchoice></term> <listitem><para>This will replace the scrollbar with a visualization of the current document. For more information on the scrollbar minimap, see <xref linkend="kate-part-scrollbar-minimap"/></para></listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-hide-folding-markers"/> <menuchoice> <shortcut><keycombo action="simul"><keycap>F9</keycap></keycombo></shortcut> <guimenu>View</guimenu> <guimenuitem>Show Folding Markers</guimenuitem> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <para>If this option is checked, the marks for code folding will be @@ -666,13 +662,13 @@ shown.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power user mode --> +<varlistentry> <term> <anchor id="view-code-folding"/> <menuchoice> <guimenu>View</guimenu> <guisubmenu>Code Folding</guisubmenu> -</menuchoice> (Power user mode) +</menuchoice> </term> <listitem> <variablelist> @@ -730,9 +726,7 @@ varlistentry> </sect1> <sect1 id="go"><!-- This is also valid for kates menu bookmarks--> <title>The Bookmarks Menu</title> -<para>This menu is only displayed, if you check the option <link linkend="appearance"> -Enable Power User Mode (&kde; 3 mode)</link> -on the <guilabel>Appearance</guilabel> page in &kappname;s settings.</para> + <variablelist> <varlistentry> @@ -814,10 +808,10 @@ addition and any changes in the document formatting.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><anchor id="tools-filetype"/><menuchoice> <guimenu>Tools</guimenu> -<guisubmenu>Mode</guisubmenu></menuchoice> (Power user mode)</term> +<guisubmenu>Mode</guisubmenu></menuchoice></term> <listitem> <para>Choose the filetype scheme you prefer for the active document. This overwrites the global filetype mode set in <menuchoice> @@ -828,10 +822,10 @@ document only.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><anchor id="tools-highlighting"/><menuchoice> <guimenu>Tools</guimenu> -<guisubmenu>Highlighting</guisubmenu></menuchoice> (Power user mode)</term> +<guisubmenu>Highlighting</guisubmenu></menuchoice></term> <listitem> <para>Choose the Highlighting scheme you prefer for the active document. This overwrites the global highlighting mode set in <menuchoice> @@ -841,10 +835,10 @@ Editor...</guimenuitem></menuchoice> for your current document only.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><anchor id="tools-indentation"/><menuchoice> <guimenu>Tools</guimenu> -<guisubmenu>Indentation</guisubmenu></menuchoice> (Power user mode)</term> +<guisubmenu>Indentation</guisubmenu></menuchoice></term> <listitem> <para>Choose the style of indentation you want for your active document. This overwrites the global indentation mode set in <menuchoice> @@ -868,10 +862,10 @@ set here will be only valid for your current document.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><anchor id="tools-end-of-line"/><menuchoice> <guimenu>Tools</guimenu> -<guisubmenu>End of Line</guisubmenu></menuchoice> (Power user mode)</term> +<guisubmenu>End of Line</guisubmenu></menuchoice></term> <listitem> <para>Choose your preferred end of line mode for your active document. This overwrites the global end of line mode set in <menuchoice> @@ -915,7 +909,7 @@ own scripts</ulink>. This way, &kwrite; can be extended with user-defined tools. </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Invoke Code Completion</guimenuitem> -</menuchoice> (Power user mode)</term> +</menuchoice></term> <listitem> <para>Manually invoke command completion, usually by using a shortcut bound to this action.</para> </listitem> @@ -925,7 +919,7 @@ own scripts</ulink>. This way, &kwrite; can be extended with user-defined tools. <term><menuchoice> <guimenu>Tools</guimenu> <guimenuitem>Word Completion</guimenuitem> -</menuchoice> (Power user mode)</term> +</menuchoice></term> <listitem> <para><guimenuitem>Reuse Word Below</guimenuitem> (<keycombo action="simul">&Ctrl; <keycap>9</keycap></keycombo>) and <guimenuitem>Reuse Word Above</guimenuitem> @@ -1140,28 +1134,28 @@ indentation mode and indentation settings in the document.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><menuchoice> <shortcut> <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Comment</guimenuitem> -</menuchoice> (Power user mode)</term> +</menuchoice></term> <listitem><para>This adds one space to the beginning of the line where the text cursor is located or to the beginning of any selected lines.</para> </listitem> </varlistentry> -<varlistentry><!-- only in power mode--> +<varlistentry> <term><menuchoice> <shortcut> <keycombo action="simul">&Ctrl;&Shift;<keycap>D</keycap></keycombo> </shortcut> <guimenu>Tools</guimenu> <guimenuitem>Uncomment</guimenuitem> -</menuchoice> (Power user mode)</term> +</menuchoice></term> <listitem><para>This removes one space (if any exist) from the beginning of the line where the text cursor is located or from the beginning of any selected lines.</para></listitem>