Hello community,

here is the log from the commit of package kdebase4 for openSUSE:Factory 
checked in at 2013-12-11 14:32:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old)
 and      /work/SRC/openSUSE:Factory/.kdebase4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdebase4"

Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes        2013-12-02 
12:31:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes   2013-12-11 
14:32:44.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Nov 29 07:01:07 UTC 2013 - [email protected]
+
+- Update to 4.11.97
+   * KDE 4.12 RC 1 release
+   * See http://www.kde.org/announcements/announce-4.12-rc.php
+
+-------------------------------------------------------------------
+Sat Nov 23 22:15:48 UTC 2013 - [email protected]
+
+- Update to 4.11.95
+   * KDE 4.12 Beta 3 release
+   * See http://www.kde.org/announcements/announce-4.12-beta3.php
+
+-------------------------------------------------------------------

Old:
----
  kde-baseapps-4.11.90.tar.xz

New:
----
  kde-baseapps-4.11.97.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.nttX3X/_old  2013-12-11 14:32:45.000000000 +0100
+++ /var/tmp/diff_new_pack.nttX3X/_new  2013-12-11 14:32:45.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           kdebase4
-Version:        4.11.90
+Version:        4.11.97
 Release:        0
 Summary:        The Base KDE Apps
 License:        GPL-2.0+

++++++ kde-baseapps-4.11.90.tar.xz -> kde-baseapps-4.11.97.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kde-baseapps-4.11.90/doc/dolphin/index.docbook 
new/kde-baseapps-4.11.97/doc/dolphin/index.docbook
--- old/kde-baseapps-4.11.90/doc/dolphin/index.docbook  2013-11-14 
09:14:51.000000000 +0100
+++ new/kde-baseapps-4.11.97/doc/dolphin/index.docbook  2013-11-21 
00:51:08.000000000 +0100
@@ -747,6 +747,7 @@
 
 <sect2 id="finding-searching-in-file">
 <title>Finding Files and Searching in Files</title>
+<!-- FIXME search in hidden files + folders View -> Show Hidden Files has to 
be enabled ? -->
 <para>
 &dolphin; is capable of searching for files and for content in files. If 
<keycombo action="simul">
 &Ctrl;<keycap>F</keycap></keycombo> is pressed or <menuchoice> 
<guimenu>Edit</guimenu> 
@@ -1121,7 +1122,13 @@
 (<guilabel>Single-click to open files and folders</guilabel>) or a double mouse
 click (<guilabel>Double-click to open files and folders</guilabel>). In the
 latter case, a single mouse click will select the file or folder.
-</para></listitem>
+</para>
+<note>
+<para>This is a system wide setting and can be changed in the &systemsettings; 
in the
+<menuchoice><guimenu>Input Devices</guimenu> 
<guimenuitem>Mouse</guimenuitem></menuchoice> 
+module as well.</para>
+</note>
+</listitem>
 
 <listitem><para>
 Archives will be opened inside &dolphin;, and not in an external application, 
if
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kde-baseapps-4.11.90/dolphin/src/CMakeLists.txt 
new/kde-baseapps-4.11.97/dolphin/src/CMakeLists.txt
--- old/kde-baseapps-4.11.90/dolphin/src/CMakeLists.txt 2013-11-14 
09:14:51.000000000 +0100
+++ new/kde-baseapps-4.11.97/dolphin/src/CMakeLists.txt 2013-11-21 
00:51:08.000000000 +0100
@@ -170,7 +170,6 @@
     dolphinapplication.cpp
     dolphindockwidget.cpp
     dolphinmainwindow.cpp
-    dolphinnewfilemenu.cpp
     dolphinviewcontainer.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kde-baseapps-4.11.90/dolphin/src/dolphincontextmenu.cpp 
