From c3b6867bf1134ea5efaa21591f973a287fe589fa Mon Sep 17 00:00:00 2001 From: Max Mansfield Date: Thu, 14 Apr 2016 01:03:09 -0600 Subject: [PATCH 1/2] Allow the user not colorize a ListItem.Standard element This is a very simple addition for development of the papyros/files-app. It allows a user to choose whether the icon on a ListItem.Standard is colorized or not. In a ListItem.Standard a user can now use the field "colorizeIcon:" which is an alias for "icon.colorize" in the item. This came to be an issue when attempting to list mimetype icons in the papyros files app as they were all using a ColorOverlay instead of an image. Changes: 1. Added a colorizeIcon property in ListItem.Standard which allows a user to turn the ColorOverlay on and off at will. --- src/listitems/Standard.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/listitems/Standard.qml b/src/listitems/Standard.qml index 120271da..8321e0f3 100644 --- a/src/listitems/Standard.qml +++ b/src/listitems/Standard.qml @@ -39,6 +39,7 @@ BaseListItem { property alias textColor: label.color property alias iconColor: icon.color + property alias colorizeIcon: icon.colorize dividerInset: actionItem.visible ? listItem.height : 0 From 994cfe0f2398f9867d18f0c5ec7427afa8aa969f Mon Sep 17 00:00:00 2001 From: Max Mansfield Date: Thu, 14 Apr 2016 02:20:45 -0600 Subject: [PATCH 2/2] Adds navigation_menu.svg to demo/icons folder to fix build The demo application is missing a dependency. This commit fixes it which will allow Travis CI to run reliably. Changes: 1. Copied the icons/navigation_menu.svg file to the demo/icons folder --- demo/icons/navigation_menu.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 demo/icons/navigation_menu.svg diff --git a/demo/icons/navigation_menu.svg b/demo/icons/navigation_menu.svg new file mode 100644 index 00000000..6c9b6bf9 --- /dev/null +++ b/demo/icons/navigation_menu.svg @@ -0,0 +1 @@ + \ No newline at end of file