Hello community, here is the log from the commit of package spice-up for openSUSE:Factory checked in at 2018-09-18 11:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spice-up (Old) and /work/SRC/openSUSE:Factory/.spice-up.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-up" Tue Sep 18 11:46:32 2018 rev:11 rq:636172 version:1.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/spice-up/spice-up.changes 2018-08-28 09:24:44.152882585 +0200 +++ /work/SRC/openSUSE:Factory/.spice-up.new/spice-up.changes 2018-09-18 11:47:01.203687035 +0200 @@ -1,0 +2,19 @@ +Mon Sep 10 12:10:22 UTC 2018 - Alexei Podvalsky <avvi...@yandex.by> + +- Update to 1.5.2: + * Update com.github.philip-scott.spice-up.appdata.xml + * LibraryItem: Don't show popover on templates + * Rename com.github.philip_scott.spice_up.mime.xml to + com.github.philip-scott.spice-up.mime.xml + * Update CMakeLists.txt + * Update and rename + com.github.philip_scott.spice_up.appdata.xml to + com.github.philip-scott.spice-up.appdata.xml + * PresenterView: Change font-size with +/- keys + * Be smart about the mutex + * allow whitespace between commas on gradient regex + * Improve item positioning rounding + * Fix crash when moving a slide past the end + * Update RDNN name (#219) + +------------------------------------------------------------------- Old: ---- Spice-up-1.5.1.tar.gz New: ---- Spice-up-1.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spice-up.spec ++++++ --- /var/tmp/diff_new_pack.NHItBU/_old 2018-09-18 11:47:06.803681240 +0200 +++ /var/tmp/diff_new_pack.NHItBU/_new 2018-09-18 11:47:06.807681235 +0200 @@ -17,7 +17,7 @@ Name: spice-up -Version: 1.5.1 +Version: 1.5.2 Release: 0 Summary: Desktop presentation application License: GPL-3.0-only @@ -70,8 +70,8 @@ %{_datadir}/com.github.philip-scott.spice-up/ %{_datadir}/glib-2.0/schemas/com.github.philip-scott.spice-up.gschema.xml %{_datadir}/icons/hicolor/*/*/*.??g -%{_datadir}/metainfo/com.github.philip_scott.spice_up.appdata.xml -%{_datadir}/mime/packages/com.github.philip_scott.spice_up.mime.xml +%{_datadir}/metainfo/com.github.philip-scott.spice-up.appdata.xml +%{_datadir}/mime/packages/com.github.philip-scott.spice-up.mime.xml %files lang -f %{name}.lang ++++++ Spice-up-1.5.1.tar.gz -> Spice-up-1.5.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/data/CMakeLists.txt new/Spice-up-1.5.2/data/CMakeLists.txt --- old/Spice-up-1.5.1/data/CMakeLists.txt 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/data/CMakeLists.txt 2018-09-08 23:10:15.000000000 +0200 @@ -58,9 +58,9 @@ RENAME application-x-spiceup.svg) # install the appdata -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.github.philip_scott.spice_up.appdata.xml +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.github.philip-scott.spice-up.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo/) # install the mimefile -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.github.philip_scott.spice_up.mime.xml +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/com.github.philip-scott.spice-up.mime.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/mime/packages/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/data/com.github.philip-scott.spice-up.appdata.xml new/Spice-up-1.5.2/data/com.github.philip-scott.spice-up.appdata.xml --- old/Spice-up-1.5.1/data/com.github.philip-scott.spice-up.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/Spice-up-1.5.2/data/com.github.philip-scott.spice-up.appdata.xml 2018-09-08 23:10:15.000000000 +0200 @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (c) 2016 Felipe Escoto (https://github.com/Philip-Scott/Spice-up) --> +<component type="desktop"> + <id>com.github.philip-scott.spice-up</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-3.0+</project_license> + <name>Spice-Up</name> + <summary>Create simple and beautiful presentations</summary> + <description> + <p> + Everything you need to create simple and beautiful presentations with text, images, and shapes. Add some spice to your presentations with a wide variety of background patterns and beautiful color palette. + </p> + <p> + Features Include: + </p> + <ul> + <li>Exporting to PDF!</li> + <li>Presentation Browser: Scroll through the presentations you have made and jump right into them with one click!.</li> + <li>Controller Support: If you have a USB or Bluetooth controller, plug it in and control your slides!</li> + <li>Templates, so you can whip up a presentation in a blink of an eye.</li> + <li>You can edit images in your favorite editor, and it will automatically update when saved</li> + <li>Open Spice-Up files from a web browser by drag and drop if the app is not installed!</li> + </ul> + </description> + <provides> + <binary>spice-up</binary> + </provides> + <releases> + <release version="1.5.2" date="2018-8-23"> + <description> + <p>A Very Juno Update</p> + <ul> + <li>Spice-Up is now ready for elementary OS Juno!</li> + <li>Even more colors and gradients for you to make your presentations even better!</li> + <li>Files and Templates now show a label with it's name on the welcome screen</li> + <li>You can now copy and paste styles on the color pickers!</li> + <li>New templates will now be fetched from the web, so expect more to come!</li> + <li>New translations for Japanese, Catalan, Portuguese, Dutch!</li> + </ul> + </description> + </release> + <release version="1.3.2" date="2018-2-20"> + <description> + <p>The Color Update, Part 2</p> + <ul> + <li>The new color picker now uses their own custom icons!</li> + <li>The Gradient Editor's steps now shows feedback when selected</li> + <li>Spice-Up's icon has being updated to use the elementary color palette.</li> + <li>European Portuguese has been added to the family of translations. Big thanks to emansije!</li> + </ul> + </description> + </release> + <release version="1.3.0" date="2018-2-2"> + <description> + <p>The Color Update</p> + <ul> + <li>The color picker has had a mayor makeover!</li> + <li>You can now add/remove stops in gradients, as well as move them around and rotate them.</li> + <li>Grab inspiration from one of the ten new gradient presets!</li> + <li>You can also pick colors from the screen.</li> + <li>Fonts are search-able now</li> + <li>Font-styles are now styled (pun intended)</li> + <li>Notifications are now disabled when presenting</li> + </ul> + </description> + </release> + <release version="1.2.0" date="2017-12-25"> + <description> + <p>Presents for Presenters!</p> + <ul> + <li>Presentation View! Starting a presentation with two monitors will open the presentation on the secondary monitor, and a presentation viewer on your main screen.</li> + <li>You can now type presenter notes, and see them while presenting!</li> + <li>Your presentations now end with an all-black slide</li> + <li>Images can now be added by Drag and Drop</li> + <li>Spice-Up is now available in Serbian!</li> + <li>Some other fixes and cleanups</li> + </ul> + </description> + </release> + <release version="1.1.0" date="2017-11-2"> + <description> + <p>Huge Success!</p> + <ul> + <li>Presentations saved can now be viewed from a web browser by drag and drop if Spice-Up is not installed, and even if you're not using elementary OS or Linux</li> + </ul> + </description> + </release> + <release version="1.0.1" date="2017-10-13"> + <description> + <p>I'm making a note here...</p> + <ul> + <li>Lots of optimizations have happened, now it loads presentations crazy fast!</li> + <li>The Text Toolbar has been cleaned up to better match the other bars</li> + <li>You can now align text vertically!</li> + <li>Going to and from the Welcome Screen is now animated</li> + <li>Spice-Up is now translated to French and Portuguese!</li> + </ul> + </description> + </release> + <release version="1.0.0" date="2017-09-14"> + <description> + <p>This was a triumph!</p> + <ul> + <li>Creating a new presentation now brings up templates you can choose from.</li> + <li>You can now replace images right from Spice-Up.</li> + <li>Making a new slide now picks up the style from your last one.</li> + <li>You can now make Text and Shapes transparent, right from the custom color picker!</li> + <li>Fixed: Double clicking would sometimes unselect the item.</li> + <li>Fixed: The text on the roundness slider was hard to read.</li> + <li>Spice-Up is also now available in Spanish!</li> + </ul> + </description> + </release> + <release version="0.8.2" date="2017-08-27"> + <description> + <p>Now with 100% better feedback!</p> + <ul> + <li>Selecting slides, and colors on the color picker now feels like you actually press something.</li> + <li>ColorPicker: Click on the preview to be able to set both colors at once.</li> + <li>A better high resolution icon</li> + <li>Fixed: Spice-Up should now work a lot better with other themes</li> + <li>Fixed: Sometimes, the default blue color would get selected</li> + </ul> + </description> + </release> + <release version="0.8.0" date="2017-07-20"> + <description> + <p>Clipboard, Circles and a Browser</p> + <ul> + <li>Shapes: You can now set the roundness of the square, and finally make circles!</li> + <li>Cut, copy, and paste slides, and canvas items!</li> + <li>The presentations you make will appear on the welcome screen for easy access to them!</li> + </ul> + </description> + </release> + </releases> + <screenshots> + <screenshot type="default"> + <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot.png</image> + </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot1.png</image> + </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot2.png</image> + </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot3.png</image> + </screenshot> + <screenshot> + <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot4.png</image> + </screenshot> + </screenshots> + <content_rating type="oars-1.1"> + <content_attribute id="violence-cartoon">none</content_attribute> + <content_attribute id="violence-fantasy">none</content_attribute> + <content_attribute id="violence-realistic">none</content_attribute> + <content_attribute id="violence-bloodshed">none</content_attribute> + <content_attribute id="violence-sexual">none</content_attribute> + <content_attribute id="violence-desecration">none</content_attribute> + <content_attribute id="violence-slavery">none</content_attribute> + <content_attribute id="violence-worship">none</content_attribute> + <content_attribute id="drugs-alcohol">none</content_attribute> + <content_attribute id="drugs-narcotics">none</content_attribute> + <content_attribute id="drugs-tobacco">none</content_attribute> + <content_attribute id="sex-nudity">none</content_attribute> + <content_attribute id="sex-themes">none</content_attribute> + <content_attribute id="sex-homosexuality">none</content_attribute> + <content_attribute id="sex-prostitution">none</content_attribute> + <content_attribute id="sex-adultery">none</content_attribute> + <content_attribute id="sex-appearance">none</content_attribute> + <content_attribute id="language-profanity">none</content_attribute> + <content_attribute id="language-humor">none</content_attribute> + <content_attribute id="language-discrimination">none</content_attribute> + <content_attribute id="social-chat">none</content_attribute> + <content_attribute id="social-info">none</content_attribute> + <content_attribute id="social-audio">none</content_attribute> + <content_attribute id="social-location">none</content_attribute> + <content_attribute id="social-contacts">none</content_attribute> + <content_attribute id="money-purchasing">none</content_attribute> + <content_attribute id="money-gambling">none</content_attribute> + </content_rating> + <developer_name>Felipe Escoto</developer_name> + <url type="homepage">https://github.com/Philip-Scott/Spice-up</url> + <url type="bugtracker">https://github.com/Philip-Scott/Spice-up/issues</url> + <url type="help">https://github.com/Philip-Scott/Spice-up/issues</url> + <update_contact>felesc...@hotmail.com</update_contact> + <custom> + <value key="x-appcenter-color-primary">#C2D5FF</value> + <value key="x-appcenter-color-primary-text">#223b69</value> + <value key="x-appcenter-suggested-price">20</value> + </custom> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/data/com.github.philip-scott.spice-up.mime.xml new/Spice-up-1.5.2/data/com.github.philip-scott.spice-up.mime.xml --- old/Spice-up-1.5.1/data/com.github.philip-scott.spice-up.mime.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/Spice-up-1.5.2/data/com.github.philip-scott.spice-up.mime.xml 2018-09-08 23:10:15.000000000 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-spiceup"> + <comment>Spice-Up Presentation</comment> + <icon name="application-x-spiceup"/> + <glob-deleteall/> + <glob pattern="*.spice"/> + </mime-type> +</mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/data/com.github.philip_scott.spice_up.appdata.xml new/Spice-up-1.5.2/data/com.github.philip_scott.spice_up.appdata.xml --- old/Spice-up-1.5.1/data/com.github.philip_scott.spice_up.appdata.xml 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/data/com.github.philip_scott.spice_up.appdata.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,193 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (c) 2016 Felipe Escoto (https://github.com/Philip-Scott/Spice-up) --> -<component type="desktop"> - <id>com.github.philip_scott.spice_up</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-3.0+</project_license> - <name>Spice-Up</name> - <summary>Create simple and beautiful presentations</summary> - <description> - <p> - Everything you need to create simple and beautiful presentations with text, images, and shapes. Add some spice to your presentations with a wide variety of background patterns and beautiful color palette. - </p> - <p> - Features Include: - </p> - <ul> - <li>Exporting to PDF!</li> - <li>Presentation Browser: Scroll through the presentations you have made and jump right into them with one click!.</li> - <li>Controller Support: If you have a USB or Bluetooth controller, plug it in and control your slides!</li> - <li>Templates, so you can whip up a presentation in a blink of an eye.</li> - <li>You can edit images in your favorite editor, and it will automatically update when saved</li> - <li>Open Spice-Up files from a web browser by drag and drop if the app is not installed!</li> - </ul> - </description> - <provides> - <binary>spice-up</binary> - </provides> - <releases> - <release version="1.5.1" date="2018-8-23"> - <description> - <p>A Very Juno Update</p> - <ul> - <li>Spice-Up is now ready for elementary OS Juno!</li> - <li>Even more colors and gradients for you to make your presentations even better!</li> - <li>Files and Templates now show a label with it's name on the welcome screen</li> - <li>You can now copy and paste styles on the color pickers!</li> - <li>New templates will now be fetched from the web, so expect more to come!</li> - <li>New translations for Japanese, Catalan, Portuguese, Dutch!</li> - </ul> - </description> - </release> - <release version="1.3.2" date="2018-2-20"> - <description> - <p>The Color Update, Part 2</p> - <ul> - <li>The new color picker now uses their own custom icons!</li> - <li>The Gradient Editor's steps now shows feedback when selected</li> - <li>Spice-Up's icon has being updated to use the elementary color palette.</li> - <li>European Portuguese has been added to the family of translations. Big thanks to emansije!</li> - </ul> - </description> - </release> - <release version="1.3.0" date="2018-2-2"> - <description> - <p>The Color Update</p> - <ul> - <li>The color picker has had a mayor makeover!</li> - <li>You can now add/remove stops in gradients, as well as move them around and rotate them.</li> - <li>Grab inspiration from one of the ten new gradient presets!</li> - <li>You can also pick colors from the screen.</li> - <li>Fonts are search-able now</li> - <li>Font-styles are now styled (pun intended)</li> - <li>Notifications are now disabled when presenting</li> - </ul> - </description> - </release> - <release version="1.2.0" date="2017-12-25"> - <description> - <p>Presents for Presenters!</p> - <ul> - <li>Presentation View! Starting a presentation with two monitors will open the presentation on the secondary monitor, and a presentation viewer on your main screen.</li> - <li>You can now type presenter notes, and see them while presenting!</li> - <li>Your presentations now end with an all-black slide</li> - <li>Images can now be added by Drag and Drop</li> - <li>Spice-Up is now available in Serbian!</li> - <li>Some other fixes and cleanups</li> - </ul> - </description> - </release> - <release version="1.1.0" date="2017-11-2"> - <description> - <p>Huge Success!</p> - <ul> - <li>Presentations saved can now be viewed from a web browser by drag and drop if Spice-Up is not installed, and even if you're not using elementary OS or Linux</li> - </ul> - </description> - </release> - <release version="1.0.1" date="2017-10-13"> - <description> - <p>I'm making a note here...</p> - <ul> - <li>Lots of optimizations have happened, now it loads presentations crazy fast!</li> - <li>The Text Toolbar has been cleaned up to better match the other bars</li> - <li>You can now align text vertically!</li> - <li>Going to and from the Welcome Screen is now animated</li> - <li>Spice-Up is now translated to French and Portuguese!</li> - </ul> - </description> - </release> - <release version="1.0.0" date="2017-09-14"> - <description> - <p>This was a triumph!</p> - <ul> - <li>Creating a new presentation now brings up templates you can choose from.</li> - <li>You can now replace images right from Spice-Up.</li> - <li>Making a new slide now picks up the style from your last one.</li> - <li>You can now make Text and Shapes transparent, right from the custom color picker!</li> - <li>Fixed: Double clicking would sometimes unselect the item.</li> - <li>Fixed: The text on the roundness slider was hard to read.</li> - <li>Spice-Up is also now available in Spanish!</li> - </ul> - </description> - </release> - <release version="0.8.2" date="2017-08-27"> - <description> - <p>Now with 100% better feedback!</p> - <ul> - <li>Selecting slides, and colors on the color picker now feels like you actually press something.</li> - <li>ColorPicker: Click on the preview to be able to set both colors at once.</li> - <li>A better high resolution icon</li> - <li>Fixed: Spice-Up should now work a lot better with other themes</li> - <li>Fixed: Sometimes, the default blue color would get selected</li> - </ul> - </description> - </release> - <release version="0.8.0" date="2017-07-20"> - <description> - <p>Clipboard, Circles and a Browser</p> - <ul> - <li>Shapes: You can now set the roundness of the square, and finally make circles!</li> - <li>Cut, copy, and paste slides, and canvas items!</li> - <li>The presentations you make will appear on the welcome screen for easy access to them!</li> - </ul> - </description> - </release> - </releases> - <screenshots> - <screenshot type="default"> - <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot.png</image> - </screenshot> - <screenshot> - <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot1.png</image> - </screenshot> - <screenshot> - <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot2.png</image> - </screenshot> - <screenshot> - <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot3.png</image> - </screenshot> - <screenshot> - <image>https://raw.githubusercontent.com/Philip-Scott/Spice-up/master/Screenshot4.png</image> - </screenshot> - </screenshots> - <content_rating type="oars-1.1"> - <content_attribute id="violence-cartoon">none</content_attribute> - <content_attribute id="violence-fantasy">none</content_attribute> - <content_attribute id="violence-realistic">none</content_attribute> - <content_attribute id="violence-bloodshed">none</content_attribute> - <content_attribute id="violence-sexual">none</content_attribute> - <content_attribute id="violence-desecration">none</content_attribute> - <content_attribute id="violence-slavery">none</content_attribute> - <content_attribute id="violence-worship">none</content_attribute> - <content_attribute id="drugs-alcohol">none</content_attribute> - <content_attribute id="drugs-narcotics">none</content_attribute> - <content_attribute id="drugs-tobacco">none</content_attribute> - <content_attribute id="sex-nudity">none</content_attribute> - <content_attribute id="sex-themes">none</content_attribute> - <content_attribute id="sex-homosexuality">none</content_attribute> - <content_attribute id="sex-prostitution">none</content_attribute> - <content_attribute id="sex-adultery">none</content_attribute> - <content_attribute id="sex-appearance">none</content_attribute> - <content_attribute id="language-profanity">none</content_attribute> - <content_attribute id="language-humor">none</content_attribute> - <content_attribute id="language-discrimination">none</content_attribute> - <content_attribute id="social-chat">none</content_attribute> - <content_attribute id="social-info">none</content_attribute> - <content_attribute id="social-audio">none</content_attribute> - <content_attribute id="social-location">none</content_attribute> - <content_attribute id="social-contacts">none</content_attribute> - <content_attribute id="money-purchasing">none</content_attribute> - <content_attribute id="money-gambling">none</content_attribute> - </content_rating> - <developer_name>Felipe Escoto</developer_name> - <url type="homepage">https://github.com/Philip-Scott/Spice-up</url> - <url type="bugtracker">https://github.com/Philip-Scott/Spice-up/issues</url> - <url type="help">https://github.com/Philip-Scott/Spice-up/issues</url> - <update_contact>felesc...@hotmail.com</update_contact> - <custom> - <value key="x-appcenter-color-primary">#C2D5FF</value> - <value key="x-appcenter-color-primary-text">#223b69</value> - <value key="x-appcenter-suggested-price">20</value> - </custom> -</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/data/com.github.philip_scott.spice_up.mime.xml new/Spice-up-1.5.2/data/com.github.philip_scott.spice_up.mime.xml --- old/Spice-up-1.5.1/data/com.github.philip_scott.spice_up.mime.xml 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/data/com.github.philip_scott.spice_up.mime.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-spiceup"> - <comment>Spice-Up Presentation</comment> - <icon name="application-x-spiceup"/> - <glob-deleteall/> - <glob pattern="*.spice"/> - </mime-type> -</mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Services/Fetcher.vala new/Spice-up-1.5.2/src/Services/Fetcher.vala --- old/Spice-up-1.5.1/src/Services/Fetcher.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Services/Fetcher.vala 2018-09-08 23:10:15.000000000 +0200 @@ -43,8 +43,6 @@ if (try_to_fetch) { debug ("Getting templates from server\n"); new Thread<void*> ("fetch-templates", () => { - mutex.lock (); - var session = new Soup.Session (); var message = new Soup.Message ("GET", TEMPLATES_URL); @@ -55,6 +53,8 @@ data.append ("%c".printf (c)); } + mutex.lock (); + cache = data.str; if (cache != "") { save_to_cache (cache); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Services/SlideManager.vala new/Spice-up-1.5.2/src/Services/SlideManager.vala --- old/Spice-up-1.5.1/src/Services/SlideManager.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Services/SlideManager.vala 2018-09-08 23:10:15.000000000 +0200 @@ -164,6 +164,7 @@ if (next_slide != null) { var next_index = slides.index_of (next_slide); + slides.set (next_index, slide); slides.set (index, next_slide); @@ -225,7 +226,11 @@ found = true; } } else { - next_slide = end_presentation_slide; + if (window.is_fullscreen) { + next_slide = end_presentation_slide; + } else { + next_slide = null; + } found = true; } } while (!found); @@ -254,6 +259,7 @@ } if (previous_index < 0) { + previous_slide = null; found = true; } } while (!found); @@ -403,4 +409,3 @@ } } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Widgets/Canvas.vala new/Spice-up-1.5.2/src/Widgets/Canvas.vala --- old/Spice-up-1.5.1/src/Widgets/Canvas.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Widgets/Canvas.vala 2018-09-08 23:10:15.000000000 +0200 @@ -87,14 +87,16 @@ var display_widget = (CanvasItem) widget; var r = display_widget.rectangle; - int i = 0; - widget.get_preferred_width (out i, null); - widget.get_preferred_height (out i, null); - - allocation.width = (int)(r.width * current_ratio); - allocation.height = (int)(r.height * current_ratio); - allocation.x = default_x_margin + (int)(r.x * current_ratio) + display_widget.delta_x; - allocation.y = default_y_margin + (int)(r.y * current_ratio) + display_widget.delta_y; + int w, h; + + widget.get_preferred_width (out w, null); + widget.get_preferred_height (out h, null); + + allocation.width = (int)(((double) r.width) * current_ratio + 0.5); + allocation.height = (int)(((double) r.height) * current_ratio + 0.5); + allocation.x = default_x_margin + (int)(r.x * current_ratio + 0.5) + display_widget.delta_x; + allocation.y = default_y_margin + (int)(r.y * current_ratio + 0.5) + display_widget.delta_y; + return true; } @@ -102,14 +104,14 @@ } private void calculate_ratio () { - int max_width = 1520, max_height = 1520; + double max_width = 1500.0, max_height = 1500.0; current_allocated_width = get_allocated_width (); current_allocated_height = get_allocated_height (); - current_ratio = double.min ((double)(current_allocated_width - 24) / 1500.0, (double)(current_allocated_height - 24) / 1500.0); - default_x_margin = (int) ((current_allocated_width - max_width * current_ratio) / 2); - default_y_margin = (int) ((current_allocated_height - max_height * current_ratio) / 2); + current_ratio = ((double) (current_allocated_height - 24)) / 1500.0; + default_x_margin = (int) (((current_allocated_width - max_width * current_ratio) / 2) + 0.5); + default_y_margin = (int) (((current_allocated_height - max_height * current_ratio) / 2) + 0.5); } public CanvasItem add_item (CanvasItem item, bool undoable_action = false) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Widgets/ColorPicker/Gradient.vala new/Spice-up-1.5.2/src/Widgets/ColorPicker/Gradient.vala --- old/Spice-up-1.5.1/src/Widgets/ColorPicker/Gradient.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Widgets/ColorPicker/Gradient.vala 2018-09-08 23:10:15.000000000 +0200 @@ -28,7 +28,15 @@ static construct { try { - color_regex = new Regex ("""(#[a-zA-Z0-9]{6}|#[a-zA-Z0-9]{3}|rgb\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3}\)|rgba\([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9\.]{1,}\))(\s[0-9]{1,}%)?""", 0); + color_regex = new Regex ( + "(" + // Color Group + """#[a-zA-Z0-9]{6}|""" + // #?????? + """#[a-zA-Z0-9]{3}|""" + // #??? + """rgb\(\s*[0-9]{1,3}\s*,\s*[0-9]{1,3}\s*,\s*[0-9]{1,3}\s*\)|""" + // rgb(?,?,?) + """rgba\(\s*[0-9]{1,3}\s*,\s*[0-9]{1,3}\s*,\s*[0-9]{1,3}\s*,\s*[0-9\.]{1,}\s*\)""" + // rgba(?,?,?,?) + ")" + + """(\s[0-9]{1,}%)?""" // Percent + , 0); dir_regex = new Regex ("""gradient\(([a-z0-9\s]{1,}),""", 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Widgets/Library/LibraryItem.vala new/Spice-up-1.5.2/src/Widgets/Library/LibraryItem.vala --- old/Spice-up-1.5.1/src/Widgets/Library/LibraryItem.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Widgets/Library/LibraryItem.vala 2018-09-08 23:10:15.000000000 +0200 @@ -90,12 +90,14 @@ show_all (); - event_box.button_release_event.connect ((event) => { - if (event.button != 3) return false; - show_popover (); + if (real_file) { + event_box.button_release_event.connect ((event) => { + if (event.button != 3) return false; + show_popover (); - return true; - }); + return true; + }); + } } private void show_popover () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Widgets/PresenterView.vala new/Spice-up-1.5.2/src/Widgets/PresenterView.vala --- old/Spice-up-1.5.1/src/Widgets/PresenterView.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Widgets/PresenterView.vala 2018-09-08 23:10:15.000000000 +0200 @@ -31,13 +31,27 @@ Clock clock; + private int _font_size; + private int font_size { + default = 12; + get { + return _font_size; + } + set { + if (value >= 12 && value <= 50) { + _font_size = value; + style (); + } + } + } + public PresenterWindow (SlideManager slide_manager, Window window) { Object (slide_manager: slide_manager, window: window); } construct { title = "Spice-Up - Presenter View"; - resizable = false; + set_keep_above (true); stick (); @@ -70,6 +84,8 @@ notes.halign = Gtk.Align.FILL; notes.indent = 6; + font_size = 12; + var notes_scrolled = new Gtk.ScrolledWindow (null, null); notes_scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER; notes_scrolled.height_request = 130; @@ -77,6 +93,7 @@ var frame = new Gtk.Frame (null); frame.add (notes_scrolled); + frame.expand = true; var grid = new Gtk.Grid (); grid.margin = 6; @@ -167,6 +184,13 @@ case 65307: // Esc end_presentation (); return true; + case 61: // = + case 43: // + + font_size = font_size + 2; + return true; + case 45: // - + font_size = font_size - 2; + return true; } return false; @@ -176,6 +200,16 @@ window.end_presentation (); } + private void style () { + var notes_css = NOTES_CSS.printf (font_size); + Utils.set_style (notes, notes_css); + } + + private const string NOTES_CSS = """ + .view { + font-size: %dpx; + }"""; + private class SlideshowController : Gtk.Grid { public unowned Spice.SlideManager slide_manager { get; construct set; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Spice-up-1.5.1/src/Window.vala new/Spice-up-1.5.2/src/Window.vala --- old/Spice-up-1.5.1/src/Window.vala 2018-08-23 15:43:49.000000000 +0200 +++ new/Spice-up-1.5.2/src/Window.vala 2018-09-08 23:10:15.000000000 +0200 @@ -445,6 +445,9 @@ screen.get_monitor_geometry (primary_monitor == 1 ? 0 : 1, out rec); move (rec.x, rec.y); + } else if (DEBUG) { + presenter_window = new PresenterWindow (slide_manager, this); + presenter_window.show (); } notifications_last_state = get_notification_state ();