Regularize tool names

Summary:
Currently, some of the items in the {nav Tools} menu have "tool" in the name, and some
do not. This is in any event redundant since they're in a menu with that word in it
already. In the toolbar, these actions become more inconsistent since their names change
and can even differ between what's shown in the pop-up menu and what's shown on the
button text.

This patch regularizes the names, stops changing the names for the toolbar versions, and
updates the docbook accordingly.

Test Plan:
{F6874459, size=full}

{F6874458, size=full}

Reviewers: #okular, #vdg, filipf

Reviewed By: #vdg, filipf

Subscribers: filipf, okular-devel, kde-doc-english

Tags: #okular, #documentation

Differential Revision: https://phabricator.kde.org/D21621

doc/index.docbook

@@ -125,9 +125,9 @@ Context menu actions like Rename Bookmarks etc.)
 			</para>
 			<para>
 				Another way is to hold the &LMB; down at any place on the document while dragging the mouse in the
-				opposite direction of where you want to move. This procedure only works if the Browse Tool is
+				opposite direction of where you want to move. This procedure only works if the Browse tool is
 				enabled, which you can select by choosing <menuchoice><guimenu>Tools</guimenu>
-				<guimenuitem>Browse Tool</guimenuitem></menuchoice>.
+				<guimenuitem>Browse</guimenuitem></menuchoice>.
 			</para>
 			<note>
 			  <para>
@@ -357,8 +357,8 @@ Context menu actions like Rename Bookmarks etc.)
 		<itemizedlist>
 			<listitem><para>The source file has been compiled successfully.</para></listitem>
 			<listitem><para>&okular; knows which editor you would like to use.</para></listitem>
-			<listitem><para>The Browse Tool has to be enabled, which you can select by choosing 
-				<menuchoice><guimenu>Tools</guimenu><guimenuitem>Browse Tool
+			<listitem><para>The Browse tool has to be enabled, which you can select by choosing
+				<menuchoice><guimenu>Tools</guimenu><guimenuitem>Browse
 				</guimenuitem></menuchoice>.</para></listitem>
 		</itemizedlist>
 
@@ -814,7 +814,7 @@ Context menu actions like Rename Bookmarks etc.)
 				</note>
 				<note>
 					<para>
-						Activating the annotating toolbar will make you switch to the Browse Tool Mode.
+						Activating the annotating toolbar will make you switch to the Browse Mode.
 					</para>
 				</note>
 				<para>
@@ -1723,7 +1723,7 @@ Context menu actions like Rename Bookmarks etc.)
 						<menuchoice>
 							<shortcut><keycombo action="simul">&Ctrl;<keycap>1</keycap></keycombo></shortcut>
 							<guimenu>Tools</guimenu>
-							<guimenuitem>Browse Tool</guimenuitem>
+							<guimenuitem>Browse</guimenuitem>
 						</menuchoice>
 					</term>
 					<listitem>
@@ -1735,7 +1735,7 @@ Context menu actions like Rename Bookmarks etc.)
 						<menuchoice>
 							<shortcut><keycombo action="simul">&Ctrl;<keycap>2</keycap></keycombo></shortcut>
 							<guimenu>Tools</guimenu>
-							<guimenuitem>Zoom Tool</guimenuitem>
+							<guimenuitem>Zoom</guimenuitem>
 						</menuchoice>
 					</term>
 					<listitem>
@@ -1747,11 +1747,11 @@ Context menu actions like Rename Bookmarks etc.)
 						<menuchoice>
 							<shortcut><keycombo action="simul">&Ctrl;<keycap>3</keycap></keycombo></shortcut>
 							<guimenu>Tools</guimenu>
-							<guimenuitem>Selection Tool</guimenuitem>
+							<guimenuitem>Area Selection</guimenuitem>
 						</menuchoice>
 					</term>
 					<listitem>
-						<para>The mouse will work as a select tool. In that mode clicking &LMB; and dragging will give the option of copying the text/image of current selected area to the clipboard, speak a text or to save an image to a file.</para>
+						<para>The mouse will work as a rectangular region selection tool. In that mode clicking &LMB; and dragging will draw a selection box and provide the option of copying the selected content to the clipboard, speaking the selected text, or transforming the selection region into an image and saving it to a file.</para>
 					</listitem>
 				</varlistentry>
 				<varlistentry>
@@ -1759,7 +1759,7 @@ Context menu actions like Rename Bookmarks etc.)
 						<menuchoice>
 							<shortcut><keycombo action="simul">&Ctrl;<keycap>4</keycap></keycombo></shortcut>
 							<guimenu>Tools</guimenu>
-							<guimenuitem>Text Selection Tool</guimenuitem>
+							<guimenuitem>Text Selection</guimenuitem>
 						</menuchoice>
 					</term>
 					<listitem>
@@ -1773,7 +1773,7 @@ Context menu actions like Rename Bookmarks etc.)
 						<menuchoice>
 							<shortcut><keycombo action="simul">&Ctrl;<keycap>5</keycap></keycombo></shortcut>
 							<guimenu>Tools</guimenu>
-							<guimenuitem>Table Selection Tool</guimenuitem>
+							<guimenuitem>Table Selection</guimenuitem>
 						</menuchoice>
 					</term>
 					<listitem>

ui/pageview.cpp