new/kde-baseapps-4.11.97/dolphin/src/dolphincontextmenu.cpp
--- old/kde-baseapps-4.11.90/dolphin/src/dolphincontextmenu.cpp 2013-11-14 
09:14:51.000000000 +0100
+++ new/kde-baseapps-4.11.97/dolphin/src/dolphincontextmenu.cpp 2013-11-21 
00:51:08.000000000 +0100
@@ -196,7 +196,7 @@
     if (m_selectedItems.count() == 1) {
         if (m_fileInfo.isDir()) {
             // setup 'Create New' menu
-            DolphinNewFileMenu* newFileMenu = new 
DolphinNewFileMenu(m_mainWindow->actionCollection(), this);
+            DolphinNewFileMenu* newFileMenu = new 
DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
             const DolphinView* view = 
m_mainWindow->activeViewContainer()->view();
             newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
             newFileMenu->checkUpToDate();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kde-baseapps-4.11.90/dolphin/src/kitemviews/kitemlistcontainer.cpp 
new/kde-baseapps-4.11.97/dolphin/src/kitemviews/kitemlistcontainer.cpp
--- old/kde-baseapps-4.11.90/dolphin/src/kitemviews/kitemlistcontainer.cpp      
2013-11-14 09:14:51.000000000 +0100
+++ new/kde-baseapps-4.11.97/dolphin/src/kitemviews/kitemlistcontainer.cpp      
2013-11-21 00:51:08.000000000 +0100
@@ -338,26 +338,28 @@
     int extra = frameWidth() * 2;
     QStyleOption option;
     option.initFrom(this);
+    int scrollbarSpacing = 0;
     if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, 
&option, this)) {
-        extra += style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, 
&option, this);
+        scrollbarSpacing = 
style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this);
     }
 
     const int widthDec = verticalScrollBar()->isVisible()
-                         ? extra + 
style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
+                         ? extra + scrollbarSpacing + 
style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
                          : extra;
 
     const int heightDec = horizontalScrollBar()->isVisible()
-                          ? extra + 
style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
+                          ? extra + scrollbarSpacing + 
style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
                           : extra;
 
-    rect.adjust(0, 0, -widthDec, -heightDec);
-
-    const QRectF newGeometry(0, 0, rect.width(), rect.height());
+    const QRectF newGeometry(0, 0, rect.width() - widthDec,
+                             rect.height() - heightDec);
     if (m_controller->view()->geometry() != newGeometry) {
         m_controller->view()->setGeometry(newGeometry);
 
-        
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(0, 
0, rect.width(), rect.height());
-        
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(QRect(0,
 0, rect.width(), rect.height()));
+        // Get the real geometry of the view again since the scrollbars
+        // visibilities and the view geometry may have changed in re-layout.
+        
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(m_controller->view()->geometry());
+        
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect());
 
         updateScrollOffsetScrollBar();
         updateItemOffsetScrollBar();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kde-baseapps-4.11.90/dolphin/src/panels/places/placesitem.cpp 
new/kde-baseapps-4.11.97/dolphin/src/panels/places/placesitem.cpp
--- old/kde-baseapps-4.11.90/dolphin/src/panels/places/placesitem.cpp   
2013-11-14 09:14:51.000000000 +0100
+++ new/kde-baseapps-4.11.97/dolphin/src/panels/places/placesitem.cpp   
2013-11-21 00:51:08.000000000 +0100
@@ -120,6 +120,10 @@
 
 void PlacesItem::setBookmark(const KBookmark& bookmark)
 {
+    if (bookmark == m_bookmark) {
+        return;
+    }
+
     m_bookmark = bookmark;
 
     delete m_access;
@@ -302,7 +306,15 @@
     if (role == "iconName") {
         m_bookmark.setIcon(icon());
     } else if (role == "text") {
-        m_bookmark.setFullText(text());
+        // Only store the text in the KBookmark if it is not the translation of
+        // the current text. This makes sure that the text is re-translated if
+        // the user chooses another language, or the translation itself 
changes.
+        //
+        // NOTE: It is important to use "KFile System Bookmarks" as context
+        // (see PlacesItemModel::createSystemBookmarks()).
+        if (text() != i18nc("KFile System Bookmarks", 
m_bookmark.text().toUtf8().data())) {
+            m_bookmark.setFullText(text());
+        }
     } else if (role == "url") {
         m_bookmark.setUrl(url());
     } else if (role == "udi)") {

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to