[keditbookmarks] /: add docbook to keditbookmarks

Sun Nov 6 20:12:20 UTC 2016

Git commit ba5d5fdc85ca7ba03c956abf11c61fb68f57f2c5 by Burkhard Lück.
Committed on 06/11/2016 at 20:11.
Pushed by lueck into branch 'master'.

add docbook to keditbookmarks

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

M  +2    -1    CMakeLists.txt
A  +2    -0    doc/CMakeLists.txt
A  +97   -0    doc/index.docbook
M  +67   -1    src/org.kde.keditbookmarks.desktop

http://commits.kde.org/keditbookmarks/ba5d5fdc85ca7ba03c956abf11c61fb68f57f2c5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60b2e8a..ed07239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,13 +27,14 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 set(KEDITBOOKMARKS_VERSION "5.97.0")
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n KIO Bookmarks Parts WindowSystem IconThemes)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n KIO Bookmarks Parts WindowSystem IconThemes DocTools)
 
 add_definitions(-DQT_USE_FAST_CONCATENATION)
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 add_subdirectory(src)
+add_subdirectory(doc)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..0c26ae9
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR keditbookmarks)
diff --git a/doc/index.docbook b/doc/index.docbook
new file mode 100644
index 0000000..583a9b0
--- /dev/null
+++ b/doc/index.docbook
@@ -0,0 +1,97 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+
+<!--moved from konqueror docbook -->
+
+<article id="keditbookmarks" lang="&language;">
+<articleinfo>
+<title>The Bookmark Editor</title>
+<authorgroup>
+<author>&Pamela.Roberts;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<date>2016-11-04</date>
+
+<releaseinfo>Applications 16.12</releaseinfo>
+
+<keywordset>
+<keyword>bookmarks</keyword>
+<keyword>editor</keyword>
+</keywordset>
+</articleinfo>
+
+<para>In many applications (⪚ &konqueror;, &konsole;, &konversation;)
+the <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit
+Bookmarks</guimenuitem> </menuchoice> option opens the <guilabel>Bookmark
+Editor</guilabel>.</para>
+<para>Alternatively you can lauch the editor as standalone application
+to edit the browser bookmarks.</para>
+<para>The editor shows a tree view of your bookmarks and bookmark subfolders.
+As is usual for tree views in &kde;, subfolders are shown with a small
+<keycap>></keycap> arrow at the left of the folder name;
+<mousebutton>left</mousebutton> clicking on it will expand the view to
+show the contents of that subfolder and the <keycap>></keycap> arrow will
+change to <keycap>v</keycap>; <mousebutton>left</mousebutton> clicking on the
+<keycap>v</keycap> arrow will collapse the subfolder view.</para>
+
+<para>To select an item in the list you can <mousebutton>left</mousebutton>
+click on it, or you can navigate through the list by using the <keysym>Up</keysym>
+and <keysym>Down</keysym> keys to move around, <keysym>Right</keysym> to expand a subfolder and
+<keysym>Left</keysym> to collapse it.</para>
+
+<para>You can move an item to a different place in the list by using the
+normal Drag and Drop or <guimenuitem>Cut</guimenuitem> and <guimenuitem>
+Paste</guimenuitem> methods. The order in which the items appear in
+the <guilabel>Bookmark Editor</guilabel> is the order they will appear in the
+<guimenu>Bookmarks</guimenu> drop down list. The <menuchoice><guimenu>Folder
+</guimenu><guimenuitem>Insert Separator</guimenuitem></menuchoice> option can
+be used to insert separating lines into the list wherever you wish.</para>
+
+<para>A new subfolder can be created at the selected point in the list by
+using the <guimenuitem>New Folder...</guimenuitem> option in the
+<guimenu>Folder</guimenu> menu or from the drop down menu you get when you
+<mousebutton>right</mousebutton> click on an item in the main part of the
+window, or with <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
+</para>
+
+<para>To change the name of a bookmark or folder select it then press
+<keycap>F2</keycap> or choose the <guimenuitem>Rename</guimenuitem> item from
+the <guimenu>Edit</guimenu> menu or the pop up menu that appears when you
+<mousebutton>right</mousebutton> click on the item. Similarly, you can edit
+the &URL; by pressing <keycap>F3</keycap> or choosing the <guimenuitem>
+Change Location</guimenuitem> menu item.</para>
+
+<para>The <guilabel>Bookmark Editor</guilabel> lets you import bookmarks from
+a range of other browsers into &konqueror;'s bookmark list, putting them into
+ a new folder or replacing all current bookmarks. To do this select
+<guisubmenu>Import</guisubmenu> from the <guimenu>File</guimenu> menu. The
+<menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu>
+</menuchoice> option can be used to export &konqueror;'s bookmarks to a
+Mozilla browser.</para>
+
+<para>To select which bookmark subfolder is used to hold the Bookmark
+Toolbar items select the subfolder then choose <guimenuitem>Set as Toolbar
+Folder</guimenuitem> from the <guimenu>Folder</guimenu> menu.</para>
+
+<para>If you are tidying up your bookmarks and have forgotten what a
+particular web page is, you can easily open it from within the <guilabel>
+Bookmark Editor</guilabel> by <mousebutton>right</mousebutton> clicking
+on the item and selecting <guimenuitem>Open in Konqueror</guimenuitem> from
+the pop up menu. If you just want to check that the &URL; is still valid
+select <guimenuitem>Check Status</guimenuitem> instead.</para>
+
+<note><para>All your changes are automatically saved if you close
+the <guilabel>Bookmark Editor</guilabel>.
+</para></note>
+
+<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+
+&underFDL;
+&underGPL;
+
+</article>
diff --git a/src/org.kde.keditbookmarks.desktop b/src/org.kde.keditbookmarks.desktop
index 1c1f2a3..c8c9c1f 100755
--- a/src/org.kde.keditbookmarks.desktop
+++ b/src/org.kde.keditbookmarks.desktop
@@ -4,6 +4,72 @@ Exec=keditbookmarks
 NoDisplay=true
 Name=Bookmark Editor
 Comment=Bookmark Organizer and Editor
