From 54e4bb8dcd30cc0b9a815fd4e14a5b4efcc184c6 Mon Sep 17 00:00:00 2001 From: Ray Strode <rstrode@redhat.com> Date: Wed, 8 Mar 2017 14:08:09 -0500 Subject: [PATCH 01/19] Revert "Remove all references to gnome-session-properties" This reverts commit 0c6fe6ca14b65cdfc1cd039a5cc9cb83ea346d6b. --- data/icons/16x16/session-properties.png | Bin 0 -> 595 bytes data/icons/22x22/session-properties.png | Bin 0 -> 754 bytes data/icons/24x24/session-properties.png | Bin 0 -> 784 bytes data/icons/32x32/session-properties.png | Bin 0 -> 1109 bytes data/icons/48x48/session-properties.png | Bin 0 -> 1839 bytes data/icons/meson.build | 24 + data/icons/scalable/session-properties.svg | 515 ++++++++++++++++++ .../symbolic/session-properties-symbolic.svg | 28 + data/meson.build | 3 + data/session-properties.ui | 323 +++++++++++ doc/man/gnome-session.1 | 2 + po/POTFILES.in | 1 + 12 files changed, 896 insertions(+) create mode 100644 data/icons/16x16/session-properties.png create mode 100644 data/icons/22x22/session-properties.png create mode 100644 data/icons/24x24/session-properties.png create mode 100644 data/icons/32x32/session-properties.png create mode 100644 data/icons/48x48/session-properties.png create mode 100644 data/icons/meson.build create mode 100644 data/icons/scalable/session-properties.svg create mode 100644 data/icons/symbolic/session-properties-symbolic.svg create mode 100644 data/session-properties.ui diff --git a/data/icons/16x16/session-properties.png b/data/icons/16x16/session-properties.png new file mode 100644 index 00000000..1367c20a Binary files /dev/null and b/data/icons/16x16/session-properties.png differ diff --git a/data/icons/22x22/session-properties.png b/data/icons/22x22/session-properties.png new file mode 100644 index 00000000..12225ee3 Binary files /dev/null and b/data/icons/22x22/session-properties.png differ diff --git a/data/icons/24x24/session-properties.png b/data/icons/24x24/session-properties.png new file mode 100644 index 00000000..ac81c7ad Binary files /dev/null and b/data/icons/24x24/session-properties.png differ diff --git a/data/icons/32x32/session-properties.png b/data/icons/32x32/session-properties.png new file mode 100644 index 00000000..25df9d36 Binary files /dev/null and b/data/icons/32x32/session-properties.png differ diff --git a/data/icons/48x48/session-properties.png b/data/icons/48x48/session-properties.png new file mode 100644 index 00000000..32c2358c Binary files /dev/null and b/data/icons/48x48/session-properties.png differ diff --git a/data/icons/meson.build b/data/icons/meson.build new file mode 100644 index 00000000..e653dfa9 --- /dev/null +++ b/data/icons/meson.build @@ -0,0 +1,24 @@ +icons = [ + '16x16', + '22x22', + '24x24', + '32x32', + '48x48' +] + +foreach icon: icons + install_data( + join_paths(icon, 'session-properties.png'), + install_dir: join_paths(session_datadir, 'icons', 'hicolor', icon, 'apps') + ) +endforeach + +install_data( + 'scalable/session-properties.svg', + install_dir: join_paths(session_datadir, 'icons', 'hicolor', 'scalable', 'apps') +) + +install_data( + 'symbolic/session-properties-symbolic.svg', + install_dir: join_paths(session_datadir, 'icons', 'hicolor', 'symbolic', 'apps') +) diff --git a/data/icons/scalable/session-properties.svg b/data/icons/scalable/session-properties.svg new file mode 100644 index 00000000..cec2c39e --- /dev/null +++ b/data/icons/scalable/session-properties.svg @@ -0,0 +1,515 @@ +<?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://web.resource.org/cc/" + 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="48" + height="48" + id="svg7854" + sodipodi:version="0.32" + inkscape:version="0.44+devel" + version="1.0" + sodipodi:docname="session-properties.svg" + sodipodi:docbase="/home/jimmac/gfx/ximian/art/icons/control-center/scalable" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> + <defs + id="defs7856"> + <linearGradient + inkscape:collect="always" + id="linearGradient5650"> + <stop + style="stop-color:#d3d7cf;stop-opacity:1;" + offset="0" + id="stop5652" /> + <stop + style="stop-color:#9ea795;stop-opacity:1" + offset="1" + id="stop5654" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5642"> + <stop + style="stop-color:#eeeeec;stop-opacity:1;" + offset="0" + id="stop5644" /> + <stop + style="stop-color:#c3c3bc;stop-opacity:1" + offset="1" + id="stop5646" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5634"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5636" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5638" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5598"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5600" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5602" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5716"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5718" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5720" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5700"> + <stop + style="stop-color:#e4e4e4;stop-opacity:1;" + offset="0" + id="stop5702" /> + <stop + id="stop5708" + offset="0.639386" + style="stop-color:#fefefe;stop-opacity:1" /> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0.79632628" + id="stop5710" /> + <stop + style="stop-color:#949494;stop-opacity:1" + offset="1" + id="stop5704" /> + </linearGradient> + <linearGradient + id="linearGradient3832"> + <stop + id="stop3834" + offset="0.0000000" + style="stop-color:#ffffff;stop-opacity:1.0000000" /> + <stop + id="stop3836" + offset="1.0000000" + style="stop-color:#e0e0e0;stop-opacity:1.0000000" /> + </linearGradient> + <linearGradient + id="linearGradient4816"> + <stop + id="stop4818" + offset="0.0000000" + style="stop-color:#204a87;stop-opacity:1.0000000" /> + <stop + id="stop4820" + offset="1.0000000" + style="stop-color:#204a87;stop-opacity:0.0000000" /> + </linearGradient> + <linearGradient + id="linearGradient5048"> + <stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /> + <stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient5060" + inkscape:collect="always"> + <stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5664" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-6.6526975e-2,0,0,3.5014969e-2,47.812816,25.161837)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5667" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.6526975e-2,0,0,3.5014969e-2,-0.2505064,25.161837)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient5670" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.6526975e-2,0,0,3.5014969e-2,-0.2635996,25.161837)" + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3832" + id="linearGradient5682" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.367592,0,0,1.259127,-45.521751,9.5621318)" + x1="17.880680" + y1="11.072588" + x2="17.880680" + y2="21.767578" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4816" + id="linearGradient5684" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.325819,0,0,1.19936,-44.590631,11.169522)" + x1="13.050564" + y1="11.353518" + x2="13.050564" + y2="5.6173568" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3832" + id="linearGradient5694" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.367592,0,0,1.259127,-45.521751,9.5621318)" + x1="17.880680" + y1="11.072588" + x2="17.880680" + y2="21.767578" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4816" + id="linearGradient5696" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.325819,0,0,1.19936,-44.590631,11.169522)" + x1="13.050564" + y1="11.353518" + x2="13.050564" + y2="5.6173568" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5700" + id="linearGradient5728" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.5,0)" + x1="24" + y1="23" + x2="45.505004" + y2="23" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5716" + id="linearGradient5730" + gradientUnits="userSpaceOnUse" + x1="40.745819" + y1="23" + x2="44.005268" + y2="23" /> + <filter + inkscape:collect="always" + id="filter5786"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.62861987" + id="feGaussianBlur5788" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5598" + id="linearGradient5604" + x1="25.627417" + y1="8" + x2="25.627417" + y2="4.7617435" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + x="-0.019480519" + width="1.038961" + y="-0.14285714" + height="1.2857143" + id="filter5628"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.42857143" + id="feGaussianBlur5630" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5634" + id="linearGradient5640" + x1="25.313259" + y1="42.656792" + x2="25.313261" + y2="10.129107" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5642" + id="linearGradient5648" + x1="26.29347" + y1="7.3125" + x2="26.232994" + y2="3.5357027" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5650" + id="linearGradient5656" + x1="26.29347" + y1="7.3125" + x2="26.232994" + y2="3.5357027" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#e0e0e0" + borderopacity="1" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="4" + inkscape:cx="20.372005" + inkscape:cy="14.768475" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="48px" + height="48px" + inkscape:showpageshadow="false" + inkscape:window-width="1102" + inkscape:window-height="958" + inkscape:window-x="2117" + inkscape:window-y="82" + showgrid="false" /> + <metadata + id="metadata7859"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + <dc:title>Gnome Session Properties</dc:title> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g5672" + style="opacity:0.53714286"> + <rect + y="38" + x="7.7196383" + height="8.5036354" + width="32.123024" + id="rect4173" + style="opacity:1;color:#000000;fill:url(#linearGradient5670);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + sodipodi:nodetypes="cccc" + id="path5058" + d="M 39.842663,38.000295 C 39.842663,38.000295 39.842663,46.503461 39.842663,46.503461 C 43.268636,46.519469 48.125002,44.598333 48.125,42.25133 C 48.125,39.904328 44.30187,38.000295 39.842663,38.000295 z " + style="opacity:1;color:#000000;fill:url(#radialGradient5667);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:1;color:#000000;fill:url(#radialGradient5664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 7.7196385,38.000295 C 7.7196385,38.000295 7.7196385,46.503461 7.7196385,46.503461 C 4.2936621,46.519469 -0.56270146,44.598333 -0.56270146,42.25133 C -0.56270146,39.904328 3.2604286,38.000295 7.7196385,38.000295 z " + id="path5018" + sodipodi:nodetypes="cccc" /> + </g> + <rect + style="opacity:1;color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#3465a4;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4585" + width="42.848347" + height="39.870949" + x="2.6516504" + y="3.6290491" + rx="2.2839575" + ry="2.273742" /> + <rect + ry="2.2922091" + rx="2.2922091" + y="4.3838844" + x="2.5" + height="5" + width="43" + id="rect5606" + style="opacity:0.28;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter5628)" /> + <rect + style="opacity:1;color:#000000;fill:url(#linearGradient5648);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient5656);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5556" + width="43" + height="5" + x="2.5" + y="3.5" + rx="2.2922091" + ry="2.2922091" /> + <rect + ry="1.2758038" + rx="1.2758038" + y="4.6290464" + x="3.6516466" + height="37.870953" + width="40.848354" + id="rect5632" + style="opacity:0.52571429;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5640);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <g + id="g5677" + transform="translate(43.499997,-2.124989)"> + <rect + id="rect3818" + style="color:#000000;fill:url(#linearGradient5682);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1.00000095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + y="19.625" + x="-37.999996" + ry="0.53949153" + rx="0.54073501" + height="19.999989" + width="22.000008" /> + <rect + id="rect3820" + style="color:#000000;fill:url(#linearGradient5684);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + y="21.125" + x="-36.499996" + ry="0.095258936" + rx="0.10055112" + height="3" + width="19" /> + <rect + id="rect4962" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000143;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47878789;visibility:visible;display:inline;overflow:visible" + y="20.624994" + x="-37" + ry="0.16447251" + rx="0.188051" + height="18.000002" + width="20.000011" /> + </g> + <g + transform="translate(53.499997,-7.124989)" + id="g5686"> + <rect + width="22.000008" + height="19.999989" + rx="0.54073501" + ry="0.53949153" + x="-37.999996" + y="19.625" + style="color:#000000;fill:url(#linearGradient5694);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1.00000095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect5688" /> + <rect + width="19" + height="3" + rx="0.10055112" + ry="0.095258936" + x="-36.499996" + y="21.125" + style="color:#000000;fill:url(#linearGradient5696);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect5690" /> + <rect + width="20.000011" + height="18.000002" + rx="0.188051" + ry="0.16447251" + x="-37" + y="20.624994" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000143;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47878789;visibility:visible;display:inline;overflow:visible" + id="rect5692" /> + </g> + <g + id="g5724" + transform="translate(0,8)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.31428571;filter:url(#filter5786)" + d="M 10.5,25.474874 L 20.5,15.474874 L 20.5,21.005204 L 40.5,21.005204 C 44.35508,21.005204 45.58678,20.95144 45.5,23 L 45.5,33 C 45.5,33 43.070425,29.988738 40.625,29.988738 L 20.5,29.988738 L 20.5,35.474874 L 10.5,25.474874 z " + id="path5738" + sodipodi:nodetypes="cccccccccc" /> + <path + sodipodi:nodetypes="cccccccccc" + id="path5698" + d="M 10.5,23 L 20.5,13 L 20.5,18.53033 L 40.5,18.53033 C 44.35508,18.53033 45.58678,20.95144 45.5,23 L 45.5,33 C 45.5,33 45.096959,27.513864 40.625,27.513864 L 20.5,27.513864 L 20.5,33 L 10.5,23 z " + style="fill:url(#linearGradient5728);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + d="M 19.5625,15.25 L 11.8125,23 L 19.5625,30.75 L 19.5625,27.5 C 19.55998,27.250596 19.657943,27.010672 19.834307,26.834307 C 20.010672,26.657943 20.250596,26.55998 20.5,26.5625 L 40.625,26.5625 C 42.489029,26.5625 43.674657,27.497362 44.5625,28.5625 L 44.5625,23 C 44.562325,22.989584 44.562325,22.979166 44.5625,22.96875 C 44.597378,22.145414 44.36819,21.273844 43.78125,20.625 C 43.19431,19.976156 42.233327,19.46875 40.5,19.46875 L 20.5,19.46875 C 20.250596,19.47127 20.010672,19.373307 19.834307,19.196943 C 19.657943,19.020578 19.55998,18.780654 19.5625,18.53125 L 19.5625,15.25 z " + inkscape:href="#path5698" + id="path5712" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5730);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xlink:href="#path5698" + inkscape:original="M 20.5 13 L 10.5 23 L 20.5 33 L 20.5 27.5 L 40.625 27.5 C 45.096959 27.5 45.5 33 45.5 33 L 45.5 23 C 45.58678 20.95144 44.35508 18.531249 40.5 18.53125 L 20.5 18.53125 L 20.5 13 z " + inkscape:radius="-0.92807764" + sodipodi:type="inkscape:offset" /> + </g> + <rect + ry="1.1278381" + rx="1.1278381" + y="4.5" + x="3.5" + height="3" + width="41" + id="rect4627" + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5604);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> +</svg> diff --git a/data/icons/symbolic/session-properties-symbolic.svg b/data/icons/symbolic/session-properties-symbolic.svg new file mode 100644 index 00000000..497fb9d0 --- /dev/null +++ b/data/icons/symbolic/session-properties-symbolic.svg @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gnome-session-properties-symbolic.svg' height='16.000015' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16.000013' xmlns='http://www.w3.org/2000/svg'> + <metadata id='metadata90'> + <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>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='16.984015' inkscape:cy='3.9235845' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1376' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'> + <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-22' originy='-341.99999' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> + <defs id='defs7386'> + <linearGradient id='linearGradient7212' osb:paint='solid'> + <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/> + </linearGradient> + </defs> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-263.0002,125)'> + <path inkscape:connector-curvature='0' d='m 264.03145,-125 c -0.56312,0 -1.03125,0.43688 -1.03125,1 l 0,2 16,0 0,-2 c 0,-0.56312 -0.43688,-1 -1,-1 z' id='rect10231' sodipodi:nodetypes='ssccsss' style='color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:0.36470588;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/> + <path inkscape:connector-curvature='0' d='m 263.0002,-120.96865 0,10.9061 c 0,0.5631 0.46813,1.0314 1.03125,1.0314 l 13.96875,0 c 0.56312,0 1,-0.4683 1,-1.0314 l 0,-10.9061 z m 6,0.9686 9,0 0,7 -9,0 z m 1,2 0,4 7,0 0,-4 z m -5,1 3,0 0,2 -2,0 0,4 7,0 0,-0.9686 1,0 0,1.9686 -9,0 z' id='rect10231-3' sodipodi:nodetypes='cssssccccccccccccccccccccccc' style='color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate'/> + + </g> +</svg> diff --git a/data/meson.build b/data/meson.build index 89af98f8..b79a5fbd 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,30 +1,32 @@ +subdir('icons') + desktop = 'gnome.desktop' # FIXME: The same target can not be copied into two directories. # There is a workaround in meson_post_install.py until proper solution arises: # https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0 i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, #install_dir: [ # join_paths(session_datadir, 'xsessions'), # join_paths(session_datadir, 'wayland-sessions') #] install_dir: join_paths(session_datadir, 'xsessions') ) desktop = 'gnome-xorg.desktop' i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, install_dir: join_paths(session_datadir, 'xsessions') ) @@ -48,51 +50,52 @@ foreach session: sessions i18n.merge_file( session, type: 'desktop', input: desktop_in, output: session, po_dir: po_dir, install: true, install_dir: join_paths(session_pkgdatadir, 'sessions') ) endforeach schema_conf = configuration_data() schema = 'org.gnome.SessionManager.gschema.xml' configure_file( input: schema + '.in', output: schema, install: true, install_dir: join_paths(session_datadir, 'glib-2.0', 'schemas'), configuration: schema_conf ) install_data( 'gnome-session.convert', install_dir: join_paths(session_datadir, 'GConf', 'gsettings') ) data = files('hardware-compatibility') +data += files('session-properties.ui') if enable_session_selector data += files('session-selector.ui') desktop = 'gnome-custom-session.desktop' i18n.merge_file( desktop, type: 'desktop', input: desktop + '.in', output: desktop, po_dir: po_dir, install: true, install_dir: join_paths(session_datadir, 'xsessions') ) endif install_data( data, install_dir: session_pkgdatadir ) diff --git a/data/session-properties.ui b/data/session-properties.ui new file mode 100644 index 00000000..1f0cb9a5 --- /dev/null +++ b/data/session-properties.ui @@ -0,0 +1,323 @@ +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.16"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkNotebook" id="main-notebook"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">6</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">3</property> + <property name="ypad">3</property> + <property name="label" translatable="yes">Additional startup _programs:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">session_properties_treeview</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">etched-in</property> + <child> + <object class="GtkTreeView" id="session_properties_treeview"> + <property name="height_request">210</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVButtonBox" id="vbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="session_properties_add_button"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="session_properties_delete_button"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="session_properties_edit_button"> + <property name="label">gtk-edit</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="label" translatable="yes">Startup Programs</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="session_properties_remember_toggle"> + <property name="label" translatable="yes">_Automatically remember running applications when logging out</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <child> + <object class="GtkButton" id="session_properties_save_button"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Remember Currently Running Applications</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="label" translatable="yes">Options</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <object class="GtkTable" id="main-table"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkEntry" id="session_properties_command_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="session_properties_browse_button"> + <property name="label" translatable="yes">Browse…</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="session_properties_comment_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="session_properties_name_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Comm_ent:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">label2</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Co_mmand:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">session_properties_command_entry</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">session_properties_name_entry</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + </object> +</interface> diff --git a/doc/man/gnome-session.1 b/doc/man/gnome-session.1 index bf9cf808..35c062c5 100644 --- a/doc/man/gnome-session.1 +++ b/doc/man/gnome-session.1 @@ -67,46 +67,48 @@ Name=GNOME RequiredComponents=gnome-shell;gnome-settings-daemon; .in .fi .PP The \fB.session\fP files are looked for in \fB$XDG_CONFIG_HOME/gnome-session/sessions\fP, \fB$XDG_CONFIG_DIRS/gnome-session/sessions\fP and \fB$XDG_DATA_DIRS/gnome-session/sessions\fP. .SH ENVIRONMENT \fIgnome-session\fP sets several environment variables for the use of its child processes: .PP .B SESSION_MANAGER .IP This variable is used by session-manager aware clients to contact gnome-session. .PP .B DISPLAY .IP This variable is set to the X display being used by \fIgnome-session\fP. Note that if the \fI--display\fP option is used this might be different from the setting of the environment variable when gnome-session is invoked. .SH FILES .PP .B $XDG_CONFIG_HOME/config/autostart .B $XDG_CONFIG_DIRS/config/autostart .B /usr/share/gnome/autostart .IP The applications defined in those directories will be started on login. +\fIgnome-session-properties(1)\fP can be used to easily configure them. .PP .B $XDG_CONFIG_HOME/gnome-session/sessions .B $XDG_CONFIG_DIRS/gnome-session/sessions .B $XDG_DATA_DIRS/gnome-session/sessions .IP These directories contain the \fB.session\fP files that can be used with the \fI--session\fP option. .PP .B $XDG_CONFIG_HOME/gnome-session/saved-session .IP This directory contains the list of applications of the saved session. .SH BUGS If you find bugs in the \fIgnome-session\fP program, please report these on https://bugzilla.gnome.org. .SH SEE ALSO +.BR gnome-session-properties(1) .BR gnome-session-quit(1) diff --git a/po/POTFILES.in b/po/POTFILES.in index 63faf7d7..f32040fc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,18 +1,19 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/gnome-custom-session.desktop.in data/gnome.desktop.in data/gnome-xorg.desktop.in data/gnome-dummy.session.desktop.in.in data/gnome.session.desktop.in.in data/session-selector.ui +data/session-properties.ui gnome-session/gsm-fail-whale-dialog.c gnome-session/gsm-manager.c gnome-session/gsm-process-helper.c gnome-session/gsm-util.c gnome-session/gsm-xsmp-client.c gnome-session/gsm-xsmp-server.c gnome-session/main.c tools/gnome-session-inhibit.c tools/gnome-session-selector.c tools/gnome-session-quit.c -- 2.17.0