Commit graph

18598 commits

Author SHA1 Message Date
Weng Xuetian
914b8d88ae use plain text for information panel
REVIEW: 109129
BUG: 315693
CCBUG: 262464
2013-03-16 00:43:22 -04:00
Albert Astals Cid
72be4e2f45 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/dolphin.desktop
	konq-plugins/searchbar/searchbar.desktop
	konqueror/settings/kio/proxy.desktop
	konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop
	konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
	konqueror/settings/kio/uasproviders/googlebot.desktop
	konqueror/settings/kio/uasproviders/ie60oncurrent.desktop
	konqueror/settings/kio/uasproviders/op90oncurrent.desktop
	konqueror/settings/kio/uasproviders/safari20.desktop
	konqueror/sidebar/default_entries/history.desktop
	konqueror/sidebar/default_entries/root.desktop
	konqueror/sidebar/history_module/kcmhistory.desktop
2013-03-15 21:55:53 +01:00
Albert Astals Cid
ae044f0ee1 Make the image square
KIconLoader::global()->loadIcon is going to give us a square image so if
the image is not square the circle doesn't look like a circle anymore
and looks ultra ugly
2013-03-15 21:52:53 +01:00
Script Kiddy
7a4946e49a SVN_SILENT made messages (.desktop file) 2013-03-15 14:57:44 +01:00
Script Kiddy
d19745cd6a SVN_SILENT made messages (.desktop file) 2013-03-15 10:09:23 +01:00
Frank Reininghaus
d8abb9562b Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-15 00:28:40 +01:00
Frank Reininghaus
162d4500d6 Improve handling of filtered items when folders are deleted/collapsed
If an expanded folder with filtered children is collapsed or removed,
and the parent-child relationship cannot be determined by parsing the
URLs, this patch makes sure that the filtered children do not reappear
when the filter bar is cleared.

REVIEW: 109455
2013-03-15 00:23:57 +01:00
Frank Reininghaus
6be6988fb8 Prevent accidental deletion of home directory in Terminal Panel
The protection against unwanted execution of "rm -rf" when changing the
directory while entering the command did not work if there was never any
automatic "cd" command sent to the terminal before.

This patch ensures that Terminal Panel's member m_clearTerminal is
false after the initialization of the panel, such that the protection is
effective after that.

BUG: 316300
FIXED-IN: 4.10.2
REVIEW: 109431
2013-03-15 00:12:49 +01:00
Script Kiddy
de34d5edc9 SVN_SILENT made messages (.desktop file) 2013-03-14 17:08:18 +01:00
Script Kiddy
986aaa766f SVN_SILENT made messages (.desktop file) 2013-03-14 09:38:14 +01:00
Frank Reininghaus
ba9e8d0a2d Fix recent regressions when "Sort by Type" is used
This commit ensures that the mime types and icons are determined
synchronously for 200 ms when "Sort by Type" is enabled.

REVIEW: 109344
2013-03-12 19:26:36 +01:00
Frank Reininghaus
6ba70a6fbf Do not skip rows in when clicking the empty area of the scroll bar
The height of the header widget must be subtracted from the view's
height in Details View to determine the "pageStep" for the scroll bar.

BUG: 315619
FIXED-IN: 4.10.2
REVIEW: 109210
2013-03-11 18:18:44 +01:00
Frank Reininghaus
0d3225e389 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/kitemviews/kfileitemmodel.cpp
2013-03-10 18:31:23 +01:00
Frank Reininghaus
acec0e6509 Remove filtered children if the parent folder is collapsed
This is analogous to commit e053ecdcd5,
which fixes the same problem for the case that the parent folder is
deleted.

