[gnome-photos] Add application-specific theme extensions
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] Add application-specific theme extensions
- Date: Wed, 16 Jul 2014 14:35:27 +0000 (UTC)
commit a4461d15b7783418f7e8784ce57dd3f1aea9d0bb
Author: Pranav Kant <pranav913 gmail com>
Date: Thu Jul 10 22:19:21 2014 +0530
Add application-specific theme extensions
This used to live in gnome-themes-standard, but with the move of
Adwaita to GTK+, it needs to find a new home.
https://bugzilla.gnome.org/show_bug.cgi?id=733011
data/Adwaita.css | 67 +++++++++++
data/Makefile.am | 5 +
data/dnd-counter.svg | 183 ++++++++++++++++++++++++++++++
data/sidebar-radio-checked.svg | 66 +++++++++++
data/sidebar-radio-prelight.svg | 66 +++++++++++
data/sidebar-radio-selected-prelight.svg | 66 +++++++++++
data/sidebar-radio-selected.svg | 66 +++++++++++
src/photos-application.c | 38 ++++++
src/photos-dropdown.c | 2 +-
src/photos-load-more-button.c | 2 +-
src/photos-preview-nav-buttons.c | 4 +-
src/photos-selection-toolbar.c | 4 +-
src/photos-utils.c | 2 +-
src/photos.gresource.xml | 6 +
14 files changed, 570 insertions(+), 7 deletions(-)
---
diff --git a/data/Adwaita.css b/data/Adwaita.css
new file mode 100644
index 0000000..2b25439
--- /dev/null
+++ b/data/Adwaita.css
@@ -0,0 +1,67 @@
+ define-color photos_collection_bg #000000;
+
+.documents-counter {
+ background-image: url("dnd-counter.svg");
+ background-size: contain;
+ background-color: transparent;
+ color: @theme_base_color;
+ font: bold;
+}
+
+.documents-scrolledwin.frame {
+ border-width: 1px 0 0;
+ border-radius: 0;
+}
+
+.photos-icon-bg {
+ icon-shadow: 0 1px #000000;
+}
+
+.photos-dropdown,
+.photos-dropdown .view {
+ background-color: shade (@theme_bg_color, 1.02);
+}
+
+.photos-dropdown.frame {
+ padding: 6px;
+ border-width: 0 1px 1px 1px;
+ border-style: solid;
+ border-radius: 0 0 5px 5px;
+}
+
+.photos-dropdown .view.radio,
+.photos-dropdown .view.radio:focused,
+.photos-dropdown .view.radio:selected {
+ background-image: none;
+ background-color: alpha(@theme_base_color, 0.0);
+}
+
+.photos-dropdown .view.radio:active,
+.photos-dropdown .view.radio:active:focused,
+.photos-dropdown .view.radio:active:prelight {
+ background-image: url("sidebar-radio-checked.svg");
+}
+
+.photos-dropdown .view.radio:prelight {
+ background-image: url("sidebar-radio-prelight.svg");
+}
+
+.photos-dropdown .view.radio:active:selected,
+.photos-dropdown .view.radio:active:selected:focused {
+ background-image: url("sidebar-radio-selected.svg");
+}
+
+.photos-dropdown .view.radio:selected:prelight,
+.photos-dropdown .view.radio:selected:focused {
+ background-image: url("sidebar-radio-selected-prelight.svg");
+}
+
+.photos-favorite.button:active,
+.photos-favorite.button:active:hover {
+ color: shade(@theme_selected_bg_color, 1.20);
+}
+
+.photos-collection-icon {
+ background-color: @photos_collection_bg;
+ border-radius: 8px;
+}
diff --git a/data/Makefile.am b/data/Makefile.am
index f6f5087..be0afa5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,6 +33,11 @@ EXTRA_DIST = \
$(desktop_in_in_files) \
$(gsettings_SCHEMAS) \
$(service_in_files) \
+ dnd-counter.svg \
+ sidebar-radio-checked.svg \
+ sidebar-radio-prelight.svg \
+ sidebar-radio-selected.svg \
+ sidebar-radio-selected-prelight.svg \
$(NULL)
CLEANFILES = \
diff --git a/data/dnd-counter.svg b/data/dnd-counter.svg
new file mode 100644
index 0000000..d16ea2f
--- /dev/null
+++ b/data/dnd-counter.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="72"
+ height="72"
+ id="svg4267"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="dnd-emblem.svg">
+ <defs
+ id="defs4269">
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient22968-2-3-0"
+ id="radialGradient26234"
+ gradientUnits="userSpaceOnUse"
+ cx="797"
+ cy="165"
+ fx="797"
+ fy="165"
+ r="20.5" />
+ <linearGradient
+ id="linearGradient22968-2-3-0"
+ inkscape:collect="always">
+ <stop
+ id="stop22970-0-16-4"
+ offset="0"
+ style="stop-color:#729fcf;stop-opacity:1" />
+ <stop
+ id="stop22972-8-3-4"
+ offset="1"
+ style="stop-color:#3465a4;stop-opacity:1" />
+ </linearGradient>
+ <filter
+ color-interpolation-filters="sRGB"
+ height="1.24"
+ y="-0.12"
+ width="1.24"
+ x="-0.12"
+ id="filter27236-2"
+ inkscape:collect="always">
+ <feGaussianBlur
+ id="feGaussianBlur27238-6"
+ stdDeviation="1.9"
+ inkscape:collect="always" />
+ </filter>
+ <linearGradient
+ id="linearGradient22968-2-3-0-6">
+ <stop
+ id="stop22970-0-16-4-2"
+ offset="0"
+ style="stop-color:#729fcf;stop-opacity:1" />
+ <stop
+ id="stop22972-8-3-4-6"
+ offset="1"
+ style="stop-color:#3465a4;stop-opacity:1" />
+ </linearGradient>
+ <clipPath
+ id="clipPath27307-6"
+ clipPathUnits="userSpaceOnUse">
+ <path
+ transform="matrix(0.88410615,0,0,0.88410615,92.255124,19.051446)"
+ d="m 806,169.78125 a 9.96875,9.96875 0 1 1 -19.9375,0 9.96875,9.96875 0 1 1 19.9375,0 z"
+ sodipodi:ry="9.96875"
+ sodipodi:rx="9.96875"
+ sodipodi:cy="169.78125"
+ sodipodi:cx="796.03125"
+ id="path27309-78"
+
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.39325762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ </clipPath>
+ <filter
+ color-interpolation-filters="sRGB"
+ id="filter27327-9"
+ inkscape:collect="always">
+ <feGaussianBlur
+ id="feGaussianBlur27329-7"
+ stdDeviation="0.598125"
+ inkscape:collect="always" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient22968-2-3-0-6"
+ id="radialGradient5163"
+ gradientUnits="userSpaceOnUse"
+ cx="797"
+ cy="165"
+ fx="797"
+ fy="165"
+ r="20.5" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8.01"
+ inkscape:cx="46.532863"
+ inkscape:cy="38.421319"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="742"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4272">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,8)">
+ <g
+ style="display:inline;overflow:visible"
+ id="g24889"
+ transform="matrix(1.5158363,0,0,1.5158363,-3157.4222,-2504.9125)">
+ <g
+ transform="matrix(1.276138,0,0,1.276138,1051.3404,1164.4268)"
+ id="g24145-0"
+ style="display:inline">
+ <g
+ style="display:inline"
+ transform="matrix(0.68076616,0,0,0.68076616,284.42937,281.22745)"
+ id="g27242-9">
+ <path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="0"
+ inkscape:original="M 797 151 C 786.50659 151 778 159.50659 778 170 C 778 180.49341 786.50659
189 797 189 C 807.49341 189 816 180.49341 816 170 C 816 159.50659 807.49341 151 797 151 z "
+ xlink:href="#path27224-3"
+
style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27236-2);enable-background:accumulate"
+ id="path27228-0"
+ inkscape:href="#path27224-3"
+ d="m 797,151 c -10.49341,0 -19,8.50659 -19,19 0,10.49341 8.50659,19 19,19 10.49341,0
19,-8.50659 19,-19 0,-10.49341 -8.50659,-19 -19,-19 z"
+ transform="translate(0,3)" />
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:url(#radialGradient5163);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.47955203;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path27224-3"
+ sodipodi:cx="797"
+ sodipodi:cy="170"
+ sodipodi:rx="19"
+ sodipodi:ry="19"
+ d="m 816,170 c 0,10.49341 -8.50659,19 -19,19 -10.49341,0 -19,-8.50659 -19,-19 0,-10.49341
8.50659,-19 19,-19 10.49341,0 19,8.50659 19,19 z" />
+ </g>
+ <path
+ clip-path="url(#clipPath27307-6)"
+ sodipodi:type="arc"
+
style="opacity:0.5;color:#000000;fill:none;stroke:#000000;stroke-width:0.77596396;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter27327-9);enable-background:accumulate"
+ id="path27301-28"
+ sodipodi:cx="796.03125"
+ sodipodi:cy="169.78125"
+ sodipodi:rx="9.96875"
+ sodipodi:ry="9.96875"
+ d="m 806,169.78125 c 0,5.50559 -4.46316,9.96875 -9.96875,9.96875 -5.50559,0 -9.96875,-4.46316
-9.96875,-9.96875 0,-5.50559 4.46316,-9.96875 9.96875,-9.96875 5.50559,0 9.96875,4.46316 9.96875,9.96875 z"
+ transform="matrix(1.2980358,0,0,1.2980358,-206.24585,177.33558)" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/data/sidebar-radio-checked.svg b/data/sidebar-radio-checked.svg
new file mode 100644
index 0000000..28ecf15
--- /dev/null
+++ b/data/sidebar-radio-checked.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ id="svg27352"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="sidebar-radio-checked.svg">
+ <defs
+ id="defs27354" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="-0.15396047"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="741"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata27357">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5784-4"
+ sodipodi:cx="660.96808"
+ sodipodi:cy="255.0668"
+ sodipodi:rx="4.5078058"
+ sodipodi:ry="7.2937827"
+ d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+ transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+ </g>
+</svg>
diff --git a/data/sidebar-radio-prelight.svg b/data/sidebar-radio-prelight.svg
new file mode 100644
index 0000000..812624a
--- /dev/null
+++ b/data/sidebar-radio-prelight.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ id="svg27352"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="sidebar-radio-checked-selected.svg">
+ <defs
+ id="defs27354" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="-8.3079209"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="741"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata27357">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:#aaa8ac;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5784-4"
+ sodipodi:cx="660.96808"
+ sodipodi:cy="255.0668"
+ sodipodi:rx="4.5078058"
+ sodipodi:ry="7.2937827"
+ d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+ transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+ </g>
+</svg>
diff --git a/data/sidebar-radio-selected-prelight.svg b/data/sidebar-radio-selected-prelight.svg
new file mode 100644
index 0000000..9fa228b
--- /dev/null
+++ b/data/sidebar-radio-selected-prelight.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ id="svg27352"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="sidebar-radio-selected.svg">
+ <defs
+ id="defs27354" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="7.0809381"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="741"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata27357">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:#a3c3e3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5784-4"
+ sodipodi:cx="660.96808"
+ sodipodi:cy="255.0668"
+ sodipodi:rx="4.5078058"
+ sodipodi:ry="7.2937827"
+ d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+ transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+ </g>
+</svg>
diff --git a/data/sidebar-radio-selected.svg b/data/sidebar-radio-selected.svg
new file mode 100644
index 0000000..887174e
--- /dev/null
+++ b/data/sidebar-radio-selected.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ id="svg27352"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="sidebar-radio-prelight.svg">
+ <defs
+ id="defs27354" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.197802"
+ inkscape:cx="-8.3079209"
+ inkscape:cy="8"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="741"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata27357">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:type="arc"
+
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27423298000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path5784-4"
+ sodipodi:cx="660.96808"
+ sodipodi:cy="255.0668"
+ sodipodi:rx="4.5078058"
+ sodipodi:ry="7.2937827"
+ d="m 665.47588,255.0668 a 4.5078058,7.2937827 0 1 1 -9.01561,0 4.5078058,7.2937827 0 1 1 9.01561,0 z"
+ transform="matrix(0.88734967,0,0,0.54841228,-578.5098,-131.88177)" />
+ </g>
+</svg>
diff --git a/src/photos-application.c b/src/photos-application.c
index b6d7bb8..57e465b 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -568,6 +568,42 @@ photos_application_stop_miners (PhotosApplication *self)
static void
+photos_application_theme_changed (GtkSettings *settings)
+{
+ static GtkCssProvider *provider;
+ GdkScreen *screen;
+ gchar *theme;
+
+ g_object_get (settings, "gtk-theme-name", &theme, NULL);
+ screen = gdk_screen_get_default ();
+
+ if (g_strcmp0 (theme, "Adwaita") == 0)
+ {
+ if (provider == NULL)
+ {
+ GFile *file;
+
+ provider = gtk_css_provider_new ();
+ file = g_file_new_for_uri ("resource:///org/gnome/photos/Adwaita.css");
+ gtk_css_provider_load_from_file (provider, file, NULL);
+ g_object_unref (file);
+ }
+
+ gtk_style_context_add_provider_for_screen (screen,
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ }
+ else if (provider != NULL)
+ {
+ gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (provider));
+ g_clear_object (&provider);
+ }
+
+ g_free (theme);
+}
+
+
+static void
photos_application_tracker_clear_rdf_types (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
PhotosApplication *self = PHOTOS_APPLICATION (user_data);
@@ -768,6 +804,8 @@ photos_application_startup (GApplication *application)
settings = gtk_settings_get_default ();
g_object_set (settings, "gtk-application-prefer-dark-theme", TRUE, NULL);
+ g_signal_connect (settings, "notify::gtk-theme-name", G_CALLBACK (photos_application_theme_changed), NULL);
+ photos_application_theme_changed (settings);
priv->facebook_miner = gom_miner_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
diff --git a/src/photos-dropdown.c b/src/photos-dropdown.c
index 3cf1fde..92735eb 100644
--- a/src/photos-dropdown.c
+++ b/src/photos-dropdown.c
@@ -107,7 +107,7 @@ photos_dropdown_init (PhotosDropdown *self)
gtk_widget_set_opacity (frame, 0.9);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
context = gtk_widget_get_style_context (frame);
- gtk_style_context_add_class (context, "documents-dropdown");
+ gtk_style_context_add_class (context, "photos-dropdown");
gtk_container_add (GTK_CONTAINER (self), frame);
priv->grid = gtk_grid_new ();
diff --git a/src/photos-load-more-button.c b/src/photos-load-more-button.c
index fe38d37..1f91973 100644
--- a/src/photos-load-more-button.c
+++ b/src/photos-load-more-button.c
@@ -176,7 +176,7 @@ photos_load_more_button_init (PhotosLoadMoreButton *self)
gtk_widget_set_no_show_all (GTK_WIDGET (self), TRUE);
context = gtk_widget_get_style_context (GTK_WIDGET (self));
- gtk_style_context_add_class (context, "documents-load-more");
+ gtk_style_context_add_class (context, "photos-load-more");
child = gtk_grid_new ();
gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c
index fdea3d1..f3d33d5 100644
--- a/src/photos-preview-nav-buttons.c
+++ b/src/photos-preview-nav-buttons.c
@@ -207,12 +207,12 @@ photos_preview_nav_buttons_update_favorite (PhotosPreviewNavButtons *self, gbool
if (favorite)
{
favorite_label = g_strdup (_("Remove from favorites"));
- gtk_style_context_add_class (context, "documents-favorite");
+ gtk_style_context_add_class (context, "photos-favorite");
}
else
{
favorite_label = g_strdup (_("Add to favorites"));
- gtk_style_context_remove_class (context, "documents-favorite");
+ gtk_style_context_remove_class (context, "photos-favorite");
}
gtk_widget_reset_style (priv->favorite_button);
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 332d7fc..9566989 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -289,13 +289,13 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
{
favorite_label = g_strdup (_("Remove from favorites"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->toolbar_favorite), TRUE);
- gtk_style_context_add_class (context, "documents-favorite");
+ gtk_style_context_add_class (context, "photos-favorite");
}
else
{
favorite_label = g_strdup (_("Add to favorites"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->toolbar_favorite), FALSE);
- gtk_style_context_remove_class (context, "documents-favorite");
+ gtk_style_context_remove_class (context, "photos-favorite");
}
gtk_widget_reset_style (priv->toolbar_favorite);
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 657d02d..e82556a 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -74,7 +74,7 @@ photos_utils_create_collection_icon (gint base_size, GList *pixbufs)
tile_size = (base_size - (3 * padding)) / 2;
context = gtk_style_context_new ();
- gtk_style_context_add_class (context, "documents-collection-icon");
+ gtk_style_context_add_class (context, "photos-collection-icon");
path = gtk_widget_path_new ();
gtk_widget_path_append_type (path, GTK_TYPE_ICON_VIEW);
diff --git a/src/photos.gresource.xml b/src/photos.gresource.xml
index c9f3c90..6f8a496 100644
--- a/src/photos.gresource.xml
+++ b/src/photos.gresource.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/photos">
+ <file alias="Adwaita.css">../data/Adwaita.css</file>
<file alias="app-menu.ui" preprocess="xml-stripblanks" compressed="true">photos-app-menu.ui</file>
<file alias="dlna-renderers-dialog.ui" preprocess="xml-stripblanks"
compressed="true">photos-dlna-renderers-dialog.ui</file>
+ <file alias="dnd-counter.svg" preprocess="to-pixdata">../data/dnd-counter.svg</file>
<file alias="preview-menu.ui" preprocess="xml-stripblanks"
compressed="true">photos-preview-menu.ui</file>
<file alias="selection-menu.ui" preprocess="xml-stripblanks"
compressed="true">photos-selection-menu.ui</file>
+ <file alias="sidebar-radio-checked.svg" preprocess="to-pixdata">../data/sidebar-radio-checked.svg</file>
+ <file alias="sidebar-radio-prelight.svg"
preprocess="to-pixdata">../data/sidebar-radio-prelight.svg</file>
+ <file alias="sidebar-radio-selected.svg"
preprocess="to-pixdata">../data/sidebar-radio-selected.svg</file>
+ <file alias="sidebar-radio-selected-prelight.svg"
preprocess="to-pixdata">../data/sidebar-radio-selected-prelight.svg</file>
<file alias="thumbnail-frame.png" preprocess="to-pixdata">../data/thumbnail-frame.png</file>
</gresource>
</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
