SOURCES: kde4-kdebase-branch.diff, kde4-kdebase-runtime-branch.diff, kde4-k...

arekm arekm at pld-linux.org
Sun Apr 12 23:01:51 CEST 2009


Author: arekm                        Date: Sun Apr 12 21:01:51 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdebase-branch.diff (1.8 -> 1.9) , kde4-kdebase-runtime-branch.diff (1.9 -> 1.10) , kde4-kdebase-workspace-branch.diff (1.9 -> 1.10) , kde4-kdelibs-branch.diff (1.10 -> 1.11) , kde4-kdepim-branch.diff (1.7 -> 1.8) , kde4-kdepimlibs-branch.diff (1.10 -> 1.11) , kde4-kdesdk-branch.diff (1.1 -> 1.2) , kde4-kdenetwork-branch.diff (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kde4-kdebase-branch.diff
diff -u SOURCES/kde4-kdebase-branch.diff:1.8 SOURCES/kde4-kdebase-branch.diff:1.9
--- SOURCES/kde4-kdebase-branch.diff:1.8	Sat Mar 21 00:01:50 2009
+++ SOURCES/kde4-kdebase-branch.diff	Sun Apr 12 23:01:42 2009
@@ -1,1608 +1,428 @@
-Index: apps/nsplugins/viewer/nsplugin.cpp
+Index: apps/konqueror/src/konqmainwindow.cpp
 ===================================================================
---- apps/nsplugins/viewer/nsplugin.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/nsplugins/viewer/nsplugin.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -644,6 +644,7 @@
-    _destroyed = false;
-    _handle = handle;
-    _callback = new org::kde::nsplugins::CallBack( appId, callbackId, QDBusConnection::sessionBus() );
-+   _numJSRequests = 0;
- 
-    KUrl base(src);
-    base.setFileName( QString() );
-@@ -742,6 +743,10 @@
-     }
- }
- 
-+bool NSPluginInstance::hasPendingJSRequests() const
-+{
-+    return _numJSRequests > 0;
-+}
- 
- void NSPluginInstance::timer()
+--- apps/konqueror/src/konqmainwindow.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
++++ apps/konqueror/src/konqmainwindow.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+@@ -1174,10 +1174,12 @@
+         if ( windowArgs.lowerWindow() || (QApplication::keyboardModifiers() & Qt::ShiftModifier))
+            newtabsinfront = !newtabsinfront;
+         const bool aftercurrentpage = KonqSettings::openAfterCurrentPage();
++        KonqOpenURLRequest req;
++        req.args = args;
++        req.browserArgs = browserArgs;
+ 
+         // Can we use the standard way (openUrl), or do we need the part pointer immediately?
+         if (!part) {
+-            KonqOpenURLRequest req;
+             req.newTab = true;
+             req.newTabInFront = newtabsinfront;
+             req.openAfterCurrentPage = aftercurrentpage;
+@@ -1189,7 +1191,7 @@
+             if (newtabsinfront)
+                 m_pViewManager->showTab( newView );
+ 
+-            openUrl( newView, url.isEmpty() ? KUrl("about:blank") : url, QString() );
++            openUrl( newView, url.isEmpty() ? KUrl("about:blank") : url, QString(), req );
+             newView->setViewName( browserArgs.frameName );
+ 
+             *part = newView->part();
+@@ -2175,12 +2177,15 @@
+ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension *&hostExtension, KParts::ReadOnlyPart **part )
  {
-@@ -762,6 +767,8 @@
- 
-         QString url;
- 
-+        // Note: sync javascript: handling with requestURL
-+
-         // make absolute url
-         if ( req.url.left(11).toLower()=="javascript:" )
-             url = req.url;
-@@ -809,9 +816,10 @@
-                 } else if (url.toLower().startsWith("javascript:")){
-                     if (_callback) {
-                         static int _jsrequestid = 0;
--			_jsrequests.insert(_jsrequestid, new Request(req));
-+                        _jsrequests.insert(_jsrequestid, new Request(req));
-                         _callback->evalJavaScript(_jsrequestid++, url.mid(11));
-                     } else {
-+                        --_numJSRequests;
-                         kDebug() << "No callback for javascript: url!";
-                     }
-                 } else {
-@@ -868,8 +876,12 @@
-     if (nurl.isNull()) {
-         return;
-     }
-+    
-+    // We dispatch JS events in target for empty target GET only.(see timer());
-+    if (target.isEmpty() && nurl.left(11).toLower()=="javascript:")
-+         ++_numJSRequests;
- 
--    kDebug(1431) << "NSPluginInstance::requestURL url=" << nurl << " target=" << target << " notify=" << notify;
-+    kDebug(1431) << "NSPluginInstance::requestURL url=" << nurl << " target=" << target << " notify=" << notify << "JS jobs now:" << _numJSRequests;
-     _waitingRequests.enqueue( new Request( nurl, mime, target, notify, forceNotify, reload ) );
-     _timer->setSingleShot( true );
-     _timer->start( 100 );
-@@ -943,6 +955,8 @@
- void NSPluginInstance::javascriptResult(int id, const QString &result) {
-     QMap<int, Request*>::iterator i = _jsrequests.find( id );
-     if (i != _jsrequests.end()) {
-+        --_numJSRequests;
-+
-         Request *req = i.value();
-         _jsrequests.erase( i );
-         NSPluginStream *s = new NSPluginStream( this );
-@@ -952,7 +966,7 @@
- 
-         int len = result.length();
-         s->create( req->url, QString("text/plain"), req->notify, req->forceNotify );
--        kDebug(1431) << "javascriptResult has been called with: "<<result;
-+        kDebug(1431) << "javascriptResult has been called with: "<<result << "num JS requests now:" << _numJSRequests;
-         if (len > 0) {
-             QByteArray data(len + 1, 0);
-             memcpy(data.data(), result.toLatin1(), len);
-@@ -1634,6 +1648,10 @@
- 
-     inform();
- 
-+    // Suspend until JS handled..
-+    if (_instance->hasPendingJSRequests())
-+       return false;
-+
-     if ( _queuePos<_queue.size() ) {
-         int newPos;
- 
-Index: apps/nsplugins/viewer/nsplugin.h
-===================================================================
---- apps/nsplugins/viewer/nsplugin.h	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/nsplugins/viewer/nsplugin.h	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -210,8 +210,9 @@
-                 const KParts::BrowserArguments& browserArgs, bool forceNotify = false );
- 
-   QString normalizedURL(const QString& url) const;
-+  
-+  bool hasPendingJSRequests() const;
- 
--
- public Q_SLOTS:
-   void streamFinished( NSPluginStreamBase *strm );
- 
-@@ -273,6 +274,7 @@
+     //kDebug() << "this=" << this << "looking for" << name;
++    QList<KonqView *> views = m_mapViews.values();
++    KonqView* callingView = m_mapViews.value(callingPart);
++    if (callingView) {
++        // Move the callingView in front of the list, in case of duplicate frame names (#133967)
++        if (views.removeAll(callingView))
++            views.prepend(callingView);
++    }
  
-   QQueue<Request *> _waitingRequests;
-   QMap<int, Request*> _jsrequests;
-+  int _numJSRequests; // entered in earlier than _jsrequests.
-   
-   static NSPluginInstance* s_lastPluginInstance;
- };
-Index: apps/kappfinder/apps/System/Terminal/vmstat.desktop
-===================================================================
---- apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/kappfinder/apps/System/Terminal/vmstat.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -43,7 +43,7 @@
- GenericName[gu]=વર્ચ્યુઅલ મેમરી આંકડાઓ
- GenericName[he]=סטטיסטיקה לגבי הזיכרון הווירטואלי
- GenericName[hi]=आभासी मेमोरी आंकड़े
--GenericName[hne]=आभासी मेमोरी आंकड़े
-+GenericName[hne]=आभासी मेमोरी आंकड़ा
- GenericName[hr]=Statistike o virtualnoj memoriji
- GenericName[hsb]=Statistika wo wirtuelnym pomjatku
- GenericName[hu]=Memóriastatisztika
-Index: apps/kappfinder/apps/Office/pybliographic.desktop
-===================================================================
---- apps/kappfinder/apps/Office/pybliographic.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/kappfinder/apps/Office/pybliographic.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -13,7 +13,7 @@
- GenericName[csb]=Bibliograficznô baza dostónków
- GenericName[cy]=Cronfeydd Llyfryddiaethol
- GenericName[da]=Bibliografisk database
--GenericName[de]=Bibliographische Datenbank
-+GenericName[de]=Bibliografische Datenbank
- GenericName[el]=Βιβλιογραφική βάση δεδομένων
- GenericName[eo]=Bibliografia datumbazo
- GenericName[es]=Base de datos bibliográfica
-Index: apps/konqueror/src/konqbookmarkbar.cpp
-===================================================================
---- apps/konqueror/src/konqbookmarkbar.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/konqueror/src/konqbookmarkbar.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -301,10 +301,21 @@
+-  MapViews::ConstIterator it = m_mapViews.constBegin();
+-  MapViews::ConstIterator end = m_mapViews.constEnd();
+-  for (; it != end; ++it )
+-  {
+-    KonqView* view = it.value();
++  Q_FOREACH(KonqView* view, views) {
+     QString viewName = view->viewName();
+     //kDebug() << "       - viewName=" << viewName
+     //          << "frame names:" << view->frameNames();
+Index: apps/konqueror/src/konqtabs.cpp
+===================================================================
+--- apps/konqueror/src/konqtabs.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
++++ apps/konqueror/src/konqtabs.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+@@ -266,7 +266,9 @@
+ void KonqFrameTabs::setTitle( const QString &title , QWidget* sender)
  {
-     KBookmarkActionInterface * action = dynamic_cast<KBookmarkActionInterface *>( m_toolBar->actionAt(pos) );
-     if(!action)
--        return;
--    KMenu * menu = new KonqBookmarkContextMenu(action->bookmark(), m_pManager, m_pOwner);
--    menu->setAttribute(Qt::WA_DeleteOnClose);
--    menu->popup(m_toolBar->mapToGlobal(pos));
-+    {
-+        //Show default (ktoolbar) menu
-+        m_toolBar->setContextMenuPolicy( Qt::DefaultContextMenu );
-+        //Recreate event with the same position
-+        QContextMenuEvent evt( QContextMenuEvent::Other, pos );
-+        QCoreApplication::sendEvent( m_toolBar, &evt );
-+        //Reassign custom context menu
-+        m_toolBar->setContextMenuPolicy( Qt::CustomContextMenu );
-+    }
-+    else
-+    {
-+        KMenu * menu = new KonqBookmarkContextMenu(action->bookmark(), m_pManager, m_pOwner);
-+        menu->setAttribute(Qt::WA_DeleteOnClose);
-+        menu->popup(m_toolBar->mapToGlobal(pos));
-+    }
+   // kDebug(1202) << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )";
+-  setTabText( indexOf( sender ), title );
++  // Make sure that '&' is displayed correctly
++  QString tabText( title );
++  setTabText( indexOf( sender ), tabText.replace('&', "&&") );
  }
  
- // TODO    *** drop improvements ***
-Index: apps/konqueror/settings/kio/uasproviders/safari12.desktop
+ void KonqFrameTabs::setTabIcon( const KUrl &url, QWidget* sender )
+Index: apps/kfind/kfwin.cpp
 ===================================================================
---- apps/konqueror/settings/kio/uasproviders/safari12.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/konqueror/settings/kio/uasproviders/safari12.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -18,6 +18,7 @@
- Name[eu]=UA azalpena (Safari 1.2 MacOS Xn)
- Name[fa]=UADescription (Safari 1.2 در MacOS X)
- Name[fi]=Käyttäjäagenttikuvaus (Safari 1.2 MacOS X:llä)
-+Name[fr]=UADescription (Safari 1.2 sous MacOS X)
- Name[fy]=GA-omskriuwing (Safari 1.2 op MacOS X)
- Name[ga]=UADescription (Safari 1.2 ar MacOS X)
- Name[gl]=UADescription (Safari 1.2 en MacOS X)
-Index: apps/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop
-===================================================================
---- apps/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/konqueror/settings/kio/uasproviders/firefox15oncurrent.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -18,6 +18,7 @@
- Name[eu]=UA azalpena (Firefox 1.5 unekoan)
- Name[fa]=UADescription (Firefox 1.5 در حال حاضر)
- Name[fi]=Käyttäjäagenttikuvaus (Firefox 1.5)
-+Name[fr]=UADescription (Firefox 1.5 sous le système actuel)
- Name[fy]=GA-omskriuwing (Firefox 1.5 op aktive)
- Name[ga]=UADescription (Firefox 1.5 ar an gcóras reatha)
- Name[gl]=UADescription (Firefox 1.5 no actual)
-Index: apps/konqueror/settings/filetypes/filetypesview.cpp
-===================================================================
---- apps/konqueror/settings/filetypes/filetypesview.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/konqueror/settings/filetypes/filetypesview.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -190,33 +190,39 @@
-   setEnabled( true );
- }
- 
--// only call this method once on startup, then never again! Otherwise, newly
--// added Filetypes will be lost.
-+// To order the mimetype list
-+static bool mimeTypeLessThan(const KMimeType::Ptr& m1, const KMimeType::Ptr& m2)
-+{
-+    return m1->name() < m2->name();
-+}
-+
-+// Note that this method loses any newly-added (and not saved yet) mimetypes.
-+// So this is really only for load().
- void FileTypesView::readFileTypes()
- {
-     typesLV->clear();
-     m_majorMap.clear();
-     m_itemList.clear();
- 
--    const KMimeType::List mimetypes = KMimeType::allMimeTypes();
-+    KMimeType::List mimetypes = KMimeType::allMimeTypes();
-+    qSort(mimetypes.begin(), mimetypes.end(), mimeTypeLessThan);
-     KMimeType::List::const_iterator it2(mimetypes.constBegin());
-     for (; it2 != mimetypes.constEnd(); ++it2) {
--	QString mimetype = (*it2)->name();
--	int index = mimetype.indexOf('/');
--	QString maj = mimetype.left(index);
--	QString min = mimetype.right(mimetype.length() - index+1);
-+        const QString mimetype = (*it2)->name();
-+        const int index = mimetype.indexOf('/');
-+        const QString maj = mimetype.left(index);
-+        const QString min = mimetype.right(mimetype.length() - index+1);
- 
-         TypesListItem* groupItem = m_majorMap.value(maj);
--	if ( !groupItem ) {
--	    groupItem = new TypesListItem( typesLV, maj );
--	    m_majorMap.insert( maj, groupItem );
--	}
-+        if ( !groupItem ) {
-+            groupItem = new TypesListItem(typesLV, maj);
-+            m_majorMap.insert(maj, groupItem);
-+        }
- 
- 	TypesListItem *item = new TypesListItem(groupItem, (*it2));
- 	m_itemList.append( item );
-     }
-     updateDisplay(0L);
--
+--- apps/kfind/kfwin.cpp	(.../tags/KDE/4.2.2/kdebase)	(wersja 952918)
++++ apps/kfind/kfwin.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 952918)
+@@ -80,7 +80,7 @@
+   setText(5, matchingLine);
+ 
+   // put the icon into the leftmost column
+-  setPixmap(0, item.pixmap(16));
++  setPixmap(0, KIcon(item.iconName()).pixmap(16,16) );
  }
  
- void FileTypesView::slotEmbedMajor(const QString &major, bool &embed)
+ KfFileLVI::~KfFileLVI()
 Index: apps/kfind/kquery.cpp
 ===================================================================
---- apps/kfind/kquery.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/kfind/kquery.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -336,7 +336,7 @@
-            kWarning() << "Cannot open supposed ZIP file " << file.url() ;
-          }
-        } else if( !m_search_binary && !file.mimetype().startsWith("text/") &&
--           file.url().isLocalFile() ) {
-+           file.url().isLocalFile() && !file.url().path().startsWith("/dev") ) {
-          if ( KMimeType::isBinaryData(file.url().path()) ) {
-            kDebug() << "ignoring, not a text file: " << file.url();
-            return;
-Index: apps/kfind/kfinddlg.cpp
-===================================================================
---- apps/kfind/kfinddlg.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/kfind/kfinddlg.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -58,7 +58,7 @@
-   setStatusMsg(i18n("Ready."));
-   mStatusBar->setItemAlignment(0, Qt::AlignLeft | Qt::AlignVCenter);
-   mStatusBar->insertPermanentItem(QString(), 1, 1);
--  mStatusBar->setItemAlignment(1, Qt::AlignLeft | Qt::AlignVCenter);
-+  mStatusBar->setItemAlignment(1, Qt::AlignRight | Qt::AlignVCenter);
- 
-   QVBoxLayout *vBox = new QVBoxLayout(frame);
-   vBox->addWidget(tabWidget, 0);
-Index: apps/kfind/CMakeLists.txt
-===================================================================
---- apps/kfind/CMakeLists.txt	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/kfind/CMakeLists.txt	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -10,7 +10,7 @@
- kde4_add_plugin(kfindpart WITH_PREFIX ${kfindpart_PART_SRCS})
- 
- 
--target_link_libraries(kfindpart  ${KDE4_KDE3SUPPORT_LIBS} konq ${KDE4_KPARTS_LIBS})
-+target_link_libraries(kfindpart  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS})
- 
- install(TARGETS kfindpart  DESTINATION ${PLUGIN_INSTALL_DIR} )
- 
-Index: apps/dolphin/src/kcmdolphin.desktop
-===================================================================
---- apps/dolphin/src/kcmdolphin.desktop	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/dolphin/src/kcmdolphin.desktop	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -36,6 +36,7 @@
- Comment[et]=See teenus võimaldab seadistada Dolphini vaateid.
- Comment[eu]=Zerbitzu honen bitartez Dolphin ikuspegiak konfigura ditzakezu.
- Comment[fi]=Tämä palvelu sallii Dolphinin näkymien muokkauksen.
-+Comment[fr]=Ce service permet de configurer les modes de visualisation de Dolphin
- Comment[fy]=De tsjinst stiet it ynstellen fan de Dolfynwerjefte ta.
- Comment[ga]=Leis an tseirbhís seo is féidir na hamhairc Dolphin a chumrú.
- Comment[gl]=Este servizo permite configurar as vistas de Dolphin.
-@@ -114,6 +115,7 @@
- Name[et]=Vaated
- Name[eu]=Ikuspegiak
- Name[fi]=Näkymät
-+Name[fr]=Modes de visualisation
- Name[fy]=Werjeften
- Name[ga]=Amhairc
- Name[gl]=Vistas
-@@ -186,6 +188,7 @@
- Comment[et]=Failihalduri seadistuste seadistamine
- Comment[eu]=Konfiguratu fitxategia arakatzailearen ezarpenak
- Comment[fi]=Muokkaa tiedostonhallinnan asetuksia
-+Comment[fr]=Configuration des paramètres du gestionnaire de fichiers
- Comment[fy]=Hjir kinne jo de triembehear ynstellings fêststelle
- Comment[ga]=Cumraigh socruithe bhainisteoir na gcomhad
- Comment[gl]=Configura as opcións do xestor de ficheiros
-Index: apps/dolphin/src/dolphinpart.cpp
-===================================================================
---- apps/dolphin/src/dolphinpart.cpp	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/dolphin/src/dolphinpart.cpp	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -274,6 +274,7 @@
-     emit started(0); // get the wheel to spin
-     m_dirLister->setNameFilter(m_nameFilter);
-     m_view->setUrl(url);
-+    updatePasteAction();
-     emit aboutToOpenURL();
-     if (reload)
-         m_view->reload();
-Index: apps/doc/kwrite/index.docbook
-===================================================================
---- apps/doc/kwrite/index.docbook	(.../tags/KDE/4.2.1/kdebase)	(wersja 942069)
-+++ apps/doc/kwrite/index.docbook	(.../branches/KDE/4.2/kdebase)	(wersja 942069)
-@@ -40,8 +40,8 @@
- </copyright>
- <legalnotice>&FDLNotice;</legalnotice>
- 
--<date>2008-09-01</date>
--<releaseinfo>4.1.1</releaseinfo>
-+<date>2009-02-05</date>
-+<releaseinfo>4.2.00</releaseinfo>
- 
- <abstract>
- <para>&kwrite; is a text editor for &kde; allowing you to edit one file at the time per window.</para>
-@@ -76,7 +76,7 @@
- &kappname; 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> 
-+Enable power user mode (&kde; 3 mode)</link> 
- on the <guilabel>Appearance</guilabel> page in &kappname;s 
- settings.
- </para>
-@@ -125,10 +125,10 @@
- </informalexample>
- </sect2>
- <sect2 id="editing-files-on-the-internet">
--<title>Specify a file on the internet</title>
-+<title>Specify a file on the Internet</title>
- 
- <para>The above-mentioned method could even be used to open files on the
--internet (if the user has an active connection at the time.)  An example of
-+Internet (if the user has an active connection at the time.)  An example of
- this might look like the following:</para>
- 
- <informalexample><screen>
-@@ -222,7 +222,7 @@
- </sect2>
- </sect1>
- 
--<sect1 id="keybindings"> <!--to be checked lueck-->
-+<sect1 id="keybindings"> <!--has to be checked lueck-->
- <title>Shortcuts</title>
- 
- <para>Many of the shortcuts are configurable by way of the <link
-@@ -304,7 +304,7 @@
- <row>
- <entry><para><keycombo action="simul">&Shift;<keycap>Enter</keycap></keycombo></para></entry>
- <entry><para>Insert newline including leading characters of the current line which are not letters or numbers.
--It is usefull &eg; to write comments in the code: At the end of the line <quote>// some text</quote> press 
-+It is useful &eg; to write comments in the code: At the end of the line <quote>// some text</quote> press 
- this shortcut and the next line starts already with <quote>// </quote>. So you do not have to enter the comment 
- characters at the beginning of each new line with comments.</para></entry>
- </row>
-@@ -500,13 +500,11 @@
- action="simul">&Ctrl;&Shift;<keycap>+</keycap></keycombo></para></entry>
- <entry><para>Expand Toplevel</para></entry>
- </row>
--<!-- only in 4.2 uncomment after backport to 4.1
- <row>
- <entry><para><keycombo
--action="simul">Meta&Ctrl;<keycap>V</keycap></keycombo></para></entry>
-+action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo></para></entry>
- <entry><para>VI input mode</para></entry>
- </row>
---->
- <row>
- <entry><para><keycombo
- action="simul">&Ctrl;<keycap>Space</keycap></keycombo></para></entry>
-@@ -553,9 +551,9 @@
- 
- <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> 
-+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 items-->
-+<!-- 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 <guimenu>File</guimenu> Menu</title>
- 
-@@ -731,7 +729,7 @@
- <term id="export-as-html">
- <menuchoice>
- <guimenu>File</guimenu>
--<guimenuitem>Export as HTML...</guimenuitem>
-+<guimenuitem>Export as HTML</guimenuitem>
- </menuchoice>
- </term>
- <listitem>
-@@ -893,6 +891,22 @@
- <guilabel>LINE</guilabel>.</para>
- </listitem>
- </varlistentry>
-+<varlistentry><!-- only in power user mode -->
-+<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></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.
-+This status bar shows commands while they are being entered, output from commands and 
-+the current mode.The behavior of this mode can be configured in the 
-+<link linkend="pref-edit-vi-input-mode">Vi Input Mode</link> section of the  
-+<guilabel>Editing</guilabel> page in &kappname;'s settings dialog.</para>
-+</listitem>
-+</varlistentry>
- <varlistentry>
- <term><anchor id="overwrite-mode"/><menuchoice>
- <shortcut>
-@@ -925,7 +939,7 @@
- and <guilabel>Not found</guilabel> is displayed at the right side of the bar.</para>
- <para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button 
- to jump to the next or previous match in the document.</para> 
--<para>You can modify the search behaviour by selecting different 
-+<para>You can modify the search behavior by selecting different 
- <guilabel>Options</guilabel>: 
- The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
- Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
-@@ -993,20 +1007,23 @@
- <para>This command opens the power search and replace bar.
- On the upper left side of the bar is an icon to close the bar, followed by a small text 
- box for entering the search pattern.</para>
--<para>You can control the search mode by selecting <guilabel>Plain Text</guilabel>,
--<guilabel>Whole Words</guilabel>, <guilabel>Escape Sequences</guilabel> or 
--<guilabel>Regular Expression</guilabel>. For the last two options the 
--<guibutton>Add</guibutton> button is enabled and allows you to add special items to the
--search pattern from a predefined list.
-+<para>You can control the search mode by selecting <guilabel>Plain text</guilabel>
-+<keycombo action="simul">&Alt;<keycap>1</keycap></keycombo>,
-+<guilabel>Whole words</guilabel><keycombo action="simul">&Alt;<keycap>2</keycap></keycombo>, 
-+<guilabel>Escape sequences</guilabel><keycombo action="simul">&Alt;<keycap>3</keycap></keycombo>
-+or <guilabel>Regular expression</guilabel><keycombo action="simul">&Alt;<keycap>4</keycap></keycombo>. 
- </para>
-+<para>If <guilabel>Escape sequences</guilabel> or <guilabel>Regular expression</guilabel> are
-+selected, the <guibutton>Add...</guibutton> menuitem at the bottom of the context menu of the text boxes will be enabled
-+and allows you to add escape sequences or regular expression items to the
-+search or replace pattern from predefined lists.</para>
- <para>Use the <guilabel>Next</guilabel> or <guilabel>Previous</guilabel> button to jump 
- to the next or previous match in the document.</para>
- <para>Enter the text to replace with in the text box labeled <guilabel>Replace</guilabel>
- and click the <guibutton>Replace</guibutton> button to replace only the highlighted text or
- the <guibutton>Replace All</guibutton> button to replace the search text in the whole document.
--If the option <guilabel>Use placeholders</guilabel> is checked you can add special items 
--to the replacement text by clicking the <guibutton>Add</guibutton> button.</para>
--<para>You can modify the search and replace behaviour by selecting different 
-+</para>
-+<para>You can modify the search and replace behavior by selecting different 
- options on the right side of the bar.
- The <guilabel>Highlight all</guilabel> option highlights all matches in the document.
- Selecting <guilabel>Match case</guilabel> will limit finds to entries that match the
-@@ -1073,7 +1090,7 @@
- 
- </sect1>
- <sect1 id="view-menu">
--<!-- This is also valid for kates menu edit, only New Window is replaced by Vi input mode-->
-+<!-- This is also valid for kates menu view, but kate does not have the New Window item -->
- <title>The <guimenu>View</guimenu> menu</title>
- 
- <para>The <guimenu>View</guimenu> menu allows you to manage settings
-@@ -1094,7 +1111,7 @@
- document in one window are reflected in the other window and vice versa.</para>
- </listitem>
- </varlistentry>
--<!--kwrite in 4.2 has VI Input mode Meta+Ctrl+V -->
-+
- <varlistentry>
- <term>
- <anchor id="view-command-line"/><!-- only in power user mode -->
-@@ -1273,7 +1290,6 @@
- </listitem>
- </varlistentry>
- 
--<!-- only in 4.2, uncomment when backported to 4.1
- <varlistentry>
- <term><menuchoice><guimenuitem>Enlarge Font</guimenuitem></menuchoice>
- </term>
-@@ -1285,7 +1301,6 @@
- </term>
- <listitem><para>This decreases the display font size.</para></listitem>
- </varlistentry>
---->
- </variablelist>
- 
- </sect1>
-@@ -1360,7 +1375,7 @@
- </sect1>
- 
- <!-- This is also valid for kates menu tools, kate has additional items:
--Pipe to Terminal, Syncronizise Terminal with Current Dokument, Focus Terminal at top-->
-+Pipe to Terminal, Syncronizise Terminal with Current Document, Focus Terminal at top-->
- <sect1 id="tools">
- <title>The <guimenu>Tools</guimenu> Menu</title>
- 
-@@ -1865,7 +1880,7 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-branch.diff?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-runtime-branch.diff?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdebase-workspace-branch.diff?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepim-branch.diff?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepimlibs-branch.diff?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdesdk-branch.diff?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list