Commit graph

784 commits

Author SHA1 Message Date
Ignat Semenov
68d649b82e Arrange -> Arrange In for consistency with Sort By 2013-04-24 16:57:30 +04:00
Ignat Semenov
9d30c8d1f4 Sort Icons -> Sort By for consistency with Dolphin 2013-04-24 16:57:30 +04:00
Ignat Semenov
1b4a5b4aa0 make Descending a checkbox, not a combo 2013-04-24 16:57:27 +04:00
Ignat Semenov
91b007d428 change i18nc context comment for simplicity 2013-04-24 16:56:26 +04:00
Ignat Semenov
a8ddc6bb67 simplify alignment action strings 2013-04-24 16:56:26 +04:00
Ignat Semenov
efbd7ec1fb Verbify Layout and Alignment, reword Layout for less technical 2013-04-24 16:56:26 +04:00
Ignat Semenov
fcb97d234e verbify Sorting for consistency 2013-04-24 16:56:26 +04:00
Ignat Semenov
ec33d65184 an attempt at categorizing the settings 2013-04-24 16:56:25 +04:00
Ignat Semenov
7fd7f69ab9 icon arrangement mega-patch for usability and maintainability
This splits the enum IconView::Flow into two enums
- IconView::Layout { Rows, Columns }
- IconView::Alignment { Left, Right }

Note that Qt::Alignment is not used to emphasize the fact that
these two properties are orthogonal (layoutDirection() is used
e.g. to place the scrollbar at the correct side of the screen,
whereas IconView::Alignment is about the side of the screen
the user want their icons to stick to.

This patch greatly improves the readability of the IconView
layouting code, as well as the user-friendliness of the
applet's Display configuration page, with a distinct separation
of the two layout-related factors.

Corresponding context menu actions have been added. They update
the configuration dialog combos when selected if the dialog is
open at that moment.

CCBUG:306537
2013-04-24 16:56:23 +04:00
Ignat Semenov
b77e0f6655 only show Unsorted when the view is manually sorted 2013-04-24 16:47:29 +04:00
Ignat Semenov
fe3290d9db avoid a potential stall: QComboBox::maxCount() -> QComboBox::count() 2013-04-24 16:47:28 +04:00
Ignat Semenov
3a7b07633d hardcoded -1 -> enum FolderView::Unsorted 2013-04-24 16:47:28 +04:00
Ignat Semenov
7665ee95af keep 4 context menu checkboxes and Display page in sync 2013-04-24 16:47:28 +04:00
Ignat Semenov
9bf43b7459 update the order, direction, flow combos on menu actions 2013-04-24 16:47:28 +04:00
Ignat Semenov
8b3cb0f09e if the user has moved the icons, update the combo 2013-04-24 16:47:28 +04:00
Ignat Semenov
7d6669c25b even less code duplication 2013-04-24 16:47:28 +04:00
Ignat Semenov
f407bf3f33 --code duplication 2013-04-24 16:47:28 +04:00
Ignat Semenov
69370f22f8 consistency++ 2013-04-24 16:47:28 +04:00
Ignat Semenov
7518b54ce3 not necessary 2013-04-24 16:47:28 +04:00
Ignat Semenov
2b272d99d5 QActionGroup + foreach loop -> less code 2013-04-24 16:47:28 +04:00
Ignat Semenov
d77e60ce6b add a "Folders first" checkbox to the Display config page
Allow the user to set the "Folders first" option using the Settings dialog.

BUG:306537
2013-04-24 16:47:21 +04:00
Ignat Semenov
7e2883afcf add a "Sort order" combo to the Display config page
Allow the user to change sorting order using the Settings dialog.
2013-04-24 16:47:13 +04:00
Ignat Semenov
35da405097 rename the flow enums for better readability 2013-04-24 16:47:13 +04:00
Ignat Semenov
08556ebdd3 add "Arrange icons" submenu to the context menu
Allow the user to change icon flow in an icon view using the context menu.

BUG:306537
2013-04-24 16:47:05 +04:00
Script Kiddy
b212ee8147 SVN_SILENT made messages (.desktop file) 2013-04-20 09:44:11 +02:00
Ignat Semenov
08d003fbdc avoid a potential stall: QComboBox::maxCount() -> QComboBox::count() 2013-04-16 22:47:50 +04:00
Eike Hein
6fb5b07f62 Merge branch 'KDE/4.10' 2013-04-15 16:27:18 +02:00
Eike Hein
ac18ec1712 Fix inadvertent losses of custom icon positions due to config handling.
The configChanged() implementation could unnecessarily schedule a
reload due to a bug in a has-this-config-element-changed comparison,
which would result in icon position losses in scenarios such as
changing the wallpaper or the workspace theme, without having touched
any sorting-related options. Further, OK'ing the config dialog could
undo the unsorted state entered by moving an icon while the dialog
was open; this is now handled by updating the sorting mode combo box
in the dialog after the icon is dropped.

The later relies on a preceding fix in kde-workspace.git to make
Applet::isUserConfiguring() work for containments if Folder View is
used as desktop containment.
2013-04-15 16:20:03 +02:00
Eike Hein
49bbb88343 Merge branch 'KDE/4.10' 2013-04-15 10:42:50 +02:00
Eike Hein
f979fab6c8 Tint icon by selection color if selected, consistent with Dolphin. 2013-04-15 10:42:34 +02:00
Eike Hein
15428f1910 Default to main view sorting defaults if the main view is unsorted. 2013-04-15 10:42:25 +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
Script Kiddy
246f429e18 SVN_SILENT made messages (.desktop file) 2013-03-26 16:54:49 +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
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
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
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
Patrick von Reth
e3cbdc2312 fixed build on non x11 systems
(cherry picked from commit 8e6d6a0f2d)
2013-02-19 16:10:06 +01:00