lp://qastaging/~kubuntu-members/kde-baseapps/4.11
- Get this branch:
- bzr branch lp://qastaging/~kubuntu-members/kde-baseapps/4.11
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kde-baseapps,branch=KDE%2F4.11.
Last successful import was .
Recent revisions
- 18126. By Emmanuel Pescosta <email address hidden>
-
Fix Bug 328262 - rename bug if you cancel when folder already exists
Only connect the renamingFailed signal if there is no item with the new name in the model yet.
BUG: 328262
FIXED-IN: 4.11.5
REVIEW: 114228 - 18125. By Andrea Iacovitti <email address hidden>
-
In case of 'system proxy' proxyType, NoProxyFor config key holds the name
of the env variable (e.g. no_proxy) and not its value. Because of this
KProtocolManager::noProxyFor( ) can not be used to get NoProxyFor config
setting in KProxyDialog::load() as it returns the content of the environment
variable and not its name.
Added helper method KSaveIOConfig::noProxyFor( ) to read that value directly
from config file.REVIEW: 114105
- 18124. By Yichao Yu <email address hidden>
-
Fix incorrect geometry updates in KItemListContainer
When resizing the window and when KItemListContai
ner::updateGeom etries
is called before the scrollbar visibility is updated, a relayout is
triggered in `m_controller->view() ->setGeometry` which updates the
scrollbar visibility and calls back to
`KItemListContainer::updateGeo metries` again. Since the first call,
which has the wrong geometry (due to the incorrect scrollbar states),
updates the geometries of the scene and viewport after the second call
(which has the right geometry!!) returns, the final result is a size
that corresponded to the old scrollbar state before this commit.This patch uses the new geometry of the view after updating it (since
it might not be the size we put in) and therefore makes the sizes
consistent.BUG: 327709
FIXED-IN: 4.11.4
REVIEW: 113939 - 18123. By Yichao Yu <email address hidden>
-
Fix scrollbar spacing when no scrollbar is visible in dolphin.
Before this commit, Dolphin reserved space for the scrollbar spacing
even when no scrollbar is visible resulting in a ugly gap in the view
when:1. the theme uses QStyle:
:SH_ScrollView_ FrameOnlyAround Contents and
2. the theme has a positive PM_ScrollView_ScrollBarSpacin g. QtCurve can have both while Oxygen have 1 but not 2.
To reproduce the problem with Oxygen style. Replace the
`width += ....` (which returns -2 or 0 for Oxygen) with `width += 2`.See more info here:
https://github. com/QtCurve/ qtcurve- qt4/issues/ 9#issuecomment- 28630517 CCBUG: 306631
FIXED-IN: 4.11.4
REVIEW: 113902 - 18122. By David Rosca
-
Do not select items when navigating back/forward with the mouse
If we detect that the user pressed the back/forward buttons while
hovering the empty space of the view, such that
DolphinView::slotMouseButto nPressed( int, Qt::MouseButtons) will request
that Dolphin navigates back/forward in the history, handling the mouse
press event should stop. This prevents the possible unexpected selection
of items in the new directory.BUG: 327412
FIXED-IN: 4.11.4 - 18121. By Wolfgang Bauer <email address hidden>
-
Revert "Files passed as arguments: Ignore unsupported files"
This reverts commit cd9e50ae4f3ded5
a78d0cfb09a6768 4a9c15d726. See bug#327224 for details.
- 18120. By Emmanuel Pescosta <email address hidden>
-
Fix Bug 287983 - Dolphin truncates tooltip information for long file names
Use KStringHandler and QTextLayout to wrap the text (file name)
into the maximum width of the label "name".Make use of QFontMetrics to calculate a font size aware tooltip size.
BUG: 287983
FIXED-IN: 4.11.3
REVIEW: 113101 - 18119. By Frank Reininghaus <email address hidden>
-
Fix broken view state restoration
The fix for bug 161385 (which was about Dolphin still showing an empty
view if a device that had been unmounted earlier was clicked in the
Places Panel) caused a regression: the view state (current item, scroll
position, Details View expansion state) was not restored any more when
going "Back".The reason is that "m_view->reload()" in
DolphinViewContainer:: setUrl( const KUrl& newUrl) was always executed
just after entering a directory, and that command overwrites this
information.Distinguishing between "change URL" and "reload the view" works better
if it's done in DolphinMainWindow instead of DolphinViewContainer. BUG: 326039
FIXED-IN: 4.11.3
REVIEW: 113290
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)