--nextPart5401786.mzaeVHxmyP
Content-Type: multipart/mixed;
  boundary="Boundary-01=_y+waHifX+ouMLSh"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_y+waHifX+ouMLSh
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi,

talking with David about the merging in Konqueror of the Go menu coming fro=
m=20
thehosted kpart's, one of the problems faced is that the Back and Forward=20
actions in the Go menu can have different (and valid) usages depending whic=
h=20
type of Go they are (eg go_web for web navigation, and go_document for=20
document navigation).
As document viewers can provide their behaviour (document-based) for those,=
 it=20
would clash with the counterparts for Konqueror history navigation.

So, this patch extracts the document-based actions in own actions, but it a=
dds=20
two new strings in the kdelibs4.po catalog (CC'ed kde-i18n-doc for this).

Can this patch be applied on next monday?

=2D-=20
Pino Toscano

--Boundary-01=_y+waHifX+ouMLSh
Content-Type: text/x-diff;
  charset="utf-8";
  name="kdelibs-godocument.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="kdelibs-godocument.diff"

Index: actions/kstandardaction.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- actions/kstandardaction.h	(revisione 751062)
+++ actions/kstandardaction.h	(copia locale)
@@ -136,7 +136,7 @@
=20
     // Go Menu
     Up, Back, Forward, Home /*Home page*/, Prior, Next, Goto, GotoPage, Go=
toLine,
=2D    FirstPage, LastPage,
+    FirstPage, LastPage, DocumentBack, DocumentForward,
=20
     // Bookmarks Menu
     AddBookmark, EditBookmarks,
@@ -453,6 +453,16 @@
   KDEUI_EXPORT KAction *lastPage(const QObject *recvr, const char *slot, Q=
Object *parent);
=20
   /**
+   * Move back (document style menu).
+   */
+  KDEUI_EXPORT KAction *documentBack(const QObject *recvr, const char *slo=
t, QObject *parent);
+
+  /**
+   * Move forward (document style menu).
+   */
+  KDEUI_EXPORT KAction *documentForward(const QObject *recvr, const char *=
slot, QObject *parent);
+
+  /**
    * Add the current page to the bookmarks tree.
    */
   KDEUI_EXPORT KAction *addBookmark(const QObject *recvr, const char *slot=
, QObject *parent);
Index: actions/kstandardaction.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- actions/kstandardaction.cpp	(revisione 751062)
+++ actions/kstandardaction.cpp	(copia locale)
@@ -112,6 +112,12 @@
=20
       if ( id =3D=3D Next )
         iconName =3D "edit-find-previous";
+
+      if ( id =3D=3D DocumentBack )
+        iconName =3D "go-next";
+
+      if ( id =3D=3D DocumentForward )
+        iconName =3D "go-previous";
     }
=20
     QIcon icon =3D iconName.isEmpty() ? KIcon() : KIcon(iconName);
@@ -392,6 +398,16 @@
   return KStandardAction::create( LastPage, recvr, slot, parent );
 }
=20
+KAction *documentBack( const QObject *recvr, const char *slot, QObject *pa=
rent )
+{
+  return KStandardAction::create( DocumentBack, recvr, slot, parent );
+}
+
+KAction *documentForward( const QObject *recvr, const char *slot, QObject =
*parent )
+{
+  return KStandardAction::create( DocumentForward, recvr, slot, parent );
+}
+
 KAction *addBookmark( const QObject *recvr, const char *slot, QObject *par=
ent )
 {
   return KStandardAction::create( AddBookmark, recvr, slot, parent );
Index: actions/kstandardaction_p.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- actions/kstandardaction_p.h	(revisione 751062)
+++ actions/kstandardaction_p.h	(copia locale)
@@ -87,6 +87,8 @@
   { GotoLine,      KStandardShortcut::GotoLine, "go_goto_line", I18N_NOOP(=
"&Go to Line..."), 0, 0 },
   { FirstPage,     KStandardShortcut::Begin, "go_first", I18N_NOOP("&First=
 Page"), 0, "go-first" },
   { LastPage,      KStandardShortcut::End, "go_last", I18N_NOOP("&Last Pag=
e"), 0, "go-last" },
+  { DocumentBack,  KStandardShortcut::AccelNone, "go_document_back", I18N_=
NOOP("&Back in the Document"), 0, "go-previous" },
+  { DocumentForward, KStandardShortcut::AccelNone, "go_document_forward", =
I18N_NOOP("&Forward in the Document"), 0, "go-next" },
=20
   { AddBookmark,   KStandardShortcut::AddBookmark, "bookmark_add", I18N_NO=
OP("&Add Bookmark"), 0, "bookmark-new" },
   { EditBookmarks, KStandardShortcut::AccelNone, "bookmark_edit", I18N_NOO=
P("&Edit Bookmarks"), 0, "bookmark" },
Index: xmlgui/ui_standards.rc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- xmlgui/ui_standards.rc	(revisione 751062)
+++ xmlgui/ui_standards.rc	(copia locale)
@@ -130,6 +130,9 @@
     <Action name=3D"go_first"/>
     <Action name=3D"go_last"/>
     <Separator/>
+    <Action name=3D"go_document_back"/>
+    <Action name=3D"go_document_forward"/>
+    <Separator/>
     <MergeLocal/>
   </Menu>
   <MergeLocal/>

--Boundary-01=_y+waHifX+ouMLSh--

--nextPart5401786.mzaeVHxmyP
Content-Type: application/pgp-signature; name=signature.asc 
Content-Description: This is a digitally signed message part.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQBHaw+6TNH2piB/L3oRAgkgAJ4tLfdcbd32NdEzB+gCbqv8WVvj7wCgjPeF
0X07k5ZOl2PMXv+TcnAPtX0=
=R7xQ
-----END PGP SIGNATURE-----

--nextPart5401786.mzaeVHxmyP--