wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change labels of selection and annotation tools to be imperative

Browse Source 
This makes them conform to the HIG and also looks cleaner.
remotes/origin/work/aacid/440173
Bharadwaj Raju 4 years ago committed by Nate Graham
parent 2fc710d10a
commit ce6582c761
4 changed files with 39 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      doc/index.docbook
  2. 28
      part/annotationactionhandler.cpp
  3. 8
      part/data/toolsQuick.xml
  4. 8
      part/pageview.cpp

34
doc/index.docbook
Unescape View File

@ -514,9 +514,9 @@ Context menu actions like Rename Bookmarks etc.)
</mediaobject> </mediaobject>
</screenshot> </screenshot>
<para>&okular; has two different kind of annotations:</para> <para>&okular; has two different kind of annotations:</para>
<para>Text annotations like <guilabel>Yellow Highlighter</guilabel> and <guilabel>Black Underlining</guilabel> <para>Text annotations like <guilabel>Highlight in Yellow</guilabel> and <guilabel>Underline</guilabel>
for files with text like &eg; &PDF;.</para> for files with text like &eg; &PDF;.</para>
<para>Graphic annotations like <guilabel>Pop-up Note</guilabel>, <guilabel>Inline Note</guilabel>, <guilabel>Freehand Line</guilabel>, <guilabel>Highlighter</guilabel>, <guilabel>Straight Line</guilabel>, <guilabel>Polygon</guilabel>, <guilabel>Stamp</guilabel>, <guilabel>Underline</guilabel>, <guilabel>Ellipse</guilabel>, and <guilabel>Typewriter</guilabel> for all formats supported by &okular;.</para> <para>Graphic annotations like <guilabel>Pop-up Note</guilabel>, <guilabel>Inline Note</guilabel>, <guilabel>Freehand Line</guilabel>, <guilabel>Highlight</guilabel>, <guilabel>Straight Line</guilabel>, <guilabel>Polygon</guilabel>, <guilabel>Stamp</guilabel>, <guilabel>Underline</guilabel>, <guilabel>Ellipse</guilabel>, and <guilabel>Insert Text</guilabel> for all formats supported by &okular;.</para>
<para>Using the context menu either in the <guilabel>Annotations</guilabel> view of the sidebar or in the main window you can open a <guilabel>Pop up Note</guilabel> for any kind of annotation and add or edit comments.</para> <para>Using the context menu either in the <guilabel>Annotations</guilabel> view of the sidebar or in the main window you can open a <guilabel>Pop up Note</guilabel> for any kind of annotation and add or edit comments.</para>
<para>Annotations are not only limited to &PDF; files, they can be used for any format &okular; supports.</para> <para>Annotations are not only limited to &PDF; files, they can be used for any format &okular; supports.</para>
<para> <para>
@ -579,7 +579,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Highlighter Highlight
</para> </para>
</entry> </entry>
<entry> <entry>
@ -687,18 +687,18 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Typewriter Insert Text
</para> </para>
</entry> </entry>
<entry> <entry>
<para> <para>
Typewriter features opaque letters on transparent background, so that it is useful to fill noninteractive forms. Insert Text features opaque letters on transparent background, which is useful to fill noninteractive forms.
</para> </para>
<para> <para>
Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the note, then drag to place the bottom-right one. Enter the text of the note then click on the <guibutton>OK</guibutton> to save the note, <guibutton>Cancel</guibutton> to cancel note entering or <guibutton>Clear</guibutton> to clear the note. Click on the tool button, then click with the &LMB; and hold to place the top-left corner of the note, then drag to place the bottom-right one. Enter the text of the note then click on the <guibutton>OK</guibutton> to save the note, <guibutton>Cancel</guibutton> to cancel note entering or <guibutton>Clear</guibutton> to clear the note.
</para> </para>
<para> <para>
It is possible to define the <guilabel>Font</guilabel> and <guilabel>Text color</guilabel> for the text. Just right-click on the typewriter text created and select the <guimenuitem>Properties</guimenuitem> menu item. It is possible to define the <guilabel>Font</guilabel> and <guilabel>Text color</guilabel> for the text. Just right-click on the text inserted and select the <guimenuitem>Properties</guimenuitem> menu item.
</para> </para>
</entry> </entry>
</row> </row>
@ -714,7 +714,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Inline Note Insert Inline Note
</para> </para>
</entry> </entry>
<entry> <entry>
@ -741,7 +741,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Pop-up Note Insert Pop-up Note
</para> </para>
</entry> </entry>
<entry> <entry>
@ -768,7 +768,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Freehand Line Draw Freehand Line
</para> </para>
</entry> </entry>
<entry> <entry>
@ -795,7 +795,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Arrow (drop-down list) Draw Arrow (drop-down list)
</para> </para>
</entry> </entry>
<entry> <entry>
@ -822,7 +822,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Straight line (drop-down list) Draw Straight line (drop-down list)
</para> </para>
</entry> </entry>
<entry> <entry>
@ -849,7 +849,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Rectangle (drop-down list) Draw Rectangle (drop-down list)
</para> </para>
</entry> </entry>
<entry> <entry>
@ -876,7 +876,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Ellipse (drop-down list) Draw Ellipse (drop-down list)
</para> </para>
</entry> </entry>
<entry> <entry>
@ -903,7 +903,7 @@ Context menu actions like Rename Bookmarks etc.)
</entry> </entry>
<entry> <entry>
<para> <para>
Polygon (drop-down list) Draw Polygon (drop-down list)
</para> </para>
</entry> </entry>
<entry> <entry>
@ -1257,7 +1257,7 @@ Context menu actions like Rename Bookmarks etc.)
else on the annotation to move it. else on the annotation to move it.
Pressing &Esc; or clicking an area outside the annotation cancels a selection. Pressing &Esc; or clicking an area outside the annotation cancels a selection.
</para> </para>
<para>Resizing is only applicable for annotation types Inline Note, Typewriter, Stamp and Ellipse.</para> <para>Resizing is only applicable for annotation types Inline Note, Insert Text, Stamp and Ellipse.</para>
<note> <note>
<para> <para>
@ -1682,7 +1682,7 @@ Context menu actions like Rename Bookmarks etc.)
</term> </term>
<listitem> <listitem>
<para><action>Copy</action> the currently selected text in <para><action>Copy</action> the currently selected text in
<guibutton>Text Selection</guibutton> mode to the clipboard.</para> <guibutton>Select Text</guibutton> mode to the clipboard.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -1698,7 +1698,7 @@ Context menu actions like Rename Bookmarks etc.)
</term> </term>
<listitem> <listitem>
<para><action>Selects</action> all the text (if the document provides it). This works only in <para><action>Selects</action> all the text (if the document provides it). This works only in
<guibutton>Text Selection</guibutton> mode.</para> <guibutton>Select Text</guibutton> mode.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

