Hello community, here is the log from the commit of package quilter for openSUSE:Factory checked in at 2019-09-11 10:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilter (Old) and /work/SRC/openSUSE:Factory/.quilter.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilter" Wed Sep 11 10:33:11 2019 rev:19 rq:729583 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/quilter/quilter.changes 2019-08-16 15:44:51.805713038 +0200 +++ /work/SRC/openSUSE:Factory/.quilter.new.7948/quilter.changes 2019-09-11 10:33:33.575328174 +0200 @@ -1,0 +2,7 @@ +Mon Sep 2 14:00:23 UTC 2019 - Alexei Podvalsky <[email protected]> + +- Update to 2.0.0: + * Added: New Layout; Half-Width, check it out by changing layouts + on the statusbar. + +------------------------------------------------------------------- Old: ---- quilter-1.9.5.tar.gz New: ---- quilter-2.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilter.spec ++++++ --- /var/tmp/diff_new_pack.HsLkxA/_old 2019-09-11 10:33:34.215327988 +0200 +++ /var/tmp/diff_new_pack.HsLkxA/_new 2019-09-11 10:33:34.219327986 +0200 @@ -17,7 +17,7 @@ Name: quilter -Version: 1.9.5 +Version: 2.0.0 Release: 0 Summary: Writing application License: GPL-3.0-only ++++++ quilter-1.9.5.tar.gz -> quilter-2.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/app.gresource.xml new/quilter-2.0.0/data/app.gresource.xml --- old/quilter-1.9.5/data/app.gresource.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/app.gresource.xml 2019-08-28 01:24:51.000000000 +0200 @@ -7,7 +7,6 @@ <file alias="app-stylesheet-dark.css" compressed="true">styles/app-stylesheet-dark.css</file> <file alias="app-stylesheet-sepia.css" compressed="true">styles/app-stylesheet-sepia.css</file> <file alias="app-stylesheet-moon.css" compressed="true">styles/app-stylesheet-moon.css</file> - <file alias="set-font.svg">icons/24/set-font.svg</file> <file alias="mode-change-symbolic.svg">icons/symbolic/mode-change-symbolic.svg</file> </gresource> </gresources> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/com.github.lainsce.quilter.appdata.xml.in new/quilter-2.0.0/data/com.github.lainsce.quilter.appdata.xml.in --- old/quilter-1.9.5/data/com.github.lainsce.quilter.appdata.xml.in 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/com.github.lainsce.quilter.appdata.xml.in 2019-08-28 01:24:51.000000000 +0200 @@ -55,6 +55,14 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> + <release version="2.0.0" date="2019-08-30"> + <description> + <p>Release: Layout Lambada</p> + <ul> + <li>Added: New Layout; Half-Width, check it out by changing layouts on the statusbar.</li> + </ul> + </description> + </release> <release version="1.9.5" date="2019-08-05"> <description> <p>Release: Backend Blues</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/com.github.lainsce.quilter.gschema.xml new/quilter-2.0.0/data/com.github.lainsce.quilter.gschema.xml --- old/quilter-1.9.5/data/com.github.lainsce.quilter.gschema.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/com.github.lainsce.quilter.gschema.xml 2019-08-28 01:24:51.000000000 +0200 @@ -70,6 +70,11 @@ <summary>Font used on Preview View</summary> <description>The user-preferred font to use in Preview in Quilter</description> </key> + <key name="preview-type" type="s"> + <default>'full'</default> + <summary>Preview type for the UI</summary> + <description>The user-preferred preview type to use in Preview in Quilter</description> + </key> <key name="track-type" type="s"> <default>''</default> <summary>Tracking type for the Statusbar</summary> @@ -98,7 +103,7 @@ <summary>Show (true) or Hide (false) the statusbar</summary> </key> <key name="sidebar" type="b"> - <default>true</default> + <default>false</default> <summary>Show (true) or Hide (false) the sidebar</summary> </key> <key name="searchbar" type="b"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/icons/24/set-font.svg new/quilter-2.0.0/data/icons/24/set-font.svg --- old/quilter-1.9.5/data/icons/24/set-font.svg 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/icons/24/set-font.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,268 +0,0 @@ -<?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="24" - height="24" - viewBox="0 0 24 24.000001" - version="1.1" - id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="set-font.svg"> - <defs - id="defs2"> - <linearGradient - id="linearGradient863"> - <stop - style="stop-color:#d35f5f;stop-opacity:1" - offset="0" - id="stop858" /> - <stop - style="stop-color:#a02c2c;stop-opacity:1" - offset="1" - id="stop860" /> - </linearGradient> - <linearGradient - id="linearGradient856"> - <stop - style="stop-color:#ff8080;stop-opacity:1" - offset="0" - id="stop851" /> - <stop - style="stop-color:#a02c2c;stop-opacity:1" - offset="1" - id="stop853" /> - </linearGradient> - <linearGradient - id="linearGradient849"> - <stop - style="stop-color:#ff8080;stop-opacity:1" - offset="0" - id="stop845" /> - <stop - style="stop-color:#a02c2c;stop-opacity:1" - offset="1" - id="stop847" /> - </linearGradient> - <linearGradient - id="linearGradient868"> - <stop - style="stop-color:#4d4d4d;stop-opacity:1" - offset="0" - id="stop864" /> - <stop - style="stop-color:#333333;stop-opacity:0" - offset="1" - id="stop866" /> - </linearGradient> - <linearGradient - id="linearGradient5060"> - <stop - id="stop5062" - style="stop-color:#000000;stop-opacity:1" - offset="0" /> - <stop - id="stop5064" - style="stop-color:#000000;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - id="stop5050" - style="stop-color:#000000;stop-opacity:0" - offset="0" /> - <stop - id="stop5056" - style="stop-color:#000000;stop-opacity:1" - offset="0.5" /> - <stop - id="stop5052" - style="stop-color:#000000;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - cx="605.71429" - cy="486.64789" - r="117.14286" - fx="605.71429" - fy="486.64789" - id="radialGradient3021" - xlink:href="#linearGradient5060" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.01325345,0,0,0.01235285,13.362672,1114.9906)" /> - <radialGradient - cx="605.71429" - cy="486.64789" - r="117.14286" - fx="605.71429" - fy="486.64789" - id="radialGradient3024" - xlink:href="#linearGradient5060" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.01325345,0,0,0.01235285,10.637326,1114.9906)" /> - <linearGradient - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" - id="linearGradient3027" - xlink:href="#linearGradient5048" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.0387278,0,0,0.01235285,-1.9973371,1114.9905)" /> - <linearGradient - gradientTransform="matrix(0.72275548,0,0,0.77208604,25.510024,1092.409)" - gradientUnits="userSpaceOnUse" - y2="37.678539" - x2="-17.375" - y1="-6.125" - x1="-17.375" - id="linearGradient1063" - xlink:href="#linearGradient1061" /> - <linearGradient - id="linearGradient1061"> - <stop - id="stop1057" - offset="0" - style="stop-color:#4d4d4d;stop-opacity:1" /> - <stop - id="stop1059" - offset="1" - style="stop-color:#333333;stop-opacity:1" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.59136335,0,0,0.78270158,-6.5496965,1086.4859)" - gradientUnits="userSpaceOnUse" - y2="44.5" - x2="44" - y1="0" - x1="44" - id="linearGradient1071" - xlink:href="#linearGradient1069" /> - <linearGradient - id="linearGradient1069"> - <stop - id="stop1065" - offset="0" - style="stop-color:#ed5353;stop-opacity:1" /> - <stop - id="stop1067" - offset="1" - style="stop-color:#c6262e;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1061" - id="linearGradient860" - x1="3" - y1="1106.5197" - x2="3" - y2="1114.5197" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1061" - id="linearGradient871" - x1="10.98933" - y1="1105.2452" - x2="10.98933" - y2="1121.1837" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1061" - id="linearGradient853" - gradientUnits="userSpaceOnUse" - x1="21" - y1="1106.5197" - x2="21" - y2="1114.5197" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="31.678384" - inkscape:cx="1.523906" - inkscape:cy="12.085565" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="true" - units="px" - inkscape:window-width="1920" - inkscape:window-height="962" - inkscape:window-x="0" - inkscape:window-y="30" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid835" /> - </sodipodi:namedview> - <metadata - id="metadata5"> - <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> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0,-1098.5197)"> - <rect - style="display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#linearGradient3027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none" - id="rect2879" - y="1119.5197" - x="2.6500008" - height="2.9999735" - width="18.699997" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3024);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none" - id="path2881" - d="m 2.6499998,1119.5199 c 0,0 0,2.9997 0,2.9997 -0.6825196,0.011 -1.64999985,-0.6721 -1.64999985,-1.5001 0,-0.828 0.76163995,-1.4996 1.64999985,-1.4996 z" /> - <path - inkscape:connector-curvature="0" - style="display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:url(#radialGradient3021);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none" - id="path2883" - d="m 21.349999,1119.5199 c 0,0 0,2.9997 0,2.9997 0.68252,0 1.65,-0.6721 1.65,-1.5001 0,-0.828 -0.761642,-1.4996 -1.65,-1.4996 z" /> - <path - style="fill:url(#linearGradient860);stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.17777778;fill-opacity:1" - d="m 1,1107.5197 v 6 l 3,-3 z" - id="path837" - inkscape:connector-curvature="0" /> - <path - style="fill:url(#linearGradient853);stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.17777778;fill-opacity:1" - d="m 23,1107.5197 v 6 l -3,-3 z" - id="path837-3" - inkscape:connector-curvature="0" /> - <g - aria-label="A" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1;font-family:'Redacted Script';-inkscape-font-specification:'Redacted Script';letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient871);fill-opacity:1;stroke:#ffffff;stroke-width:0.69659078;stroke-opacity:0.17777778;stroke-linejoin:round;stroke-linecap:round" - id="text844" - transform="matrix(1.3686138,0,0,1.5057875,-3.0401485,-565.74481)"> - <path - d="m 3.6826667,1120.5197 v -0.6614 q 1.8986667,-0.043 2.3893334,-1.4293 L 10.488,1105.6717 q 0.08533,-0.256 0.170667,-0.3414 0.106667,-0.085 0.341333,-0.085 0.128,0 0.192,0.021 0.08533,0.021 0.128,0.1067 0.064,0.064 0.08533,0.1067 0.02133,0.043 0.08533,0.192 l 4.608,13.3333 q 0.170667,0.5333 0.512,0.704 0.341333,0.1493 1.301333,0.1493 h 0.384 v 0.6614 q -1.344,-0.064 -2.794666,-0.064 -2.304,0 -3.072,0.064 v -0.6614 q 1.770666,0 1.770666,-0.64 0,-0.043 -0.064,-0.2986 l -1.130666,-3.264 H 7.7360001 l -0.9813333,2.7946 q -0.042667,0.085 -0.042667,0.32 0,0.448 0.4053334,0.768 0.4266666,0.32 1.1946667,0.32 v 0.6614 q -2.0480001,-0.064 -2.4533334,-0.064 -0.7040001,0 -2.1759998,0.064 z m 4.2880001,-5.5254 H 12.770667 L 10.36,1108.061 Z" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';fill:url(#linearGradient871);fill-opacity:1;stroke-width:0.59543896;stroke:#ffffff;stroke-opacity:0.17777778;stroke-linejoin:round;stroke-linecap:round" - id="path846" - inkscape:connector-curvature="0" /> - </g> - </g> -</svg> Binary files old/quilter-1.9.5/data/images/shot-dark.png and new/quilter-2.0.0/data/images/shot-dark.png differ Binary files old/quilter-1.9.5/data/images/shot-focused.png and new/quilter-2.0.0/data/images/shot-focused.png differ Binary files old/quilter-1.9.5/data/images/shot-preview.png and new/quilter-2.0.0/data/images/shot-preview.png differ Binary files old/quilter-1.9.5/data/images/shot-sepia.png and new/quilter-2.0.0/data/images/shot-sepia.png differ Binary files old/quilter-1.9.5/data/images/shot.png and new/quilter-2.0.0/data/images/shot.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/schemes/quilter-dark.xml new/quilter-2.0.0/data/schemes/quilter-dark.xml --- old/quilter-1.9.5/data/schemes/quilter-dark.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/schemes/quilter-dark.xml 2019-08-28 01:24:51.000000000 +0200 @@ -3,11 +3,11 @@ <author>Lains</author> <_description>Emphasis on focus.</_description> - <style name="text" foreground="#C3C3C1" background="#151611"/> + <style name="text" foreground="#C3C3C3" background="#191919"/> <style name="cursor" foreground="#0DBCEE"/> <style name="current-line" background="#4D4D4D"/> - <style name="selection" foreground="#C3C3C1" background="#0D89CC"/> - <style name="search-match" foreground="#151611" background="#CC890D"/> + <style name="selection" foreground="#191919" background="#0D89CC"/> + <style name="search-match" foreground="#191919" background="#CC890D"/> <!-- Bold --> <style name="def:statement" bold="true"/> @@ -20,7 +20,7 @@ <style name="def:underlined" foreground="#0DBCEE"/> <!-- Code --> - <style name="def:identifier" foreground="#7E8087"/> + <style name="def:identifier" foreground="#7E8089"/> <!-- Line-break --> <style name="def:note" foreground="#C3C3C1"/> @@ -36,5 +36,5 @@ <style name="def:special-char" foreground="#7E8087"/> <!-- Headers --> - <style name="def:type" foreground="#C3C3C1" bold="true"/> + <style name="def:type" foreground="#C3C3C3" bold="true"/> </style-scheme> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/schemes/quilter-moon.xml new/quilter-2.0.0/data/schemes/quilter-moon.xml --- old/quilter-1.9.5/data/schemes/quilter-moon.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/schemes/quilter-moon.xml 2019-08-28 01:24:51.000000000 +0200 @@ -20,7 +20,7 @@ <style name="def:underlined" foreground="#4DBCEE"/> <!-- Code --> - <style name="def:identifier" foreground="#7E8087"/> + <style name="def:identifier" foreground="#161D24"/> <!-- Line-break --> <style name="def:note" foreground="#C3C3C1"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/schemes/quilter-sepia.xml new/quilter-2.0.0/data/schemes/quilter-sepia.xml --- old/quilter-1.9.5/data/schemes/quilter-sepia.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/schemes/quilter-sepia.xml 2019-08-28 01:24:51.000000000 +0200 @@ -20,7 +20,7 @@ <style name="def:underlined" foreground="#00897b"/> <!-- Code --> - <style name="def:identifier" foreground="#c1a073"/> + <style name="def:identifier" foreground="#c1a075"/> <!-- Line-break --> <style name="def:note" foreground="#3b3228"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/schemes/quilter.xml new/quilter-2.0.0/data/schemes/quilter.xml --- old/quilter-1.9.5/data/schemes/quilter.xml 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/schemes/quilter.xml 2019-08-28 01:24:51.000000000 +0200 @@ -3,7 +3,7 @@ <author>Lains</author> <_description>Emphasis on focus.</_description> - <style name="text" foreground="#333" background="#FFF"/> + <style name="text" foreground="#333" background="#F7F5F7"/> <style name="cursor" foreground="#0073c5"/> <style name="current-line" background="#eff0f1"/> <style name="selection" foreground="#EEE" background="#0073c5"/> @@ -20,7 +20,7 @@ <style name="def:underlined" foreground="#0073c5"/> <!-- Code --> - <style name="def:identifier" background="#F0F0F0" foreground="#333"/> + <style name="def:identifier" background="#F2F0F2" foreground="#333"/> <!-- Line-break --> <style name="def:note" foreground="#333"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/styles/app-main-stylesheet.css new/quilter-2.0.0/data/styles/app-main-stylesheet.css --- old/quilter-1.9.5/data/styles/app-main-stylesheet.css 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/styles/app-main-stylesheet.css 2019-08-28 01:24:51.000000000 +0200 @@ -8,12 +8,12 @@ } .color-dark { - background-color: #151611; - border: 1px solid #050601; + background-color: #191919; + border: 1px solid #717171; box-shadow: - inset 0 0 0 1px alpha (shade (#353631, 1.4), 0.05), - inset 0 1px 0 0 alpha (#353631, 0.45), - inset 0 -1px 0 0 alpha (#555651, 0.15); + inset 0 0 0 1px alpha (shade (#3b3b3b, 1.4), 0.05), + inset 0 1px 0 0 alpha (#3b3b3b, 0.45), + inset 0 -1px 0 0 alpha (#5b5b5b, 0.15); background-image: linear-gradient( to bottom, @@ -29,14 +29,14 @@ .color-dark:active { border-color: #0DBCEE; box-shadow: - inset 0 1px 0 0 alpha (#353631, 0.45), - inset 0 -1px 0 0 alpha (#353631, 0.15), - 0 0 0 1px alpha (#A3A3A1, 0.25); + inset 0 1px 0 0 alpha (#3b3b3b, 0.45), + inset 0 -1px 0 0 alpha (#3b3b3b, 0.15), + 0 0 0 1px alpha (#AbAbAb, 0.25); transition: all 100ms ease-out; } .color-dark image { - color: #C3C3C1; + color: #C3C3C3; -gtk-icon-shadow: 1px 1px transparent; } @@ -167,7 +167,6 @@ border: 1px solid transparent; } - .quilter-sidebar button.radio { border-radius: 0; } @@ -220,3 +219,15 @@ .quilter-menu:hover { border: 1px solid alpha (@textColorPrimary, 0.35); } + +.quilter-cbt button { + background: @colorPrimary; + color: @textColorPrimary; + border: 1px solid alpha (@textColorPrimary, 0); + background-image: none; + box-shadow: none; +} + +.quilter-cbt button:hover { + border: 1px solid alpha (@textColorPrimary, 0.35); +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/styles/app-stylesheet-dark.css new/quilter-2.0.0/data/styles/app-stylesheet-dark.css --- old/quilter-1.9.5/data/styles/app-stylesheet-dark.css 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/styles/app-stylesheet-dark.css 2019-08-28 01:24:51.000000000 +0200 @@ -1,4 +1,4 @@ -@define-color colorPrimary #1b1c17; +@define-color colorPrimary #2b2b2b; @define-color textColorPrimary #C3C3C1; @define-color accentColor #0DBCEE; @@ -37,6 +37,11 @@ background-color: alpha (@accentColor, 0.35); } +.quilter-cbt button:hover, +.quilter-cbt button:backdrop:active { + background-color: alpha (@accentColor, 0.35); +} + .quilter-sidebar-box:hover { background: shade (@colorPrimary, 1.3); color: @textColorPrimary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/styles/app-stylesheet-moon.css new/quilter-2.0.0/data/styles/app-stylesheet-moon.css --- old/quilter-1.9.5/data/styles/app-stylesheet-moon.css 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/styles/app-stylesheet-moon.css 2019-08-28 01:24:51.000000000 +0200 @@ -38,6 +38,11 @@ background-color: alpha (@accentColor, 0.35); } +.quilter-cbt button:hover, +.quilter-cbt button:backdrop:active { + background-color: alpha (@accentColor, 0.35); +} + .quilter-sidebar-box:hover { background: shade (@colorPrimary, 0.95); color: @textColorPrimary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/styles/app-stylesheet-sepia.css new/quilter-2.0.0/data/styles/app-stylesheet-sepia.css --- old/quilter-1.9.5/data/styles/app-stylesheet-sepia.css 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/styles/app-stylesheet-sepia.css 2019-08-28 01:24:51.000000000 +0200 @@ -37,6 +37,11 @@ background-color: alpha (@accentColor, 0.35); } +.quilter-cbt button:hover, +.quilter-cbt button:backdrop:active { + background-color: alpha (@accentColor, 0.35); +} + .quilter-sidebar-box:hover { background: shade (@colorPrimary, 0.95); color: @textColorPrimary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/data/styles/app-stylesheet.css new/quilter-2.0.0/data/styles/app-stylesheet.css --- old/quilter-1.9.5/data/styles/app-stylesheet.css 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/data/styles/app-stylesheet.css 2019-08-28 01:24:51.000000000 +0200 @@ -39,6 +39,11 @@ background-color: alpha (@accentColor, 0.35); } +.quilter-cbt button:hover, +.quilter-cbt button:backdrop:active { + background-color: alpha (@accentColor, 0.35); +} + .quilter-sidebar-box:hover { background: shade (@colorPrimary, 0.95); color: @textColorPrimary; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/debian/control new/quilter-2.0.0/debian/control --- old/quilter-1.9.5/debian/control 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/debian/control 2019-08-28 01:24:51.000000000 +0200 @@ -5,7 +5,7 @@ Build-Depends: meson, debhelper (>= 9), libgtk-3-dev, - valac (>= 0.26), + valac, libgranite-dev, libgtksourceview-3.0-dev, libwebkit2gtk-4.0-dev, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/meson.build new/quilter-2.0.0/meson.build --- old/quilter-1.9.5/meson.build 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/meson.build 2019-08-28 01:24:51.000000000 +0200 @@ -1,6 +1,6 @@ # Name our project project('com.github.lainsce.quilter', ['vala', 'c'], - version: '1.9.4' + version: '2.0.0' ) # Import main lib files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Application.vala new/quilter-2.0.0/src/Application.vala --- old/quilter-1.9.5/src/Application.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Application.vala 2019-08-28 01:24:51.000000000 +0200 @@ -55,12 +55,16 @@ } win = new MainWindow (this); - if (open_view) { - win.stack.set_visible_child (win.preview_view); - open_view = false; - } else { - win.stack.set_visible_child (win.edit_view); + var settings = AppSettings.get_default (); + if (settings.preview_type == "full") { + if (open_view) { + win.stack.set_visible_child (win.preview_view); + open_view = false; + } else { + win.stack.set_visible_child (win.edit_view); + } } + win.show_all (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Constants/AppSettings.vala new/quilter-2.0.0/src/Constants/AppSettings.vala --- old/quilter-1.9.5/src/Constants/AppSettings.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Constants/AppSettings.vala 2019-08-28 01:24:51.000000000 +0200 @@ -61,6 +61,7 @@ public string preview_font { get; set; } public string spellcheck_language { get; set; } public string track_type { get; set; } + public string preview_type { get; set; } private static AppSettings? instance; public static unowned AppSettings get_default () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/MainWindow.vala new/quilter-2.0.0/src/MainWindow.vala --- old/quilter-1.9.5/src/MainWindow.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/MainWindow.vala 2019-08-28 01:24:51.000000000 +0200 @@ -29,7 +29,10 @@ public Gtk.MenuButton set_font_menu; public Widgets.EditView edit_view_content; public Widgets.Preview preview_view_content; + public Gtk.Stack main_stack; public Gtk.Stack stack; + public Gtk.StackSwitcher view_mode; + public Gtk.Paned paned; public Gtk.ScrolledWindow edit_view; public Gtk.ScrolledWindow preview_view; public Gtk.Grid grid; @@ -167,20 +170,24 @@ } if (match_keycode (Gdk.Key.F1, keycode)) { debug ("Press to change view..."); - if (this.stack.get_visible_child_name () == "preview_view") { - this.stack.set_visible_child (this.edit_view); - } else if (this.stack.get_visible_child_name () == "edit_view") { - this.stack.set_visible_child (this.preview_view); + if (settings.preview_type == "full") { + if (this.stack.get_visible_child_name () == "preview_view") { + this.stack.set_visible_child (this.edit_view); + } else if (this.stack.get_visible_child_name () == "edit_view") { + this.stack.set_visible_child (this.preview_view); + } } return true; } if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) { if (match_keycode (Gdk.Key.@1, keycode)) { debug ("Press to change view..."); - if (this.stack.get_visible_child_name () == "preview_view") { - this.stack.set_visible_child (this.edit_view); - } else if (this.stack.get_visible_child_name () == "edit_view") { - this.stack.set_visible_child (this.preview_view); + if (settings.preview_type == "full") { + if (this.stack.get_visible_child_name () == "preview_view") { + this.stack.set_visible_child (this.edit_view); + } else if (this.stack.get_visible_child_name () == "edit_view") { + this.stack.set_visible_child (this.preview_view); + } } return true; } @@ -273,25 +280,42 @@ stack = new Gtk.Stack (); stack.hexpand = true; stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT; - stack.add_titled (edit_view, "edit_view", _("Edit")); - stack.add_titled (preview_view, "preview_view", _("Preview")); - stack.set_visible_child (this.edit_view); + if (settings.preview_type == "full") { + bool v = settings.shown_view; + if (v) { + stack.set_visible_child (preview_view); + } else { + stack.set_visible_child (edit_view); + } + } - var view_mode = new Gtk.StackSwitcher (); + view_mode = new Gtk.StackSwitcher (); view_mode.stack = stack; view_mode.valign = Gtk.Align.CENTER; view_mode.homogeneous = true; - toolbar.pack_end (view_mode); show_font_button (false); - ((Gtk.RadioButton)(view_mode.get_children().first().data)).toggled.connect(() => { - show_font_button (false); - }); - ((Gtk.RadioButton)(view_mode.get_children().last().data)).toggled.connect(() => { + if (stack.get_visible_child_name () == "preview_view") { show_font_button (true); toolbar.pack_end (set_font_menu); - }); + } else if (stack.get_visible_child_name () == "edit_view") { + show_font_button (false); + } + + toolbar.pack_end (view_mode); + + paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL); + int wd = settings.window_width; + paned.set_position (wd/2); + + main_stack = new Gtk.Stack (); + main_stack.hexpand = true; + main_stack.transition_type = Gtk.StackTransitionType.CROSSFADE; + main_stack.add_named (stack, "stack"); + main_stack.add_named (paned, "paned"); + + change_layout (); actions = new SimpleActionGroup (); actions.add_action_entries (action_entries, this); @@ -309,20 +333,15 @@ grid.orientation = Gtk.Orientation.VERTICAL; grid.attach (searchbar, 0, 0, 2, 1); grid.attach (sidebar, 0, 1, 1, 1); - grid.attach (stack, 1, 1, 1, 1); + grid.attach (main_stack, 1, 1, 1, 1); grid.attach (statusbar, 0, 2, 2, 1); grid.show_all (); this.add (grid); int x = settings.window_x; int y = settings.window_y; - int h = settings.window_height; int w = settings.window_width; - - bool v = settings.shown_view; - if (v) { - this.stack.set_visible_child (this.preview_view); - } + int h = settings.window_height; if (x != -1 && y != -1) { this.move (x, y); @@ -340,7 +359,6 @@ } this.window_position = Gtk.WindowPosition.CENTER; - //this.show_all (); } #if VALA_0_42 @@ -364,14 +382,16 @@ int x, y, w, h; get_position (out x, out y); get_size (out w, out h); - bool v = set_font_menu.get_visible (); var settings = AppSettings.get_default (); settings.window_x = x; settings.window_y = y; settings.window_width = w; settings.window_height = h; - settings.shown_view = v; + if (settings.preview_type == "full") { + bool v = set_font_menu.get_visible (); + settings.shown_view = v; + } string[] files = {}; foreach (unowned Widgets.SideBarBox row in sidebar.get_rows ()) { @@ -385,6 +405,15 @@ return false; } + private static void widget_unparent (Gtk.Widget widget) { + unowned Gtk.Container? parent = widget.get_parent (); + if (parent == null) { + return; + } + + parent.remove (widget); + } + private void update_count () { var settings = AppSettings.get_default (); if (settings.track_type == "words") { @@ -474,7 +503,7 @@ var settings = AppSettings.get_default (); if (!settings.focus_mode) { - set_font_menu.image = new Gtk.Image.from_icon_name ("set-font", Gtk.IconSize.LARGE_TOOLBAR); + set_font_menu.image = new Gtk.Image.from_icon_name ("font-select-symbolic", Gtk.IconSize.LARGE_TOOLBAR); } else { set_font_menu.image = new Gtk.Image.from_icon_name ("font-select-symbolic", Gtk.IconSize.SMALL_TOOLBAR); } @@ -492,6 +521,29 @@ sidebar.get_file_contents_as_items (); sidebar.view.expand_all (); } + + change_layout (); + } + + private void change_layout () { + var settings = AppSettings.get_default (); + if (settings.preview_type == "full") { + widget_unparent (edit_view); + widget_unparent (preview_view); + stack.add_titled (edit_view, "edit_view", _("Edit")); + stack.add_titled (preview_view, "preview_view", _("Preview")); + main_stack.set_visible_child (stack); + } else { + foreach (Gtk.Widget c in stack.get_children ()) { + stack.remove (c); + } + widget_unparent (edit_view); + widget_unparent (preview_view); + paned.pack1 (edit_view, false, false); + paned.pack2 (preview_view, false, false); + main_stack.set_visible_child (paned); + show_font_button (false); + } } private void on_create_new () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Styles/quilterdark.vala new/quilter-2.0.0/src/Styles/quilterdark.vala --- old/quilter-1.9.5/src/Styles/quilterdark.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Styles/quilterdark.vala 2019-08-28 01:24:51.000000000 +0200 @@ -109,8 +109,8 @@ } body { - color: #C3C3C1; - background-color: #151611; + color: #C3C3C3; + background-color: #111111; font-weight: 400; line-height: 1.4rem; margin-left: 40px; @@ -128,17 +128,17 @@ table th { font-weight: bold; - background-color: #23241c; + background-color: #2b2b2b; } table th, table td { padding: 8px 13px; - border: 1px solid #23241c; + border: 1px solid #2b2b2b; } table tr { - border-top: 1px solid #23241c; + border-top: 1px solid #2b2b2b; } img { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Styles/quiltermoon.vala new/quilter-2.0.0/src/Styles/quiltermoon.vala --- old/quilter-1.9.5/src/Styles/quiltermoon.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Styles/quiltermoon.vala 2019-08-28 01:24:51.000000000 +0200 @@ -110,7 +110,7 @@ body { color: #C3C3C1; - background-color: #273445; + background-color: #192839; font-weight: 400; line-height: 1.4rem; margin-left: 40px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Styles/quiltersepia.vala new/quilter-2.0.0/src/Styles/quiltersepia.vala --- old/quilter-1.9.5/src/Styles/quiltersepia.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Styles/quiltersepia.vala 2019-08-28 01:24:51.000000000 +0200 @@ -109,7 +109,7 @@ body { color: #3b3228; - background-color: #F0E8DD; + background-color: #f8f4ef; font-weight: 400; line-height: 1.4rem; margin-left: 40px; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Widgets/HeaderBar.vala new/quilter-2.0.0/src/Widgets/HeaderBar.vala --- old/quilter-1.9.5/src/Widgets/HeaderBar.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Widgets/HeaderBar.vala 2019-08-28 01:24:51.000000000 +0200 @@ -283,13 +283,13 @@ public void focus_mode_toolbar () { var settings = AppSettings.get_default (); if (!settings.focus_mode) { - new_button.set_image (new Gtk.Image.from_icon_name ("document-new", Gtk.IconSize.LARGE_TOOLBAR)); - save_button.set_image (new Gtk.Image.from_icon_name ("document-save", Gtk.IconSize.LARGE_TOOLBAR)); - save_as_button.set_image (new Gtk.Image.from_icon_name ("document-save-as", Gtk.IconSize.LARGE_TOOLBAR)); - open_button.set_image (new Gtk.Image.from_icon_name ("document-open", Gtk.IconSize.LARGE_TOOLBAR)); - menu_button.set_image (new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR)); - share_app_menu.image = new Gtk.Image.from_icon_name ("document-export", Gtk.IconSize.LARGE_TOOLBAR); - search_button.set_image (new Gtk.Image.from_icon_name ("edit-find", Gtk.IconSize.LARGE_TOOLBAR)); + new_button.set_image (new Gtk.Image.from_icon_name ("document-new-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); + save_button.set_image (new Gtk.Image.from_icon_name ("document-save-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); + save_as_button.set_image (new Gtk.Image.from_icon_name ("document-save-as-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); + open_button.set_image (new Gtk.Image.from_icon_name ("document-open-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); + menu_button.set_image (new Gtk.Image.from_icon_name ("open-menu-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); + share_app_menu.image = new Gtk.Image.from_icon_name ("document-export-symbolic", Gtk.IconSize.LARGE_TOOLBAR); + search_button.set_image (new Gtk.Image.from_icon_name ("edit-find-symbolic", Gtk.IconSize.LARGE_TOOLBAR)); } else { new_button.set_image (new Gtk.Image.from_icon_name ("document-new-symbolic", Gtk.IconSize.SMALL_TOOLBAR)); save_button.set_image (new Gtk.Image.from_icon_name ("document-save-symbolic", Gtk.IconSize.SMALL_TOOLBAR)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.9.5/src/Widgets/StatusBar.vala new/quilter-2.0.0/src/Widgets/StatusBar.vala --- old/quilter-1.9.5/src/Widgets/StatusBar.vala 2019-08-06 01:32:23.000000000 +0200 +++ new/quilter-2.0.0/src/Widgets/StatusBar.vala 2019-08-28 01:24:51.000000000 +0200 @@ -26,6 +26,7 @@ public MainWindow window; public Gtk.ActionBar actionbar; public Gtk.MenuButton track_type_menu; + public Gtk.MenuButton preview_type_menu; public Gtk.SourceBuffer buf; /* Average normal reading speed is 275 WPM */ @@ -61,6 +62,8 @@ track_type_menu_item (); + preview_type_menu_item (); + if (settings.track_type == "words") { update_wordcount (); } else if (settings.track_type == "lines") { @@ -75,6 +78,36 @@ this.add (actionbar); } + public void preview_type_menu_item () { + var settings = AppSettings.get_default (); + + var preview_cbt = new Gtk.ComboBoxText(); + preview_cbt.append_text(_("Full-Width")); + preview_cbt.append_text(_("Half-Width")); + + if (settings.preview_type == "full") { + preview_cbt.set_active(0); + settings.preview_type = "full"; + } else if (settings.preview_type == "half") { + preview_cbt.set_active(1); + settings.preview_type = "half"; + } + + preview_cbt.changed.connect (() => { + var pcbt_value = preview_cbt.get_active(); + if (pcbt_value == 0) { + settings.preview_type = "full"; + } else if (pcbt_value == 1) { + settings.preview_type = "half"; + } + }); + + var preview_cbt_context = preview_cbt.get_style_context (); + preview_cbt_context.add_class ("quilter-cbt"); + preview_cbt_context.add_class (Gtk.STYLE_CLASS_FLAT); + actionbar.pack_end (preview_cbt); + } + public void track_type_menu_item () { var settings = AppSettings.get_default ();