-X-DocPath=konqueror/index.html#bookmarks
+Comment[ar]=محرِّر و منظّم العلامات
+Comment[ast]=Organizador y editor de marcadores
+Comment[bg]=Организиране и редактиране на отметки
+Comment[bn]=বুকমার্ক ব্যবস্থাপনা এবং সম্পাদনা
+Comment[bs]=Organizator i uređivač obeleživača
+Comment[ca]=Organitzador i editor d'adreces d'interès
+Comment[ca at valencia]=Organitzador i editor d'adreces d'interés
+Comment[cs]=Editor a organizátor záložek
+Comment[da]=Organisering og redigering af bogmærker
+Comment[de]=Lesezeichen-Verwaltung und -Editor
+Comment[el]=Επεξεργαστής και οργανωτής σελιδοδεικτών
+Comment[en_GB]=Bookmark Organiser and Editor
+Comment[eo]=Legosigna Ordigilo kaj Redaktilo
+Comment[es]=Organizador y editor de marcadores
+Comment[et]=Järjehoidjate korraldaja ja redaktor
+Comment[eu]=Laster-marken antolatzaile eta editorea
+Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä
+Comment[fr]=Éditeur et organisateur de signets
+Comment[ga]=Eagarthóir agus Eagraí Leabharmharcanna
+Comment[gl]=Organizador e editor dos marcadores
+Comment[gu]=બૂકમાર્ક વ્યવસ્થાપક અને સંપાદક
+Comment[he]=מארגן ועורך סימניות
+Comment[hi]=पसंदीदा व्यवस्था और संपादक
+Comment[hr]=Organizator i uređivač oznaka
+Comment[hu]=Könyvjelzőszervező és -szerkesztő
+Comment[ia]=Editor e organisator de marcator de libros
+Comment[id]=Pengorganisir dan Penyunting Penanda
+Comment[is]=Bókamerkjaskipuleggjari
+Comment[it]=Editor ed organizzatore dei segnalibri
+Comment[ja]=ブックマークの管理と編集
+Comment[kk]=Бетбелгілерді реттеу мен өңдеу
+Comment[km]=កម្មវិធីរៀបចំ និងកែសម្រួលចំណាំ
+Comment[kn]=ಪುಟಗುರುತು ವ್ಯವಸ್ಥಾಪಕ ಹಾಗು ಸಂಪಾದಕ
+Comment[ko]=책갈피 관리 도구
+Comment[lt]=Žymelių organizatorius ir redaktorius
+Comment[lv]=Grāmatzīmju kārtotājs un rediģētājs
+Comment[mai]=पुस्तचिह्न प्रबंधक आओर संपादक
+Comment[mr]=ओळखचिन्ह आयोजक व संपादक
+Comment[nb]=Bokmerkeordner og redigerer
+Comment[nds]=Leestekenpleger un -editor
+Comment[nl]=Bladwijzers organiseren en bewerken
+Comment[nn]=Bokmerkeordnar og redigering
+Comment[pa]=ਬੁੱਕਮਾਰਕ ਪਰਬੰਧਕ ਤੇ ਐਡੀਟਰ
+Comment[pl]=Organizacja i modyfikacja zakładek
+Comment[pt]=Organizador e Editor de Favoritos
+Comment[pt_BR]=Editor e organizador de favoritos
+Comment[ro]=Organizator și editor de semne de carte
+Comment[ru]=Редактирование и организация закладок
+Comment[si]=පිටු සළකුණු සංවිධායක සහ සංස්කාරක
+Comment[sk]=Organizátor a editor záložiek
+Comment[sl]=Organizator in urejevalnik zaznamkov
+Comment[sr]=Организатор и уређивач обележивача
+Comment[sr at ijekavian]=Организатор и уређивач обиљеживача
+Comment[sr at ijekavianlatin]=Organizator i uređivač obilježivača
+Comment[sr at latin]=Organizator i uređivač obeleživača
+Comment[sv]=Bokmärkesorganisering och editor
+Comment[tg]=Ташкикунанда ва таҳриргари хатчӯбҳо
+Comment[th]=เครื่องมือแก้ไขและจัดการที่คั่นหน้า
+Comment[tr]=Yer İmleri Düzenleyicisi
+Comment[ug]=خەتكۈش تەشكىللىگۈچ ۋە تەھرىرلىگۈچ
+Comment[uk]=Керування і редагування закладок
+Comment[wa]=Organizeu eyet aspougneu d' rimarkes
+Comment[x-test]=xxBookmark Organizer and Editorxx
+Comment[zh_CN]=书签组织和编辑器
+Comment[zh_TW]=書籤組織編輯器
+X-DocPath=keditbookmarks/index.html
 Categories=Qt;KDE;Network;WebBrowser;
 X-DBUS-ServiceName=org.kde.keditbookmarks.desktop
+