28
part/annotationactionhandler.cpp
Unescape View File

@ -545,26 +545,26 @@ AnnotationActionHandler::AnnotationActionHandler(PageViewAnnotator *parent, KAct
d->annotator = parent; d->annotator = parent;
// toolbar visibility actions // toolbar visibility actions
d->aToolBarVisibility = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18n("&Annotations"), this); d->aToolBarVisibility = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18nc("verb", "&Annotate"), this);
d->aHideToolBar = new QAction(QIcon::fromTheme(QStringLiteral("dialog-close")), i18nc("@action:intoolbar Hide the toolbar", "Hide"), this); d->aHideToolBar = new QAction(QIcon::fromTheme(QStringLiteral("dialog-close")), i18nc("@action:intoolbar Hide the toolbar", "Hide"), this);
d->aShowToolBar = new QAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18nc("@action:intoolbar Show the builtin annotation toolbar", "Show more annotation tools"), this); d->aShowToolBar = new QAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18nc("@action:intoolbar Show the builtin annotation toolbar", "Show more annotation tools"), this);
// Text markup actions // Text markup actions
KToggleAction *aHighlighter = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-highlight")), i18nc("@action:intoolbar Annotation tool", "Highlighter"), this); KToggleAction *aHighlighter = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-highlight")), i18nc("@action:intoolbar Annotation tool, verb", "Highlight"), this);
KToggleAction *aUnderline = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-underline")), i18nc("@action:intoolbar Annotation tool", "Underline"), this); KToggleAction *aUnderline = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-underline")), i18nc("@action:intoolbar Annotation tool, verb", "Underline"), this);
KToggleAction *aSquiggle = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-underline-squiggle")), i18nc("@action:intoolbar Annotation tool", "Squiggle"), this); KToggleAction *aSquiggle = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-underline-squiggle")), i18nc("@action:intoolbar Annotation tool, verb", "Squiggle"), this);
KToggleAction *aStrikeout = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-strikethrough")), i18nc("@action:intoolbar Annotation tool", "Strike Out"), this); KToggleAction *aStrikeout = new KToggleAction(QIcon::fromTheme(QStringLiteral("format-text-strikethrough")), i18nc("@action:intoolbar Annotation tool, verb", "Strike Out"), this);
// Notes actions // Notes actions
KToggleAction *aTypewriter = new KToggleAction(QIcon::fromTheme(QStringLiteral("tool-text")), i18nc("@action:intoolbar Annotation tool", "Typewriter"), this); KToggleAction *aTypewriter = new KToggleAction(QIcon::fromTheme(QStringLiteral("tool-text")), i18nc("@action:intoolbar Annotation tool, verb", "Insert Text"), this);
KToggleAction *aInlineNote = new KToggleAction(QIcon::fromTheme(QStringLiteral("note")), i18nc("@action:intoolbar Annotation tool", "Inline Note"), this); KToggleAction *aInlineNote = new KToggleAction(QIcon::fromTheme(QStringLiteral("note")), i18nc("@action:intoolbar Annotation tool, verb", "Insert Inline Note"), this);
KToggleAction *aPopupNote = new KToggleAction(QIcon::fromTheme(QStringLiteral("edit-comment")), i18nc("@action:intoolbar Annotation tool", "Popup Note"), this); KToggleAction *aPopupNote = new KToggleAction(QIcon::fromTheme(QStringLiteral("edit-comment")), i18nc("@action:intoolbar Annotation tool, verb", "Insert Popup Note"), this);
KToggleAction *aFreehandLine = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18nc("@action:intoolbar Annotation tool", "Freehand Line"), this); KToggleAction *aFreehandLine = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-freehand")), i18nc("@action:intoolbar Annotation tool, verb", "Draw Freehand Line"), this);
// Geometrical shapes actions // Geometrical shapes actions
KToggleAction *aStraightLine = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-line")), i18nc("@action:intoolbar Annotation tool", "Straight line"), this); KToggleAction *aStraightLine = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-line")), i18nc("@action:intoolbar Annotation tool, verb", "Draw Straight line"), this);
KToggleAction *aArrow = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-arrow")), i18nc("@action:intoolbar Annotation tool", "Arrow"), this); KToggleAction *aArrow = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-arrow")), i18nc("@action:intoolbar Annotation tool, verb", "Draw Arrow"), this);
KToggleAction *aRectangle = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-rectangle")), i18nc("@action:intoolbar Annotation tool", "Rectangle"), this); KToggleAction *aRectangle = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-rectangle")), i18nc("@action:intoolbar Annotation tool, verb", " Draw Rectangle"), this);
KToggleAction *aEllipse = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-ellipse")), i18nc("@action:intoolbar Annotation tool", "Ellipse"), this); KToggleAction *aEllipse = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-ellipse")), i18nc("@action:intoolbar Annotation tool, verb", "Draw Ellipse"), this);
KToggleAction *aPolygon = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-polyline")), i18nc("@action:intoolbar Annotation tool", "Polygon"), this); KToggleAction *aPolygon = new KToggleAction(QIcon::fromTheme(QStringLiteral("draw-polyline")), i18nc("@action:intoolbar Annotation tool, verb", "Draw Polygon"), this);
d->aGeomShapes = new ToggleActionMenu(i18nc("@action", "Geometrical shapes"), this); d->aGeomShapes = new ToggleActionMenu(i18nc("@action", "Geometrical shapes"), this);
d->aGeomShapes->setEnabled(true); // Need to explicitly set this once, or refreshActions() in part.cpp will disable this action d->aGeomShapes->setEnabled(true); // Need to explicitly set this once, or refreshActions() in part.cpp will disable this action
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 77, 0) #if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 77, 0)