BUG: 316335
FIXED-IN: 4.10.2
REVIEW: 109343
2013-03-10 18:26:37 +01:00
Pino Toscano
d6bf09221c Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-08 00:14:52 +01:00
Albert Astals Cid
2c0c4aaf2d Clear the autosave folder at startup case there is some cruft in there 2013-03-08 00:09:11 +01:00
Frank Reininghaus
4fd9d3b677 Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-07 23:00:22 +01:00
Frank Reininghaus
25b44f6b8c Remove duplicated slot
The slot DolphinViewContainer::focusView(), introduced in commit
2f0114730d, is actually unnecessary
because DolphinViewContainer::requestFocus() provides the same
functionality already.
2013-03-07 22:58:48 +01:00
Albert Astals Cid
c9a896543a Remove my debug stuff, need to talk to ben before carrying on 2013-03-07 02:14:41 +01:00
Albert Astals Cid
19c61d53fa Try to find out why jenkins thinks has sessions to restore 2013-03-07 02:03:09 +01:00
Albert Astals Cid
b2c20a7b20 More debugging of where the unit test hangs
I have a hunch is because of askUserToRestoreAutosavedAbandonedSessions
2013-03-07 01:43:36 +01:00
Albert Astals Cid
dd0068a5aa Add some debugs to try to find where the test in jenkins dies 2013-03-07 01:22:46 +01:00
Daniel Kreuter
d784577562 Use a consistent way to group files by "Date"
Before this change, files were grouped by calendar weeks if they were
modified in the current month and ignoring the "first week day setting",
but by the actual distance measured in multiples of seven days if the
were modified last month.

This not only fixes the "ignores first week day" bug, but also the
problem that the inconsistencies in the algorithm could lead to a broken
grouping in the first days of a month (see screenshot in the review
request).

BUG: 181337
FIXED-IN: 4.11
REVIEW: 108667
2013-03-03 18:27:00 +01:00
Emmanuel Pescosta
fffb6412b7 Removed everything related to m_expandedParentsCountRoot ->
This concept is not needed anymore because of the new "determine parents and
expansion levels" approach

Side effect:
Enables treeview for trash, ...

REVIEW: 109191
2013-02-27 19:56:55 +01:00
Emmanuel Pescosta
8008bc233d Big Thanks to Frank Reininghaus, who helped me a lot with these
changes! :)

* Fixed the "Network browser" and "timeline" issues, by using the
KDirLister's itemsAdded(KUrl,KFileItemList) signal -> Use the
given Url to define the parent-child relationship.

* Changed the name of the slot "slotNewItems" to "slotItemsAdded"
for consistency with the signal.

* Use a QHash<KFileItem, ItemData*> instead of a QSet<KFileItem> to
store the filtered data (needed to keep the O(1) lookup for filtered
KFileItems in slotItemsDeleted + needed to fix bug 311912 "After
erasing a filter, some thumbnails randomly disappear")

* Made the determination of the "expandedParentsCount" slightly
simpler - just adding 1 to the parent's level (Also needed to fix the
"Network browser" and "timeline" issues)

FIXED-IN: 4.11.0
REVIEW: 109180
BUG: 304565
BUG: 311912
BUG: 312890
BUG: 315593
2013-02-27 13:35:20 +01:00
Script Kiddy
f90fc94304 SVN_SILENT made messages (.desktop file) 2013-02-24 13:53:42 +01:00
Burkhard Lück
08bf8537f1 remove consecutive duplicate word >the< 2013-02-24 11:18:03 +01:00
Burkhard Lück
8b6590d344 remove consecutive duplicate word >the< 2013-02-24 11:14:47 +01:00
Script Kiddy
d24c6fea78 SVN_SILENT made messages (.desktop file) 2013-02-24 08:13:35 +01:00
Script Kiddy
6ab5d58f27 SVN_SILENT made messages (.desktop file) 2013-02-22 17:54:48 +01:00
Script Kiddy
a4092f2aa2 SVN_SILENT made messages (.desktop file) 2013-02-22 06:41:23 +01:00
Jens Rutschmann
2f0114730d Return the focus from the filter bar to the view if Enter is pressed
BUG: 297140
FIXED-IN: 4.11.0
REVIEW: 109020
2013-02-19 22:43:55 +01:00
Luca Beltrame
5d0098a6f0 Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-19 19:32:09 +01:00
Patrick von Reth
e3cbdc2312 fixed build on non x11 systems
(cherry picked from commit 8e6d6a0f2d)
2013-02-19 16:10:06 +01:00
Frank Reininghaus
c256065775 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
	lib/konq/konq_operations.cpp
