Commit 82e9fb4e authored by Adrien Plazas's avatar Adrien Plazas

Make the UI phone friendly

Tries to make the UI fit in a 360pt wide screen.
parent 8920c7bb
Pipeline #54987 failed with stage
in 7 minutes and 35 seconds
...@@ -8,6 +8,13 @@ window > stack:backdrop { ...@@ -8,6 +8,13 @@ window > stack:backdrop {
box-shadow: none; box-shadow: none;
} }
/* stack switcher */
stackswitcher button {
padding-left: 12px;
padding-right: 12px;
}
/* content view */ /* content view */
.tile { .tile {
...@@ -128,24 +135,23 @@ window > stack:backdrop { ...@@ -128,24 +135,23 @@ window > stack:backdrop {
} }
.clocks-secondary-standalone-label { .clocks-secondary-standalone-label {
font-size: 18pt; font-size: 12pt;
} }
.clocks-button { .clocks-button {
font-size: 14pt;
} }
.clocks-alarm-setup-time { .clocks-alarm-setup-time {
font-size: 32pt; font-size: 21pt;
} }
.clocks-spinbutton { .clocks-spinbutton {
font-size: 48pt; font-size: 32pt;
} }
.clocks-stopwatch-label, .clocks-stopwatch-label,
.clocks-timer-label { .clocks-timer-label {
font-size: 48pt; font-size: 32pt;
} }
.clocks-analog-frame.trough { .clocks-analog-frame.trough {
...@@ -160,20 +166,6 @@ window > stack:backdrop { ...@@ -160,20 +166,6 @@ window > stack:backdrop {
color: @theme_fg_color; color: @theme_fg_color;
} }
.clocks-laps-panel:dir(ltr) {
border-image: linear-gradient(to bottom,
mix(@borders,@theme_bg_color,0.5),
mix(@borders,@theme_bg_color,0.5))
0 0 0 1 / 20px 0px 20px 1px stretch;
}
.clocks-laps-panel:dir(rtl) {
border-image: linear-gradient(to bottom,
mix(@borders,@theme_bg_color,0.5),
mix(@borders,@theme_bg_color,0.5))
0 1 0 0 / 20px 1px 20px 0px stretch;
}
.clocks-laps-panel list, .clocks-laps-panel list,
.clocks-laps-panel row { .clocks-laps-panel row {
background-color: transparent; background-color: transparent;
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<file>css/gnome-clocks.highcontrast.css</file> <file>css/gnome-clocks.highcontrast.css</file>
<file preprocess="xml-stripblanks">gtk/menus.ui</file> <file preprocess="xml-stripblanks">gtk/menus.ui</file>
<file preprocess="xml-stripblanks">gtk/help-overlay.ui</file> <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
<file preprocess="xml-stripblanks">icons/hicolor/scalable/status/stopwatch-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/hicolor/scalable/status/timer-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/hicolor/scalable/status/world-symbolic.svg</file>
<file preprocess="xml-stripblanks">ui/window.ui</file> <file preprocess="xml-stripblanks">ui/window.ui</file>
<file preprocess="xml-stripblanks">ui/worldlocationdialog.ui</file> <file preprocess="xml-stripblanks">ui/worldlocationdialog.ui</file>
<file preprocess="xml-stripblanks">ui/world.ui</file> <file preprocess="xml-stripblanks">ui/world.ui</file>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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"
version="1.1"
id="svg7384"
height="16"
sodipodi:docname="stopwatch-symbolic.svg"
inkscape:version="0.92.2 2405546, 2018-03-11">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1376"
id="namedview16"
showgrid="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
inkscape:snap-page="true"
inkscape:zoom="41.7193"
inkscape:cx="-4.6908612"
inkscape:cy="5.8897854"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg7384">
<inkscape:grid
type="xygrid"
id="grid835" />
</sodipodi:namedview>
<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>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386">
<linearGradient
osb:paint="solid"
id="linearGradient7212">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7214" />
</linearGradient>
<inkscape:path-effect
is_visible="true"
id="path-effect14745"
effect="spiro" />
</defs>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;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:new"
d="M 7.5,3 C 3.9219937,3 1,5.9219937 1,9.5 1,13.078006 3.9219937,16 7.5,16 11.078006,16 14,13.078006 14,9.5 14,5.9219937 11.078006,3 7.5,3 Z m 0,2 C 9.9971259,5 12,7.0028741 12,9.5 12,11.997126 9.9971259,14 7.5,14 5.0028741,14 3,11.997126 3,9.5 3,7.0028741 5.0028741,5 7.5,5 Z"
id="circle8105"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;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:new"
d="M 7.4921875,6.0292969 A 0.50005,0.50005 0 0 0 7,6.5371094 V 9.484375 a 0.50005,0.50005 0 1 0 1,0 V 6.5371094 A 0.50005,0.50005 0 0 0 7.4921875,6.0292969 Z"
id="path8107"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 4.8808594,-0.0078125 a 1.0001,1.0001 0 1 0 0,2 h 5.2382816 a 1.0001,1.0001 0 1 0 0,-2 z"
id="path8109"
inkscape:connector-curvature="0" />
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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"
width="16"
viewBox="0 0 16 16"
version="1.1"
id="svg7384"
height="16">
<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>
<title
id="title9167">Gnome Symbolic Icon Theme</title>
<defs
id="defs7386">
<linearGradient
osb:paint="solid"
id="linearGradient7212">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop7214" />
</linearGradient>
</defs>
<g
transform="translate(-760.98275,226.99542)"
style="display:inline"
id="layer9" />
<g
transform="translate(-760.98275,226.99542)"
style="display:inline"
id="g7628">
<path
d="m 761.0002,-214 h 15 v 2 l -15,0.0625 z"
id="path7984"
style="opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<path
id="path7986"
d="m 772.03516,-224.36523 v 1.52929 l -3.07032,3.07227 v 1.60156 l 3.02539,3.02734 v 1.59766 h 2 v -2.42383 l -2.99804,-3.00195 3.04297,-3.04297 v -2.35937 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;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
id="path7990"
d="m 762.96484,-224.36523 v 2.35937 l 3.04297,3.04297 -2.99609,3.00195 v 2.42383 h 2 v -1.59766 l 3.02344,-3.02734 v -1.60156 l -3.07032,-3.07227 v -1.52929 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;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
d="m 761.0002,-224 h 15 v -2 h -15 z"
id="path7992"
style="opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<path
d="m 768.47979,-216.04195 -2.47957,2.55243 h 5 z"
id="path7996"
style="display:inline;opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
<path
d="m 768.46776,-220.65203 -1.32395,-1.36285 2.66013,0.01 z"
id="path7998"
style="display:inline;opacity:1;vector-effect:none;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
</g>
<g
transform="translate(-519.98255,-140.00458)"
style="display:inline"
id="layer1" />
<g
transform="translate(-519.98255,-140.00458)"
style="display:inline"
id="layer10" />
<g
transform="translate(-519.98255,-140.00458)"
style="display:inline"
id="g6387" />
<g
transform="translate(-519.98255,-140.00458)"
style="display:inline"
id="layer11" />
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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.011"
version="1.1"
id="svg12"
sodipodi:docname="world-symbolic.svg"
inkscape:version="0.92.2 2405546, 2018-03-11">
<metadata
id="metadata18">
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs16" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="1376"
id="namedview14"
showgrid="false"
inkscape:zoom="32"
inkscape:cx="8.7032595"
inkscape:cy="6.3094734"
inkscape:window-x="1280"
inkscape:window-y="27"
inkscape:window-maximized="0"
inkscape:current-layer="svg12">
<inkscape:grid
type="xygrid"
id="grid828" />
</sodipodi:namedview>
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#474747;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 1,7.0117188 v 1 h 13 v -1 z"
id="path832"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#474747;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 1,4.0117188 v 1 h 13 v -1 z"
id="path834"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#474747;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 1,10.011719 v 1 h 13 v -1 z"
id="path836"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#474747;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;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 7.5,0.51171875 c -0.520821,0 -0.9836555,0.27782959 -1.34375,0.67382815 C 5.7961555,1.5815454 5.5071252,2.1064746 5.265625,2.734375 4.7826247,3.9901758 4.5,5.6648279 4.5,7.5117188 c 0,1.8468908 0.2826247,3.5195902 0.765625,4.7753902 0.2415002,0.627901 0.5305305,1.15283 0.890625,1.548829 0.3600945,0.395998 0.822929,0.675781 1.34375,0.675781 0.520821,0 0.9836555,-0.279783 1.34375,-0.675781 C 9.2038445,13.439939 9.4928748,12.91501 9.734375,12.287109 10.217375,11.031309 10.5,9.3586096 10.5,7.5117188 10.5,5.6648279 10.217375,3.9901758 9.734375,2.734375 9.4928748,2.1064746 9.2038445,1.5815454 8.84375,1.1855469 8.4836555,0.78954834 8.020821,0.51171875 7.5,0.51171875 Z m 0,1.00000005 c 0.1695349,0 0.3654184,0.083866 0.6035156,0.3457031 C 8.3416129,2.1192591 8.5898704,2.5453818 8.8007812,3.09375 9.222603,4.1904865 9.5,5.7687587 9.5,7.5117188 9.5,9.2546788 9.222603,10.830998 8.8007812,11.927734 8.5898704,12.476103 8.3416129,12.902225 8.1035156,13.164062 7.8654184,13.4259 7.6695349,13.511719 7.5,13.511719 7.3304651,13.511719 7.1345816,13.4259 6.8964844,13.164062 6.6583871,12.902225 6.4101296,12.476103 6.1992188,11.927734 5.777397,10.830998 5.5,9.2546788 5.5,7.5117188 5.5,5.7687587 5.777397,4.1904865 6.1992188,3.09375 6.4101296,2.5453818 6.6583871,2.1192591 6.8964844,1.8574219 7.1345816,1.5955846 7.3304651,1.5117188 7.5,1.5117188 Z"
id="path838"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#474747;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m 7.5,0.01171875 c -4.130291,0 -7.5,3.36970905 -7.5,7.50000005 0,4.1302912 3.369709,7.5000002 7.5,7.5000002 4.130291,0 7.5,-3.369709 7.5,-7.5000002 0,-4.130291 -3.369709,-7.50000005 -7.5,-7.50000005 z m 0,2.00000005 c 3.049411,-1e-7 5.5,2.4505892 5.5,5.5 0,3.0494112 -2.450589,5.5000002 -5.5,5.5000002 -3.0494108,0 -5.5,-2.450589 -5.5,-5.5000002 0,-3.0494108 2.4505892,-5.5 5.5,-5.5 z"
id="path830"
inkscape:connector-curvature="0" />
</svg>
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
<object class="GtkGrid" id="button_grid"> <object class="GtkGrid" id="button_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="column_spacing">24</property> <property name="halign">center</property>
<property name="row_spacing">24</property>
<child> <child>
<object class="GtkButton" id="stop_button"> <object class="GtkButton" id="stop_button">
<property name="label" translatable="yes">Stop</property> <property name="label" translatable="yes">Stop</property>
...@@ -67,8 +68,8 @@ ...@@ -67,8 +68,8 @@
</style> </style>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">0</property>
<property name="top_attach">0</property> <property name="top_attach">1</property>
<property name="width">1</property> <property name="width">1</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
......
...@@ -4,32 +4,35 @@ ...@@ -4,32 +4,35 @@
<template class="ClocksStopwatchFace" parent="GtkBox"> <template class="ClocksStopwatchFace" parent="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<object class="GtkGrid" id="stopwatch_panel"> <object class="GtkBox" id="stopwatch_panel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="valign">fill</property> <property name="valign">fill</property>
<property name="column_spacing">0</property> <property name="orientation">vertical</property>
<child> <child>
<object class="ClocksStopwatchFrame" id="analog_frame"> <object class="ClocksStopwatchFrame" id="analog_frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="margin_start">48</property> <property name="margin">24</property>
<property name="margin_end">48</property>
<child> <child>
<object class="GtkGrid" id="top_grid"> <object class="GtkGrid" id="top_grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="vexpand_set">True</property>
<property name="row_spacing">24</property> <property name="row_spacing">24</property>
<property name="column_homogeneous">True</property> <property name="column_homogeneous">True</property>
<property name="width_request">200</property>
<property name="height_request">150</property>
<child> <child>
<object class="GtkLabel" id="time_label"> <object class="GtkLabel" id="time_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="vexpand">True</property>
<style> <style>
<class name="clocks-stopwatch-label"/> <class name="clocks-stopwatch-label"/>
</style> </style>
...@@ -48,11 +51,10 @@ ...@@ -48,11 +51,10 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<property name="spacing">16</property> <property name="spacing">16</property>
<property name="height_request">40</property> <property name="width_request">200</property>
<child> <child>
<object class="GtkButton" id="left_button"> <object class="GtkButton" id="left_button">
<property name="label" translatable="yes">Start</property> <property name="label" translatable="yes">Start</property>
<property name="width_request">132</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -70,7 +72,6 @@ ...@@ -70,7 +72,6 @@
<child> <child>
<object class="GtkButton" id="right_button"> <object class="GtkButton" id="right_button">
<property name="label" translatable="yes">Reset</property> <property name="label" translatable="yes">Reset</property>
<property name="width_request">132</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -96,21 +97,13 @@ ...@@ -96,21 +97,13 @@
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkScrolledWindow" id="laps_scrollwin"> <object class="GtkScrolledWindow" id="laps_scrollwin">
<property name="width_request">320</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="hscrollbar_policy">never</property> <property name="hscrollbar_policy">never</property>
<style> <style>
<class name="clocks-laps-panel"/> <class name="clocks-laps-panel"/>
...@@ -120,17 +113,11 @@ ...@@ -120,17 +113,11 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
<property name="valign">center</property> <property name="halign">center</property>
<property name="selection_mode">none</property> <property name="selection_mode">none</property>
</object> </object>
</child> </child>
</object> </object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
<object class="ClocksAnalogFrame" id="setup_frame"> <object class="ClocksAnalogFrame" id="setup_frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_start">48</property> <property name="margin_start">12</property>
<property name="margin_end">48</property> <property name="margin_end">12</property>
<property name="margin_top">48</property> <property name="margin_top">12</property>
<property name="margin_bottom">48</property> <property name="margin_bottom">12</property>
<child> <child>
<object class="GtkGrid" id="setup_grid"> <object class="GtkGrid" id="setup_grid">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -34,13 +34,17 @@ ...@@ -34,13 +34,17 @@
<property name="valign">center</property> <property name="valign">center</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="vexpand_set">True</property>
<property name="row_spacing">24</property> <property name="row_spacing">24</property>
<property name="width_request">200</property>
<property name="height_request">150</property>
<child> <child>
<object class="GtkGrid" id="grid_spinbuttons"> <object class="GtkGrid" id="grid_spinbuttons">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="vexpand">True</property>
<child> <child>
<object class="GtkLabel" id="dummy_label1"> <object class="GtkLabel" id="dummy_label1">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -195,8 +199,6 @@ ...@@ -195,8 +199,6 @@
<child> <child>
<object class="GtkButton" id="start_button"> <object class="GtkButton" id="start_button">
<property name="label" translatable="yes">Start</property> <property name="label" translatable="yes">Start</property>
<property name="width_request">280</property>
<property name="height_request">40</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -220,10 +222,10 @@ ...@@ -220,10 +222,10 @@
<object class="ClocksTimerCountdownFrame" id="countdown_frame"> <object class="ClocksTimerCountdownFrame" id="countdown_frame">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_start">48</property> <property name="margin_start">12</property>
<property name="margin_end">48</property> <property name="margin_end">12</property>
<property name="margin_top">48</property> <property name="margin_top">12</property>
<property name="margin_bottom">48</property> <property name="margin_bottom">12</property>
<child> <child>
<object class="GtkGrid" id="countdown_grid"> <object class="GtkGrid" id="countdown_grid">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -397,11 +399,10 @@ ...@@ -397,11 +399,10 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<property name="spacing">16</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkButton" id="left_button"> <object class="GtkButton" id="left_button">
<property name="label" translatable="yes">Pause</property> <property name="label" translatable="yes">Pause</property>
<property name="width_request">132</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -419,7 +420,6 @@ ...@@ -419,7 +420,6 @@
<child> <child>
<object class="GtkButton" id="right_button"> <object class="GtkButton" id="right_button">
<property name="label" translatable="yes">Reset</property> <property name="label" translatable="yes">Reset</property>
<property name="width_request">132</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
......
...@@ -621,7 +621,8 @@ public class Face : Gtk.Stack, Clocks.Clock { ...@@ -621,7 +621,8 @@ public class Face : Gtk.Stack, Clocks.Clock {
}); });
// Translators: "New" refers to an alarm // Translators: "New" refers to an alarm
new_button = new Gtk.Button.with_label (C_("Alarm", "New")); new_button = new Gtk.Button.from_icon_name ("list-add-symbolic");
new_button.tooltip_text = C_("Alarm", "New");
new_button.valign = Gtk.Align.CENTER; new_button.valign = Gtk.Align.CENTER;
new_button.no_show_all = true; new_button.no_show_all = true;
new_button.action_name = "win.new"; new_button.action_name = "win.new";
......
...@@ -111,6 +111,9 @@ public class Application : Gtk.Application { ...@@ -111,6 +111,9 @@ public class Application : Gtk.Application {
}); });
update_theme (settings); update_theme (settings);
var icon_theme = Gtk.IconTheme.get_default ();
icon_theme.add_resource_path ("/org/gnome/clocks/icons/hicolor");
set_accels_for_action ("win.new", { "<Primary>n" }); set_accels_for_action ("win.new", { "<Primary>n" });
set_accels_for_action ("win.select-all", { "<Primary>a" }); set_accels_for_action ("win.select-all", { "<Primary>a" });
set_accels_for_action ("win.show-primary-menu", { "F10" }); set_accels_for_action ("win.show-primary-menu", { "F10" });
......
...@@ -306,7 +306,8 @@ public class ContentView : Gtk.Bin { ...@@ -306,7 +306,8 @@ public class ContentView : Gtk.Bin {
flow_box = new Gtk.FlowBox (); flow_box = new Gtk.FlowBox ();
flow_box.selection_mode = Gtk.SelectionMode.NONE; flow_box.selection_mode = Gtk.SelectionMode.NONE;
flow_box.min_children_per_line = 3; flow_box.halign = Gtk.Align.CENTER;
flow_box.min_children_per_line = 1;
flow_box.child_activated.connect ((child) => { flow_box.child_activated.connect ((child) => {
var item = model.get_item (child.get_index ()) as ContentItem; var item = model.get_item (child.get_index ()) as ContentItem;
...@@ -552,7 +553,7 @@ public class AmPmToggleButton : Gtk.Button { ...@@ -552,7 +553,7 @@ public class AmPmToggleButton : Gtk.Button {
public class AnalogFrame : Gtk.Bin { public class AnalogFrame : Gtk.Bin {
protected const int LINE_WIDTH = 6; protected const int LINE_WIDTH = 6;
protected const int RADIUS_PAD = 48; protected const int RADIUS_PAD = 24;
private int calculate_diameter () { private int calculate_diameter () {
int ret = 2 * RADIUS_PAD; int ret = 2 * RADIUS_PAD;
......
...@@ -85,6 +85,11 @@ public class Window : Gtk.ApplicationWindow { ...@@ -85,6 +85,11 @@ public class Window : Gtk.ApplicationWindow {
}); });
} }