8
part/data/toolsQuick.xml
Unescape View File

@ -6,12 +6,12 @@ Tool
[id] {int = unique id identifying the quick tool} [id] {int = unique id identifying the quick tool}
--> -->
<quickAnnotatingTools> <quickAnnotatingTools>
<tool id="1" type="highlight" name="Yellow Highlighter" default="true"> <tool id="1" type="highlight" name="Highlight in Yellow" default="true">
<engine type="TextSelector" color="#ffff00"> <engine type="TextSelector" color="#ffff00">
<annotation type="Highlight" color="#ffffff00"/> <annotation type="Highlight" color="#ffffff00"/>
</engine> </engine>
</tool> </tool>
<tool id="2" type="highlight" name="Green Highlighter" default="true"> <tool id="2" type="highlight" name="Highlight in Green" default="true">
<engine type="TextSelector" color="#00ff00"> <engine type="TextSelector" color="#00ff00">
<annotation type="Highlight" color="#ff00ff00"/> <annotation type="Highlight" color="#ff00ff00"/>
</engine> </engine>
@ -26,12 +26,12 @@ Tool
<annotation type="Typewriter" color="#00ffffff" textColor="#000000" width="0"/> <annotation type="Typewriter" color="#00ffffff" textColor="#000000" width="0"/>
</engine> </engine>
</tool> </tool>
<tool id="5" type="note-inline"> <tool id="5" type="note-inline" name="Insert Inline Note">
<engine type="PickPoint" color="#ffff00" hoverIcon="tool-note-inline" block="true"> <engine type="PickPoint" color="#ffff00" hoverIcon="tool-note-inline" block="true">
<annotation type="FreeText" color="#ffffff00" textColor="#ff000000"/> <annotation type="FreeText" color="#ffffff00" textColor="#ff000000"/>
</engine> </engine>
</tool> </tool>
<tool id="6" type="note-linked"> <tool id="6" type="note-linked" name="Insert Popup Note">
<engine type="PickPoint" color="#ffff00" hoverIcon="tool-note"> <engine type="PickPoint" color="#ffff00" hoverIcon="tool-note">
<annotation type="Text" color="#ffffff00" icon="Note" /> <annotation type="Text" color="#ffffff00" icon="Note" />
</engine> </engine>

