FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on solarized skin.

Browse Source
This commit is contained in:
Martin Rotter 2014-09-24 08:20:45 +02:00
parent 9585e2480e
commit 95e7b5cfc3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/skins/base/solarized.xml
View File

@ -5,8 +5,8 @@
<name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author>
<style>plastique,fustion</style>
<style>plastique,fusion</style>
<markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4gICANCiAgICAgIGJvZHkgeyAgDQogICAgICAgIG1hcmdpbjogMHB4Ow0KICAgICAgICBwYWRkaW5nOiAwcHg7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICNmZGY2ZTM7DQogICAgICB9DQogICAgDQogICAgICBwcmUgew0KICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7DQogICAgICB9DQogICAgICANCiAgICAgIC5jb250YWluZXIgew0KICAgICAgICBmb250LWZhbWlseTogIlRyZWJ1Y2hldCBNUyIsIEhlbHZldGljYSwgc2Fucy1zZXJpZjsNCiAgICAgICAgY29sb3I6ICM2NTdiODM7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXJ0ZXh0IHsNCiAgICAgICAgZm9udC1zaXplOiAyMHB4Ow0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIHsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogIzAwMmIzNjsgLyogUmVtb3ZlIHRvIGdldCByaWQgb2Ygc3BlY2lhbCBjb2xvciBmb3IgaGVhZGVyLiAqLw0KICAgICAgICBjb2xvcjogIzgzOTQ5NjsgLyogUmVtb3ZlIHRvIGdldCByaWQgb2Ygc3BlY2lhbCBjb2xvciBmb3IgaGVhZGVyLiAqLw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgICBmb250LXNpemU6IDE2cHg7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgIH0NCg0KICAgICAgYSwgYTphY3RpdmUsIGE6dmlzaXRlZCB7DQogICAgICAgIGNvbG9yOiAjMjY4YmQyOw0KICAgICAgICB3b3JkLXdyYXA6IGJyZWFrLXdvcmQ7DQogICAgICB9DQogICAgICANCiAgICAgIGE6aG92ZXIgew0KICAgICAgICBjb2xvcjogIzgzOTQ5NjsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgOjpzZWxlY3Rpb24gew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDczNjQyOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJvcmRlcjogMC41cHggc29saWQgYmxhY2s7DQogICAgICAgIHBhZGRpbmc6IDEycHg7DQogICAgICAgIGZvbnQtc2l6ZTogMTJweDsNCiAgICAgIH0NCiAgICA8L3N0eWxlPg0KICAgIDx0aXRsZT4NCiAgICAgICUxDQogICAgPC90aXRsZT4NCiAgPC9oZWFkPg0KICA8Ym9keT4NCiAgICAlMg0KICA8L2JvZHk+DQo8L2h0bWw+</markup_wrapper>
<markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPiUxPC9kaXY+DQogICAgICAgICUyLCAlNQ0KICAgICAgICA8YnIvPg0KICAgICAgICA8YSBocmVmPSIlMyI+JTM8L2E+DQogICAgICA8L2Rpdj4NCiAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPiU0PC9kaXY+DQogICAgPC9kaXY+</markup>
<data>UVdpZGdldCB7DQogIGNvbG9yOiAjNjU3YjgzOw0KICBiYWNrZ3JvdW5kLWNvbG9yOiAjZmRmNmUzOw0KfQ0KDQpRV2lkZ2V0OjppdGVtOmhvdmVyLCBRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQsIFFUcmVlVmlldzo6YnJhbmNoOnNlbGVjdGVkLA0KUVRyZWVWaWV3OjppdGVtOnNlbGVjdGVkOmFjdGl2ZSxRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQ6IWFjdGl2ZSwgUVRyZWVWaWV3OjppdGVtOmhvdmVyIHsNCiAgYmFja2dyb3VuZC1jb2xvcjogUUxpbmVhckdyYWRpZW50KHgxOiAwLCB5MTogMCwgeDI6IDAsIHkyOiAxLCBzdG9wOiAwICNjNzMyN2EsIHN0b3A6IDEgI2QzMzY4Mik7DQogIGNvbG9yOiB3aGl0ZTsNCn0NCg0KUVdpZGdldDpkaXNhYmxlZCB7DQogIGNvbG9yOiBncmF5Ow0KICBiYWNrZ3JvdW5kLWNvbG9yOiAjZmRmNmUzOw0KfQ0KICANClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczohYWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gew0KICBib3JkZXItaW1hZ2U6IHVybChxc3MvZHVtbXkucG5nKSAwOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDohaGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6YWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzOmNsb3NlZCwNClFUcmVlVmlldzo6YnJhbmNoOmNsb3NlZDpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLWNsb3NlZC5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzLA0KUVRyZWVWaWV3OjpicmFuY2g6b3BlbjpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLW9wZW4ucG5nKTsNCn0NCg0KUVRyZWVWaWV3OjppdGVtIHsNCiAgcGFkZGluZzogMXB4Ow0KfSANCg0KUVRyZWVWaWV3W2hpZGVUcmVlPSJ0cnVlIl06OmJyYW5jaDohaGFzLWNobGlkcmVuOmhhc1NpYmxpbmdzIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogbm9uZTsNCn0NCg0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogbm9uZTsNCn0NCg0KUVNwbGl0dGVyOjpoYW5kbGUgew0KICB3aWR0aDogMXB4Ow0KICBiYWNrZ3JvdW5kLWNvbG9yOiAjODhhNmIxOw0KfQ0KDQpRU3BsaXR0ZXI6OmhhbmRsZTp2ZXJ0aWNhbCB7DQogIG1hcmdpbjogMXB4IDBweCAxcHggMHB4Ow0KfQ0KDQpRU3BsaXR0ZXI6OmhhbmRsZTpob3Jpem9udGFsIHsNCiAgbWFyZ2luOiAwcHggMXB4IDBweCAxcHg7DQp9DQoNClFTdGF0dXNCYXIgUVRvb2xCdXR0b24gew0KICBtYXJnaW4tbGVmdDogNXB4Ow0KICBtYXJnaW4tcmlnaHQ6IDVweDsNCn0NCg0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogdHJhbnNwYXJlbnQ7DQp9DQoNClFQcm9ncmVzc0JhciB7DQogIGJvcmRlcjogdHJhbnNwYXJlbnQ7DQogIHRleHQtYWxpZ246IGNlbnRlcjsNCn0NClFQcm9ncmVzc0Jhcjo6Y2h1bmsgew0KICBiYWNrZ3JvdW5kLWNvbG9yOiBRTGluZWFyR3JhZGllbnQoeDE6IDAsIHkxOiAwLCB4MjogMCwgeTI6IDEsIHN0b3A6IDAgI2M3MzI3YSwgc3RvcDogMSAjZDMzNjgyKTsNCiAgd2lkdGg6IDNweDsNCiAgbWFyZ2luOiAwLjVweDsNCn0NCg0KUU1lbnVCYXIgew0KICBiYWNrZ3JvdW5kOiBRTGluZWFyR3JhZGllbnQoeDE6MCwgeTE6MCwgeDI6MCwgeTI6MSwgc3RvcDowICNlMGVlZTAsIHN0b3A6MC40ICNkOGVlZDgsIHN0b3A6MC41ICNjY2VlY2MsIHN0b3A6MSAjZTBlZWUwKTsNCiAgY29sb3I6ICMwMDAwMDA7DQogIHBhZGRpbmc6IDFweDsNCn0NCg0KUU1lbnVCYXI6Oml0ZW0gew0KICBwYWRkaW5nOiAzcHggNnB4Ow0KICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsNCn0NCg0KUU1lbnVCYXI6Oml0ZW06c2VsZWN0ZWQgew0KICBib3JkZXI6IDFweCBzb2xpZCAjODRjYzg0Ow0KICBiYWNrZ3JvdW5kOiBRTGluZWFyR3JhZGllbnQoeDE6MCwgeTE6MCwgeDI6MCwgeTI6MSwgc3RvcDowICNlOWZmZTksIHN0b3A6MC40ICNlMWVlZTEsIHN0b3A6MC41ICNkOWVlZDksIHN0b3A6MSAjZTlmZmU5KTsNCn0NCg0KUU1lbnVCYXI6Oml0ZW06cHJlc3NlZCB7DQogIGJvcmRlcjogMXB4IHNvbGlkICMzNGFhMzQ7DQogIGJvcmRlci1ib3R0b206IG5vbmU7DQogIGJhY2tncm91bmQ6IFFMaW5lYXJHcmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgIzdhY2M3YSwgc3RvcDowLjQgIzcwYzg3MCwgc3RvcDowLjUgIzYwYzQ2MCwgc3RvcDoxICM3YWNjN2EpOw0KICBjb2xvcjogd2hpdGU7DQp9</data>
<data>UVdpZGdldCB7DQogIGNvbG9yOiAjNjU3YjgzOw0KICBiYWNrZ3JvdW5kLWNvbG9yOiAjZmRmNmUzOw0KfQ0KDQpRV2lkZ2V0OjppdGVtOmhvdmVyIHsNCiAgYmFja2dyb3VuZC1jb2xvcjogI2VlZThkNTsNCiAgY29sb3I6ICM2NTdiODM7DQp9DQoNClFXaWRnZXQ6ZGlzYWJsZWQgew0KICBjb2xvcjogZ3JheTsNCiAgYmFja2dyb3VuZC1jb2xvcjogI2ZkZjZlMzsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOiFoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6Y2xvc2VkLA0KUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtY2xvc2VkLnBuZyk7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3MsDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtb3Blbi5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW0gew0KICBwYWRkaW5nOiAxcHg7DQp9IA0KDQpRVHJlZVZpZXdbaGlkZVRyZWU9InRydWUiXTo6YnJhbmNoOiFoYXMtY2hsaWRyZW46aGFzU2libGluZ3Mgew0KICBib3JkZXItaW1hZ2U6IG5vbmU7DQogIGltYWdlOiBub25lOw0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQsIFFUcmVlVmlldzo6YnJhbmNoOnNlbGVjdGVkLCBRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQ6YWN0aXZlLCBRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQ6IWFjdGl2ZSwgUVRyZWVWaWV3OjppdGVtOmhvdmVyIHsNCiAgYmFja2dyb3VuZC1jb2xvcjogI2VlZThkNTsNCiAgY29sb3I6ICM2NTdiODM7DQp9DQoNClFUb29sVGlwIHsNCiAgYm9yZGVyOiAxcHggc29saWQgIzg4YTZiMTsNCiAgYmFja2dyb3VuZC1jb2xvcjogI2ZkZjZlMzsNCiAgY29sb3I6ICM2NTdiODM7DQogIGJvcmRlci1yYWRpdXM6IDFweDsNCiAgb3BhY2l0eTogMjIwOw0KfQ0KIA0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogbm9uZTsNCn0NCg0KUVNwbGl0dGVyOjpoYW5kbGUgew0KICB3aWR0aDogMXB4Ow0KICBiYWNrZ3JvdW5kLWNvbG9yOiAjODhhNmIxOw0KfQ0KDQpRU3BsaXR0ZXI6OmhhbmRsZTp2ZXJ0aWNhbCB7DQogIG1hcmdpbjogMXB4IDBweCAwcHggMHB4Ow0KfQ0KDQpRU3BsaXR0ZXI6OmhhbmRsZTpob3Jpem9udGFsIHsNCiAgbWFyZ2luOiAwcHggMXB4IDBweCAxcHg7DQp9DQoNClFTdGF0dXNCYXIgUVRvb2xCdXR0b24gew0KICBtYXJnaW4tbGVmdDogNXB4Ow0KICBtYXJnaW4tcmlnaHQ6IDVweDsNCn0NCg0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogdHJhbnNwYXJlbnQ7DQp9DQoNClFQcm9ncmVzc0JhciB7DQogIGJvcmRlcjogdHJhbnNwYXJlbnQ7DQogIHRleHQtYWxpZ246IGNlbnRlcjsNCn0NCg0KUVByb2dyZXNzQmFyOjpjaHVuayB7DQogIGJhY2tncm91bmQtY29sb3I6ICM4Mzk0OTY7DQogIHdpZHRoOiAxcHg7DQogIG1hcmdpbjogMHB4Ow0KfQ0KDQpRUHJvZ3Jlc3NCYXIgUUxhYmVsIHsNCiAgY29sb3I6ICMwMDJiMzY7DQogIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50Ow0KfQ0KDQpRVG9vbEJ1dHRvbiwgUVRvb2xCdXR0b246ZGlzYWJsZWQgew0KICBib3JkZXI6IG5vbmU7DQogIHBhZGRpbmc6IDBweDsNCiAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7DQp9DQoNClFUb29sQnV0dG9uOmhvdmVyLCBRVG9vbEJ1dHRvbjpwcmVzc2VkIHsNCiAgYm9yZGVyOiAxcHggc29saWQgI2VlZThkNTsNCn0NCg0KUVRvb2xCdXR0b25bcG9wdXBNb2RlPSIxIl0gew0KICBwYWRkaW5nLXJpZ2h0OiAxMXB4Ow0KfQ0KDQpRVG9vbEJ1dHRvbjo6bWVudS1idXR0b24gew0KICBib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogMHB4Ow0KICBib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1czogMHB4Ow0KICB3aWR0aDogMTFweDsNCn0NCg0KUVRvb2xCdXR0b246Om1lbnUtYnV0dG9uOmhvdmVyLCBRVG9vbEJ1dHRvbjo6bWVudS1idXR0b246cHJlc3NlZCB7DQogIGJhY2tncm91bmQtY29sb3I6ICNkMzM2ODI7DQp9DQoNClFUb29sQnV0dG9uOjptZW51LWFycm93IHsNCiAgaW1hZ2U6IHVybCgjIy9pbWFnZXMvZG93bl9hcnJvdy5wbmcpOw0KfQ0KDQpRVG9vbEJhcjo6c2VwYXJhdG9yIHsNCiAgd2lkdGg6IDFweDsNCiAgYmFja2dyb3VuZC1jb2xvcjogIzg4YTZiMTsNCiAgbWFyZ2luLWxlZnQ6IDVweDsNCiAgbWFyZ2luLXJpZ2h0OiA1cHg7DQp9DQoNClFUb29sQmFyIHsNCiAgcGFkZGluZy1sZWZ0OiA1cHg7DQogIHBhZGRpbmctcmlnaHQ6IDVweDsNCn0NCg0KUU1lbnVCYXIgew0KICBiYWNrZ3JvdW5kOiBRTGluZWFyR3JhZGllbnQoeDE6MCwgeTE6MCwgeDI6MCwgeTI6MSwgc3RvcDowICNlMGVlZTAsIHN0b3A6MC40ICNkOGVlZDgsIHN0b3A6MC41ICNjY2VlY2MsIHN0b3A6MSAjZTBlZWUwKTsNCiAgY29sb3I6ICMwMDAwMDA7DQogIHBhZGRpbmc6IDFweDsNCn0NCg0KUU1lbnVCYXI6Oml0ZW0gew0KICBwYWRkaW5nOiAzcHggNnB4Ow0KICBiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudDsNCn0NCg0KUU1lbnVCYXI6Oml0ZW06c2VsZWN0ZWQgew0KICBib3JkZXI6IDFweCBzb2xpZCAjODRjYzg0Ow0KICBiYWNrZ3JvdW5kOiBRTGluZWFyR3JhZGllbnQoeDE6MCwgeTE6MCwgeDI6MCwgeTI6MSwgc3RvcDowICNlOWZmZTksIHN0b3A6MC40ICNlMWVlZTEsIHN0b3A6MC41ICNkOWVlZDksIHN0b3A6MSAjZTlmZmU5KTsNCn0NCg0KUU1lbnVCYXI6Oml0ZW06cHJlc3NlZCB7DQogIGJvcmRlcjogMXB4IHNvbGlkICMzNGFhMzQ7DQogIGJvcmRlci1ib3R0b206IG5vbmU7DQogIGJhY2tncm91bmQ6IFFMaW5lYXJHcmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgIzdhY2M3YSwgc3RvcDowLjQgIzcwYzg3MCwgc3RvcDowLjUgIzYwYzQ2MCwgc3RvcDoxICM3YWNjN2EpOw0KICBjb2xvcjogd2hpdGU7DQp9</data>
</skin>

