Commit graph

18678 commits

Author SHA1 Message Date
Aurélien Gâteau
3a345558f8 Merge remote-tracking branch 'origin/KDE/4.10' 2013-04-12 16:31:03 +02:00
Aurélien Gâteau
c3a7ba4e0e Fix moving image while transitioning to hover pixmap
See: http://youtu.be/OMYO0U0kSL0

REVIEW: 109960
FIXED-IN: 4.10.3
2013-04-12 16:28:52 +02:00
Ignat Semenov
ed34d83fd5 no need to check pointer before deleting it 2013-04-11 16:38:56 +04:00
Ignat Semenov
b7364ade72 no need to check pointer before deleting it 2013-04-11 16:31:04 +04:00
Kai Uwe Broulik
05fb81861a Move Bluetooth places items to Device section of places list
REVIEW: 109622
BUG: 301276
2013-04-02 16:07:29 +02:00
Luca Beltrame
cb47cfdb17 Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
	plasma/applets/folderview/folderview.cpp
2013-03-27 16:50:22 +01:00
David Faure
b8c9aa55ff Update icon if it couldn't be determined upfront (.desktop file on slow mount)
This requires an up-to-date kdelibs >= 4.10.

CCBUG: 290666
2013-03-27 15:19:09 +01:00
Script Kiddy
246f429e18 SVN_SILENT made messages (.desktop file) 2013-03-26 16:54:49 +01:00
Frank Reininghaus
02f4a69f58 Improve grouping by name for non-ASCII file names
This commit prevents that all non-ASCII letters which are not umlauts
are grouped in a single group "Others", and that the joint group of
an ASCII letter and the associated umlaut in some locales is called
"Others" if there is only the umlaut in the group.

BUG: 315569
REVIEW: 109457
FIXED-IN: 4.10.2
2013-03-26 01:21:34 +01:00
Ignat Semenov
c3b160dae8 unbreak build with a Q_DECLARE_METATYPE 2013-03-25 22:36:48 +04:00
Ignat Semenov
c7884e2122 unbreak build with a Q_DECLARE_METATYPE 2013-03-25 22:30:47 +04:00
Ignat Semenov
391fd1b7a5 int -> QVariant for IconView::Flow 2013-03-25 22:21:33 +04:00
Ignat Semenov
f5d55278d2 int -> QVariant for IconView::Flow 2013-03-25 22:15:00 +04:00
Luca Beltrame
0dc35cadbe Merge remote-tracking branch 'origin/KDE/4.10'
Ignat, can you check whether everything is correct? The general policy
in kde-baseapps when committing to stable branches is to commit in stable,
then merge to master.

CCMAIL: ignat.semenov@blue-systems.com

Conflicts:
	plasma/applets/folderview/folderview.cpp
	plasma/applets/folderview/folderview.h
2013-03-25 14:38:36 +01:00
Ignat Semenov
3b1bc8346f rename the applet to "Folder" 2013-03-25 16:18:01 +04:00
Aaron Seigo
8cd943f5c1 automatically focus the line edit when custom title is selected 2013-03-25 15:51:02 +04:00
Aaron Seigo
edd0e0405c buddies, tab order, click message 2013-03-25 15:50:49 +04:00
Aaron Seigo
3c9f0c2d5a a colon (:) after Title as per the gui guidelines 2013-03-25 15:50:31 +04:00
Ignat Semenov
4197a2b88b redo the title configuration ui
- move the title configuration UI to the Location page
- use one combobox + one lineedit
- use an enum instead of comparing strings
- clean up the code

BUG:313940
FIXED-IN:4.11
2013-03-25 15:49:20 +04:00
Ignat Semenov
5fb0a7236b streamline the filter combobox code
- int m_filterType -> ProxyModel::FilterType m_filterType
- ProxyModel::filterModeFromInt(int) -> static_cast<ProxyModel::FilterType>(int)
- int -> QVariant<ProxyModel::FilterType> in the config UI
- selectUnselectAll() -> two separate methods; eliminate sender() call

This also fixes filterChanged() and configAccepted() wrt this config key.
Use the actual filter mode value instead of the combobox index which is
error-prone in case the order of the items in the combobox changes.

BUG:317323
FIXED_IN:4.10.2
2013-03-25 15:48:33 +04:00
Ignat Semenov
050a8c33aa streamline the filter combobox code
- int m_filterType -> ProxyModel::FilterType m_filterType
- ProxyModel::filterModeFromInt(int) -> static_cast<ProxyModel::FilterType>(int)
- int -> QVariant<ProxyModel::FilterType> in the config UI
- selectUnselectAll() -> two separate methods; eliminate sender() call

This also fixes filterChanged() and configAccepted() wrt this config key.
Use the actual filter mode value instead of the combobox index which is
error-prone in case the order of the items in the combobox changes.

BUG:317323
FIXED_IN:4.10.2
2013-03-25 15:41:56 +04:00
Aurélien Gâteau
d71127de44 Merge remote-tracking branch 'origin/KDE/4.10'
@emmanuel: this merge includes your fix from
https://git.reviewboard.kde.org/r/109488/ . I assume this is not a
problem.

CCMAIL: emmanuelpescosta099@gmail.com
2013-03-21 14:14:55 +01:00
Aurélien Gâteau
472608e866 Fix transition between m_pixmap and m_hoverPixmap
The default SourceOver composition mode of QPainter cannot be used
to interpolate between two images, we must use intermediate buffers
to perform the interpolation and blend the result on the widget.

More details are available in the review request.

REVIEW: 109614
FIXED-IN: 4.10.2
2013-03-21 14:06:07 +01:00
Script Kiddy
3460b8d705 SVN_SILENT made messages (.desktop file) 2013-03-19 16:32:25 +01:00
Script Kiddy
cafcf8c7be SVN_SILENT made messages (.desktop file) 2013-03-18 08:51:35 +01:00
Emmanuel Pescosta
d3ad8f5937 Refresh all expanded directories too, when reloading a directory.
BUG: 295300
FIXED-IN: 4.10.2
REVIEW: 109488
2013-03-17 20:13:55 +01:00
Script Kiddy
964978ec70 SVN_SILENT made messages (.desktop file) 2013-03-17 13:29:34 +01:00
Pino Toscano
f8dda9345c i18n: use i18n instead of tr 2013-03-17 11:31:34 +01:00
Script Kiddy
595c406267 SVN_SILENT made messages (.desktop file) 2013-03-17 08:51:53 +01:00
Weng Xuetian
ffef5a7f4a Merge remote-tracking branch 'origin/KDE/4.10' 2013-03-16 00:47:11 -04:00
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