@@ -591,19 +591,17 @@ do { \
     // Mouse mode actions for viewer mode
     d->mouseModeActionGroup = new QActionGroup( this );
     d->mouseModeActionGroup->setExclusive( true );
-    d->aMouseNormal  = new QAction( QIcon::fromTheme( QStringLiteral("input-mouse") ), i18n( "&Browse Tool" ), this );
+    d->aMouseNormal  = new QAction( QIcon::fromTheme( QStringLiteral("input-mouse") ), i18n( "&Browse" ), this );
     ac->addAction(QStringLiteral("mouse_drag"), d->aMouseNormal );
     connect( d->aMouseNormal, &QAction::triggered, this, &PageView::slotSetMouseNormal );
-    d->aMouseNormal->setIconText( i18nc( "Browse Tool", "Browse" ) );
     d->aMouseNormal->setCheckable( true );
     ac->setDefaultShortcut(d->aMouseNormal, QKeySequence(Qt::CTRL + Qt::Key_1));
     d->aMouseNormal->setActionGroup( d->mouseModeActionGroup );
     d->aMouseNormal->setChecked( Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::Browse );
 
-    QAction * mz  = new QAction(QIcon::fromTheme( QStringLiteral("page-zoom") ), i18n("&Zoom Tool"), this);
+    QAction * mz  = new QAction(QIcon::fromTheme( QStringLiteral("page-zoom") ), i18n("&Zoom"), this);
     ac->addAction(QStringLiteral("mouse_zoom"), mz );
     connect( mz, &QAction::triggered, this, &PageView::slotSetMouseZoom );
-    mz->setIconText( i18nc( "Zoom Tool", "Zoom" ) );
     mz->setCheckable( true );
     ac->setDefaultShortcut(mz, QKeySequence(Qt::CTRL + Qt::Key_2));
     mz->setActionGroup( d->mouseModeActionGroup );
@@ -623,29 +621,26 @@ void PageView::setupActions( KActionCollection * ac )
     ac->setDefaultShortcuts(d->aZoomOut, KStandardShortcut::zoomOut());
 
     // Mouse-Mode actions
-    d->aMouseSelect  = new QAction(QIcon::fromTheme( QStringLiteral("select-rectangular") ), i18n("&Selection Tool"), this);
+    d->aMouseSelect  = new QAction(QIcon::fromTheme( QStringLiteral("select-rectangular") ), i18n("Area &Selection"), this);
     ac->addAction(QStringLiteral("mouse_select"), d->aMouseSelect );
     connect( d->aMouseSelect, &QAction::triggered, this, &PageView::slotSetMouseSelect );
-    d->aMouseSelect->setIconText( i18nc( "Select Tool", "Selection" ) );
     d->aMouseSelect->setCheckable( true );
     ac->setDefaultShortcut(d->aMouseSelect, Qt::CTRL + Qt::Key_3);
 
     d->aMouseSelect->setActionGroup( d->mouseModeActionGroup );
     d->aMouseSelect->setChecked( Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::RectSelect );
 
-    d->aMouseTextSelect  = new QAction(QIcon::fromTheme( QStringLiteral("draw-text") ), i18n("&Text Selection Tool"), this);
+    d->aMouseTextSelect  = new QAction(QIcon::fromTheme( QStringLiteral("draw-text") ), i18n("&Text Selection"), this);
     ac->addAction(QStringLiteral("mouse_textselect"), d->aMouseTextSelect );
     connect( d->aMouseTextSelect, &QAction::triggered, this, &PageView::slotSetMouseTextSelect );
-    d->aMouseTextSelect->setIconText( i18nc( "Text Selection Tool", "Text Selection" ) );
     d->aMouseTextSelect->setCheckable( true );
     ac->setDefaultShortcut(d->aMouseTextSelect, Qt::CTRL + Qt::Key_4);
     d->aMouseTextSelect->setActionGroup( d->mouseModeActionGroup );
     d->aMouseTextSelect->setChecked( Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::TextSelect );
 
-    d->aMouseTableSelect  = new QAction(QIcon::fromTheme( QStringLiteral("table") ), i18n("T&able Selection Tool"), this);
+    d->aMouseTableSelect  = new QAction(QIcon::fromTheme( QStringLiteral("table") ), i18n("T&able Selection"), this);
     ac->addAction(QStringLiteral("mouse_tableselect"), d->aMouseTableSelect );
     connect( d->aMouseTableSelect, &QAction::triggered, this, &PageView::slotSetMouseTableSelect );
-    d->aMouseTableSelect->setIconText( i18nc( "Table Selection Tool", "Table Selection" ) );
     d->aMouseTableSelect->setCheckable( true );
     ac->setDefaultShortcut(d->aMouseTableSelect, Qt::CTRL + Qt::Key_5);
     d->aMouseTableSelect->setActionGroup( d->mouseModeActionGroup );
@@ -654,7 +649,6 @@ void PageView::setupActions( KActionCollection * ac )
     d->aMouseMagnifier = new QAction(QIcon::fromTheme( QStringLiteral("document-preview") ), i18n("&Magnifier"), this);
     ac->addAction(QStringLiteral("mouse_magnifier"), d->aMouseMagnifier );
     connect( d->aMouseMagnifier, &QAction::triggered, this, &PageView::slotSetMouseMagnifier );
-    d->aMouseMagnifier->setIconText( i18nc( "Magnifier Tool", "Magnifier" ) );
     d->aMouseMagnifier->setCheckable( true );
     ac->setDefaultShortcut(d->aMouseMagnifier, Qt::CTRL + Qt::Key_6);
     d->aMouseMagnifier->setActionGroup( d->mouseModeActionGroup );