Skip to content
  • Arjen Hiemstra's avatar
    Merge branch "krita-sketch_theming-ahiemstra" · dc30f5d8
    Arjen Hiemstra authored
    Squashed commit of the following:
    
    commit f4929087b263c7387afb4f6275bfb5e6a005ef11
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Mar 21 11:45:44 2014 +0100
    
        sketch: Use states for switching TextField border style
    
        This makes it possible to override the normal border colour without it
        messing up when you focus the text field.
    
    commit 514a93572e02d67333c8a78931e37337efeb6c48
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Mar 21 11:35:04 2014 +0100
    
        sketch: Fix a merge error in NewImageList
    
    commit 73afe4f13f0b87a5e0d03e5b5d39c9de2624555b
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Fri Mar 21 11:33:28 2014 +0100
    
        sketch: Use the theme for the new CustomImagePage
    
    commit be19b6fa7afd578921b4075fb506cd8d95933867
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 19 11:52:02 2014 +0100
    
        sketch: Use relative font sizing based on "line height"
    
        Line height depends on the window height and thus we get scaling fonts
        again.
    
    commit a18403bf2e502670589f548266590957f4c68946
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Mar 13 18:49:40 2014 +0100
    
        sketch: Add missing icons for locked/visible layers
    
    commit 20c000b4fd2a4eed5a1f91c70d18113b801596cd
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Mar 13 18:48:52 2014 +0100
    
        sketch: Support loading the theme on windows
    
    commit a46bf151b26f9b4d128e0c1522fec492e43225a2
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Mar 13 18:48:07 2014 +0100
    
        sketch: also remove the fonts from CMakeLists
    
    commit 9954ac47aed43ab1f148ac8a5486d61bf7a7d601
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:29:00 2014 +0100
    
        sketch: Remove the old theme code from Constants
    
    commit 0ba3de6357d00c1bda047a3970996a2c5bbad49a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:28:04 2014 +0100
    
        sketch: Use "nothing-to-configure.qml" for filters without config rather than duplicating things
    
    commit b74c9898679810f818b39c66b13efbf281954df3
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:27:30 2014 +0100
    
        sketch: Use the correct icons for some items
    
    commit 283eb65f24be5b51ba8de922410c8987fcd4e3e7
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:24:24 2014 +0100
    
        sketch: Use Shadow for shadows on Panels
    
    commit 6b49ff1c679118ee8639d8a96a6e60da44460491
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:23:43 2014 +0100
    
        sketch: Default the apply button to not visible
    
    commit 5431ff0819a27f47dba3735f0566ecd0cecc774a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:22:30 2014 +0100
    
        sketch: Use theme for tool config pages where needed
    
    commit 6ba6e9adaff7a89c7e4a41b687c232d294e9d2e8
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:21:21 2014 +0100
    
        sketch: Update filter config pages to use theme where needed
    
        Also simplifies the "no config needed" pages to use a single common
        component.
    
    commit b6f5cc8f61a33a3eadbc0b7e8f329404fe18a56f
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:20:33 2014 +0100
    
        sketch: Update Welcome/Open/Save pages to use new API in themes/components
    
    commit ae2a0ffd657094ecd8ed01463b298caeafd0a0e2
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:19:34 2014 +0100
    
        sketch: Use theme for TextField styling
    
    commit cf49cd25db9e561fab2e8b0c9cf01efe85fd55e8
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:19:06 2014 +0100
    
        sketch: Use theme for Slider colours
    
    commit 1c45a2207b6ec8fad3d347a72af586843664659a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:18:37 2014 +0100
    
        sketch: Use theme for ScrollDecorator colours
    
    commit 13157dcf22997eb5d8354feeb1984db378030690
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:18:18 2014 +0100
    
        sketch: Use theme for RecentFileList colours
    
    commit 738eca13a32bc8665aa6bd0c4102e2d97f8467cc
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:17:51 2014 +0100
    
        sketch: Use theme for PanelTextField colours
    
    commit e235e210d9f156588c34960f2ac9fc77106f0530
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:17:25 2014 +0100
    
        sketch: Use theme for NewsList properties
    
    commit 67f17edbfbb419d811fb34e31be0ca18f4bf9e5a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:16:57 2014 +0100
    
        sketch: Use theme for icons in NewImageList
    
    commit aca8835b9d94d1e9f8059ee15eda55ec24d06d7d
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:16:16 2014 +0100
    
        sketch: Use theme/shadow for some more properties of components
    
    commit 187aa75160eabeb2fe7fd52202aebb4beeaa54eb
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:07:19 2014 +0100
    
        sketch: Use the theme for getting the Divider image
    
    commit a5b9d1095841d7c4b3d93076df20d66868050c28
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:07:00 2014 +0100
    
        sketch: Use the Shadow component in Dialog
    
    commit 8e47d08513b869d2837032fba76524b99e189d82
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:06:28 2014 +0100
    
        sketch: Get the BusyIndicator image from the theme
    
    commit cac0e05cd6b0d6d2177ad82256a6def957410d5b
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 20:05:33 2014 +0100
    
        sketch: Add a common Shadow component so we can reuse that for shadows
    
    commit 416a86b254ebdfd11a1f26ad66f1e1313eef3676
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:30:09 2014 +0100
    
        sketch: Implement all of the current theme colours in the theme system
    
    commit 33e51794c6271372472fa35ff7d09cb5230e8986
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:26:24 2014 +0100
    
        sketch: Move the custom fonts into the theme
    
    commit 5e38d7cf1e6c8431a88b5c3079ff36aa385a7e27
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:25:33 2014 +0100
    
        sketch: Add images to the default theme
    
    commit 8645b67ca53519eac7bf55fde630c0cacd79e239
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:24:25 2014 +0100
    
        sketch/gemini: Remove hard-coded added fonts
    
        This is now handled by the theme system
    
    commit 10a39146b16994a57fda3d4ca952878b0d37d796
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:22:48 2014 +0100
    
        sketch: Improve Theme handling in Settings
    
    commit 52db98131c4925a064acbab08e2b4daff817d7b5
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:21:14 2014 +0100
    
        sketch: Add a static method to Theme to create a theme instance
    
    commit 6bf9ed46bf25ee2ddede71edaadf85dd7713f084
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 19:11:10 2014 +0100
    
        sketch: Add a singleton class to keep track of the Qml engine
    
    commit e9c59c1f521c6e1f4145a1c141b0c0b576d939bf
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:41:27 2014 +0100
    
        sketch: Implement the last missing bits for Theme inheritance to work
    
    commit d0c18e0fe5cbbbd14ee740c6086b1c02bf235f5f
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:38:53 2014 +0100
    
        sketch: Cache colours that have been requested in the Theme
    
    commit 84e22d750713869aaec06bfe8fcdeeb8295e2c8a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:35:15 2014 +0100
    
        sketch: Check icons for existence before returning
    
    commit b9fc7330283e08aa572384d8af97017ffcbd8f19
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:32:23 2014 +0100
    
        sketch: Add a fontPath property and allow adding fonts through the theme
    
    commit 0a9435aeef1d800703294352496c01cabc591050
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:19:31 2014 +0100
    
        sketch: Add a way to get images and an imagePath property to Theme
    
    commit 72d4cd062fe5ab495f5b2569ca6c5fa7ee09bcc1
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Wed Mar 12 18:14:25 2014 +0100
    
        sketch: Add some documentation for the properties of the Theme object
    
    commit 0123edf1cb17d7f19aedf56f29d7c7834c96ddde
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:24:44 2014 +0100
    
        sketch: Fix grow/shrink/etc selection actions
    
    commit 90877c7368a38dbcefdcd9116540ac77345a46f0
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:24:18 2014 +0100
    
        sketch: Use theme for select panel icons/colours
    
    commit e6e05bf0f91ebc4492a53e5e8c5672d4fb4a3ddc
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:15:47 2014 +0100
    
        sketch: Use theme for layers panel colours/icons
    
    commit 6de935988a36330d9827f4cf3980df9dee2df189
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:14:48 2014 +0100
    
        sketch: Use theme for filter panel colours/icons
    
    commit 7f8a009b4d0265e4d96baba436655237df1e862e
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:14:11 2014 +0100
    
        sketch: Use theme for open/new image panels
    
    commit 073859985e749002ea7828b17057a87c1327d857
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:13:44 2014 +0100
    
        sketch: Use theme for menu panel
    
    commit dc292126afece19c9ba99213a8df54c810713013
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:13:02 2014 +0100
    
        sketch: Use theme for drop area colours
    
    commit 0dcfc9869a112d0534ca126359cfd70a673b930a
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:12:31 2014 +0100
    
        sketch: Put panel colors into a panels/ item in the theme
    
    commit dfb4a4c0b22cef7a74b927cd526fc4244bbc94dc
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:11:45 2014 +0100
    
        sketch: Use theme for a few more things in PresetsPanel
    
    commit 63db5326a45274464e348be4bfece844c735fa41
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 16:10:50 2014 +0100
    
        sketch: Remove lots of unnecessary setters from ToolPanel and theme a few others
    
    commit dace4f544d5f3cdd6be974049ae63081b9491338
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:55:50 2014 +0100
    
        sketch: Remove obsolete property setters from ColorPanel
    
    commit b05b8cf905f6c0c2fd23d8df67e126cc881ad41f
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:54:49 2014 +0100
    
        sketch: Use theme for MessageStack styling
    
    commit 725e87c31a349448fbe8ed40ed168cc746413d2b
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:54:12 2014 +0100
    
        sketch: Use theme for ListItem styling
    
    commit 5cca9954e5ae679972c8f0e1c6187daa55fd5287
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:53:58 2014 +0100
    
        sketch: Use theme for LAbel styling
    
    commit 1fb61a3834834185d1dc35fd6e48db709fc71c9c
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:53:42 2014 +0100
    
        sketch: Use theme for Header stylign
    
    commit d2571c5dc057137958fd7f1910cb31c3db2a20af
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:53:25 2014 +0100
    
        sketch: Use theme for combo box styling
    
    commit b03552b8e73fb9412e62406a1577c0247b594117
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:53:10 2014 +0100
    
        sketch: Use theme for dialog styling
    
    commit 3e615950b009f55270a001e547d67e5a89ab45fa
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:52:53 2014 +0100
    
        sketch: Use theme for ColorSwatch styling
    
    commit 3a0f0114d265fbe342e46b8481da7246f32080d6
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:52:37 2014 +0100
    
        sketch: Use theme for CheckBox styling
    
    commit eb651bd63fb376d6e6da469976ee34f0b439e1b8
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:52:16 2014 +0100
    
        sketch: Use theme for Button styling
    
    commit a2cb68316bae11eb7cfe6e0219c0185126995b64
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:46:34 2014 +0100
    
        sketch: Use theme for Welcome page icons/colors
    
    commit 16d037cbfd1d606f7c6e3ed7e8b7a359377ce7f5
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:38:09 2014 +0100
    
        sketch: Use theme for open/save page icons and colours
    
    commit 34dfd98887998c4985b8904f5ff2873544784e51
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:34:50 2014 +0100
    
        sketch: Update default theme with many colors, fonts, etc.
    
    commit 88fd2f7f1845eab010fda31646826e53e5ad8e33
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:33:12 2014 +0100
    
        sketch: Implement font lookup support in themes
    
    commit 42333ea5f279ad7b6e4a3433212b173b0a77dfa6
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:32:30 2014 +0100
    
        sketch: Use the proper font files, not 0b empty ones
    
    commit 88fa305d71315e54ca6f8f90928897e7af6e48df
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Mon Mar 3 15:31:14 2014 +0100
    
        sketch/gemini: Don't force the application font
    
    commit 50e9319d2bec718dc3a8d7e28691e2a1d84c7514
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Feb 20 13:52:58 2014 +0100
    
        sketch: Start using the theme object for panel colours and icons
    
    commit 58a4b738c9f3ab724fa73806a36b6fdbbf237b2c
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Feb 20 13:52:08 2014 +0100
    
        sketch: Add a default theme
    
    commit b4870ed41785dc0d915897b1959774ebe23d1f4e
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Feb 20 13:51:42 2014 +0100
    
        sketch: Add a theme class and make it available through the Settings object
    
    commit b118298922762b3f5e4dde96a41d0e8e8173caf7
    Author: Arjen Hiemstra <ahiemstra@heimr.nl>
    Date:   Thu Feb 20 13:49:54 2014 +0100
    
        sketch: Add a proper export file and use it.
    dc30f5d8