14
src/miscellaneous/skinfactory.cpp
View File

@ -78,13 +78,6 @@ bool SkinFactory::loadSkinFromData(const Skin &skin) {
// be safely loaded.
QString raw_data = skin.m_rawData;
if (!raw_data.isEmpty()) {
QString parsed_data = raw_data.replace("##",
APP_SKIN_PATH + '/' +
skin_folder);
qApp->setStyleSheet(parsed_data);
}
// Iterate supported styles and load one.
foreach (const QString &style, skin.m_stylesNames) {
if (qApp->setStyle(style) != 0) {
@ -93,6 +86,13 @@ bool SkinFactory::loadSkinFromData(const Skin &skin) {
}
}
if (!raw_data.isEmpty()) {
QString parsed_data = raw_data.replace("##",
APP_SKIN_PATH + '/' +
skin_folder);
qApp->setStyleSheet(parsed_data);
}
return true;
}

1
src/network-web/webbrowser.cpp
View File

@ -130,6 +130,7 @@ void WebBrowser::initializeLayout() {
m_loadingProgress = new QProgressBar(this);
m_loadingProgress->setFixedHeight(15);
m_loadingProgress->setMinimum(0);
m_loadingProgress->setTextVisible(false);
m_loadingProgress->setMaximum(100);
m_loadingProgress->setAttribute(Qt::WA_TranslucentBackground);