2013-02-19 15:45:44 +01:00
David Faure
bf7cdfca99 Update views showing trash:/ when restoring trashed files.
Thanks to A.J.Reddy for the investigation and initial patch, and thanks
to Frank Reininghaus for the testing.
FIXED-IN: 4.10.1
BUG: 252483
2013-02-19 11:19:18 +01:00
Frank Reininghaus
547d10aa16 Fix crash when clicking an action in context menu for a removed device
Devices can be added and removed while the context menu is open.
Sfter an action has clicked that needs to access a device, we therefore
have to check if its position in the model has changed, and more
importantly, if it is still there at all in order to prevent a crash.

BUG: 315298
FIXED-IN: 4.10.1
REVIEW: 108989
2013-02-18 23:58:31 +01:00
Frank Reininghaus
e053ecdcd5 Remove items from m_filteredItems if their parent is deleted
Fixes the problem that filtered children of expanded deleted folders
reappear if the filter is cleared.

BUG: 315210
FIXED-IN: 4.10.1
REVIEW: 108976
2013-02-18 23:50:38 +01:00
Thiago Macieira
81f7f6ac23 Make sure we find X11 libraries.
Both Konqueror and the folderview applet use X11 functions directly so
we need to make sure CMake is finding it. Right now, this works
because Qt4ConfigDependentSettings.cmake that is distributed with KDE
does an indirect find_package. The one in upstream CMake does not, so
it's a ticking time bomb and depends on installation configuration.
2013-02-18 08:59:10 -08:00
Aaron Seigo
331a177499 compare against new value, not against itself
typo found by Ömer Fadıl USTA
2013-02-17 12:27:24 +01:00
Aaron Seigo
342e894932 compare against new value, not against itself
typo found by Ömer Fadıl USTA
2013-02-17 12:23:36 +01:00
Frank Reininghaus
3cd883c1b0 Merge remote-tracking branch 'origin/KDE/4.10' 2013-02-17 12:17:01 +01:00
Frank Reininghaus
fbf64b3963 Another fix for KItemListControllerTest::testMouseClickActivation()
One one machine, I see that changing the global "single click" setting
fails. I don't know why that is the case, but I think we should better
just skip the test in that case and not hang forever.
2013-02-17 12:12:52 +01:00
Frank Reininghaus
35f0798894 Update Dolphin version to 2.2.60 2013-02-17 11:36:03 +01:00
Frank Reininghaus
daf12b8eb3 Prevent repeated re-layouting of all items while previews are generated
There was some code in KStandardItemListView::itemSizeHintUpdateRequired
already that was supposed to prevent an expensive re-layouting of all
items when a preview is received. However, it didn't quite work as
intended because also the "iconOverlays" role changed.

The new approach is to only re-layout if text of a visible role changes,
because this is the only way how the space needed by an item might
change (see KStandardItemListWidgetInformant::itemSizeHint()).

BUG: 315315
FIXED-IN: 4.10.1
REVIEW: 108984
2013-02-17 11:30:38 +01:00
Dawit Alemayehu
466f35b0e5 Shut the compiler up 2013-02-16 19:43:25 -05:00
Burkhard Lück
130f41ecaf change button to key suggested by Antoni Bella Pérez 2013-02-16 19:38:46 +01:00
Dawit Alemayehu
1cdbf2e53f Connect to the returnPressed signal if completionMode == CompletionNone.
BUG: 314736
FIXED-IN: 4.10.1
REVIEW: 108983
2013-02-16 11:59:02 -05:00
Ignat Semenov
b71c205996 style 2013-02-15 20:41:21 +04:00
Frank Reininghaus
bf94cb4ad7 Improve the recently added test testMouseClickActivation
The method to make sure that the first item is visible turned out to be
less reliable than I thought. This could make the test hang forever.
Moreover, this commit removes some trailing whitespace that had been
added accidentally.
2013-02-13 17:56:03 +01:00