Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-09-18 07:57:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-25 10:58:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-09-18 07:57:42.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 13 16:21:36 UTC 2014 - [email protected] + +- Update to 4.14.1 + * KDE 4.14.1 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.1.php + +------------------------------------------------------------------- @@ -6 +13 @@ - * See http://www.kde.org/announcements/4.13/ + * See http://www.kde.org/announcements/4.14/ Old: ---- kde-baseapps-4.14.0.tar.xz New: ---- kde-baseapps-4.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Tt82fz/_old 2014-09-18 07:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.Tt82fz/_new 2014-09-18 07:57:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.14.0 +Version: 4.14.1 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.14.0.tar.xz -> kde-baseapps-4.14.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.14.0/dolphin/src/dolphinmainwindow.cpp new/kde-baseapps-4.14.1/dolphin/src/dolphinmainwindow.cpp --- old/kde-baseapps-4.14.0/dolphin/src/dolphinmainwindow.cpp 2014-08-13 07:58:14.000000000 +0200 +++ new/kde-baseapps-4.14.1/dolphin/src/dolphinmainwindow.cpp 2014-09-01 00:06:18.000000000 +0200 @@ -409,14 +409,6 @@ const bool placesSelectorVisible = !placesDock || !placesDock->isVisible(); tabPage->setPlacesSelectorVisible(placesSelectorVisible); - DolphinViewContainer* primaryContainer = tabPage->primaryViewContainer(); - connectViewSignals(primaryContainer); - - if (tabPage->splitViewEnabled()) { - DolphinViewContainer* secondaryContainer = tabPage->secondaryViewContainer(); - connectViewSignals(secondaryContainer); - } - tabPage->hide(); m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(primaryUrl)), @@ -701,10 +693,6 @@ DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex); tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled()); - if (tabPage->splitViewEnabled()) { - connectViewSignals(tabPage->secondaryViewContainer()); - } - updateViewActions(); } @@ -1260,7 +1248,17 @@ return; } + if (m_activeViewContainer) { + // Disconnect all signals between the old view container (container, + // view and url navigator) and main window. + m_activeViewContainer->disconnect(this); + m_activeViewContainer->view()->disconnect(this); + m_activeViewContainer->urlNavigator()->disconnect(this); + } + m_activeViewContainer = viewContainer; + connectViewSignals(viewContainer); + m_actionHandler->setCurrentView(viewContainer->view()); updateHistory(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.14.0/dolphin/src/dolphinviewcontainer.cpp new/kde-baseapps-4.14.1/dolphin/src/dolphinviewcontainer.cpp --- old/kde-baseapps-4.14.0/dolphin/src/dolphinviewcontainer.cpp 2014-08-13 07:58:14.000000000 +0200 +++ new/kde-baseapps-4.14.1/dolphin/src/dolphinviewcontainer.cpp 2014-09-01 00:06:18.000000000 +0200 @@ -110,6 +110,7 @@ m_view = new DolphinView(url, this); connect(m_view, SIGNAL(urlChanged(KUrl)), m_urlNavigator, SLOT(setUrl(KUrl))); connect(m_view, SIGNAL(urlChanged(KUrl)), m_messageWidget, SLOT(hide())); + connect(m_view, SIGNAL(directoryLoadingCompleted()), m_messageWidget, SLOT(hide())); connect(m_view, SIGNAL(writeStateChanged(bool)), this, SIGNAL(writeStateChanged(bool))); connect(m_view, SIGNAL(requestItemInfo(KFileItem)), this, SLOT(showItemInfo(KFileItem))); connect(m_view, SIGNAL(itemActivated(KFileItem)), this, SLOT(slotItemActivated(KFileItem))); @@ -277,6 +278,9 @@ const int unwrappedWidth = m_messageWidget->sizeHint().width(); m_messageWidget->setWordWrap(unwrappedWidth > size().width()); + if (m_messageWidget->isVisible()) { + m_messageWidget->hide(); + } m_messageWidget->animatedShow(); } @@ -459,7 +463,16 @@ void DolphinViewContainer::slotUrlIsFileError(const KUrl& url) { const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - slotItemActivated(item); + + // Find out if the file can be opened in the view (for example, this is the + // case if the file is an archive). The mime type must be known for that. + item.determineMimeType(); + const KUrl& folderUrl = DolphinView::openItemAsFolderUrl(item, true); + if (!folderUrl.isEmpty()) { + m_view->setUrl(folderUrl); + } else { + slotItemActivated(item); + } } void DolphinViewContainer::slotItemActivated(const KFileItem& item) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.14.0/dolphin/src/statusbar/dolphinstatusbar.cpp new/kde-baseapps-4.14.1/dolphin/src/statusbar/dolphinstatusbar.cpp --- old/kde-baseapps-4.14.0/dolphin/src/statusbar/dolphinstatusbar.cpp 2014-08-13 07:58:14.000000000 +0200 +++ new/kde-baseapps-4.14.1/dolphin/src/statusbar/dolphinstatusbar.cpp 2014-09-01 00:06:18.000000000 +0200 @@ -109,18 +109,19 @@ const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height(); const int contentHeight = qMax(fontHeight, zoomSliderHeight); + QFontMetrics fontMetrics(m_label->font()); + m_label->setFixedHeight(contentHeight); m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - m_zoomSlider->setFixedHeight(contentHeight); - m_zoomSlider->setMaximumWidth(150); + m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15); m_spaceInfo->setFixedHeight(contentHeight); - m_spaceInfo->setMaximumWidth(150); + m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 15); m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); m_progressBar->setFixedHeight(contentHeight); - m_progressBar->setMaximumWidth(150); + m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 15); QHBoxLayout* topLayout = new QHBoxLayout(this); topLayout->setMargin(0); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