8
part/pageview.cpp
Unescape View File

@ -683,28 +683,28 @@ void PageView::setupActions(KActionCollection *ac)
ac->setDefaultShortcuts(d->aZoomOut, KStandardShortcut::zoomOut()); ac->setDefaultShortcuts(d->aZoomOut, KStandardShortcut::zoomOut());
// Mouse-Mode actions // Mouse-Mode actions
d->aMouseSelect = new QAction(QIcon::fromTheme(QStringLiteral("select-rectangular")), i18n("Area &Selection"), this); d->aMouseSelect = new QAction(QIcon::fromTheme(QStringLiteral("select-rectangular")), i18nc("verb", "&Select Area"), this);
ac->addAction(QStringLiteral("mouse_select"), d->aMouseSelect); ac->addAction(QStringLiteral("mouse_select"), d->aMouseSelect);
connect(d->aMouseSelect, &QAction::triggered, this, &PageView::slotSetMouseSelect); connect(d->aMouseSelect, &QAction::triggered, this, &PageView::slotSetMouseSelect);
d->aMouseSelect->setCheckable(true); d->aMouseSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseSelect, Qt::CTRL | Qt::Key_3); ac->setDefaultShortcut(d->aMouseSelect, Qt::CTRL | Qt::Key_3);
d->aMouseSelect->setActionGroup(d->mouseModeActionGroup); d->aMouseSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseTextSelect = new QAction(QIcon::fromTheme(QStringLiteral("edit-select-text")), i18n("&Text Selection"), this); d->aMouseTextSelect = new QAction(QIcon::fromTheme(QStringLiteral("edit-select-text")), i18nc("verb", "Select &Text"), this);
ac->addAction(QStringLiteral("mouse_textselect"), d->aMouseTextSelect); ac->addAction(QStringLiteral("mouse_textselect"), d->aMouseTextSelect);
connect(d->aMouseTextSelect, &QAction::triggered, this, &PageView::slotSetMouseTextSelect); connect(d->aMouseTextSelect, &QAction::triggered, this, &PageView::slotSetMouseTextSelect);
d->aMouseTextSelect->setCheckable(true); d->aMouseTextSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseTextSelect, Qt::CTRL | Qt::Key_4); ac->setDefaultShortcut(d->aMouseTextSelect, Qt::CTRL | Qt::Key_4);
d->aMouseTextSelect->setActionGroup(d->mouseModeActionGroup); d->aMouseTextSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseTableSelect = new QAction(QIcon::fromTheme(QStringLiteral("table")), i18n("T&able Selection"), this); d->aMouseTableSelect = new QAction(QIcon::fromTheme(QStringLiteral("table")), i18nc("verb", "Select T&able"), this);
ac->addAction(QStringLiteral("mouse_tableselect"), d->aMouseTableSelect); ac->addAction(QStringLiteral("mouse_tableselect"), d->aMouseTableSelect);
connect(d->aMouseTableSelect, &QAction::triggered, this, &PageView::slotSetMouseTableSelect); connect(d->aMouseTableSelect, &QAction::triggered, this, &PageView::slotSetMouseTableSelect);
d->aMouseTableSelect->setCheckable(true); d->aMouseTableSelect->setCheckable(true);
ac->setDefaultShortcut(d->aMouseTableSelect, Qt::CTRL | Qt::Key_5); ac->setDefaultShortcut(d->aMouseTableSelect, Qt::CTRL | Qt::Key_5);
d->aMouseTableSelect->setActionGroup(d->mouseModeActionGroup); d->aMouseTableSelect->setActionGroup(d->mouseModeActionGroup);
d->aMouseMagnifier = new QAction(QIcon::fromTheme(QStringLiteral("document-preview")), i18n("&Magnifier"), this); d->aMouseMagnifier = new QAction(QIcon::fromTheme(QStringLiteral("document-preview")), i18nc("verb", "&Magnify"), this);
ac->addAction(QStringLiteral("mouse_magnifier"), d->aMouseMagnifier); ac->addAction(QStringLiteral("mouse_magnifier"), d->aMouseMagnifier);
connect(d->aMouseMagnifier, &QAction::triggered, this, &PageView::slotSetMouseMagnifier); connect(d->aMouseMagnifier, &QAction::triggered, this, &PageView::slotSetMouseMagnifier);
d->aMouseMagnifier->setCheckable(true); d->aMouseMagnifier->setCheckable(true);

Write Preview
Loading…
Cancel
Save