Hello community, here is the log from the commit of package audience for openSUSE:Factory checked in at 2018-01-13 21:49:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audience (Old) and /work/SRC/openSUSE:Factory/.audience.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audience" Sat Jan 13 21:49:25 2018 rev:9 rq:563912 version:0.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/audience/audience.changes 2017-11-11 14:19:36.555193019 +0100 +++ /work/SRC/openSUSE:Factory/.audience.new/audience.changes 2018-01-13 21:49:28.596958166 +0100 @@ -1,0 +2,16 @@ +Fri Jan 12 15:21:37 UTC 2018 - [email protected] + +- Update to 0.2.5: + * Rename audience.pot to io.elementary.videos.pot + * Remove unused make dist (#50) + * Remove deprecated app_icon field (#49) + * GLib.Application.set_default is useless when there is only + one instance (#47) + * Don't allow space key to process further in player page. (#38) + * Do not terminate the program when some method fails (#37) + * remove about dialog (#34) + * Update appdata URLs and display name (#33) +- Drop audience-0.2.4-glib.patch (fixed) +- Spec file cleanup + +------------------------------------------------------------------- Old: ---- audience-0.2.4-glib.patch videos-0.2.4.tar.gz New: ---- videos-0.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audience.spec ++++++ --- /var/tmp/diff_new_pack.rxO4Jw/_old 2018-01-13 21:49:29.500916019 +0100 +++ /var/tmp/diff_new_pack.rxO4Jw/_new 2018-01-13 21:49:29.500916019 +0100 @@ -1,7 +1,7 @@ # # spec file for package audience # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: audience -Version: 0.2.4 +Version: 0.2.5 Release: 0 Summary: A minimalistic media player License: GPL-3.0 Group: Productivity/Multimedia/Video/Players -Url: https://launchpad.net/audience +URL: https://elementary.io Source: https://github.com/elementary/videos/archive/%{version}.tar.gz#/videos-%{version}.tar.gz -# PATCH-FIX-UPSTREAM dbus.patch -- https://github.com/elementary/videos/issues/44 -Patch0: audience-0.2.4-glib.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: elementary-icon-theme @@ -45,7 +43,6 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libnotify) Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires %description @@ -56,7 +53,6 @@ %prep %setup -q -n videos-%{version} -%patch0 -p1 %build %cmake \ @@ -81,7 +77,7 @@ popd %fdupes %{buildroot}%{_datadir}/locale -%find_lang %{name} +%find_lang io.elementary.videos %{name}.lang %post %icon_theme_cache_post @@ -94,16 +90,14 @@ %glib2_gsettings_schema_postun %files -%defattr(-,root,root) %doc AUTHORS COPYING README* -%{_bindir}/%{name} +%{_bindir}/io.elementary.videos +%dir %{_datadir}/appdata +%{_datadir}/appdata/io.elementary.videos.appdata.xml %{_datadir}/applications/*.%{name}.desktop %{_datadir}/icons/hicolor/scalable/*/multimedia-video-player.??g %{_datadir}/glib-2.0/schemas/*.%{name}.gschema.xml -%{_datadir}/appdata/*.%{name}.appdata.xml -%dir %{_datadir}/appdata %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ videos-0.2.4.tar.gz -> videos-0.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/.bzrignore new/videos-0.2.5/.bzrignore --- old/videos-0.2.4/.bzrignore 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/.bzrignore 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -build \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/.gitignore new/videos-0.2.5/.gitignore --- old/videos-0.2.4/.gitignore 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/.gitignore 2018-01-08 20:53:24.000000000 +0100 @@ -1,2 +1 @@ -*~ -build/ +build \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/CMakeLists.txt new/videos-0.2.5/CMakeLists.txt --- old/videos-0.2.4/CMakeLists.txt 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/CMakeLists.txt 2018-01-08 20:53:24.000000000 +0100 @@ -4,13 +4,13 @@ enable_testing () list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -project (audience C) +project (io.elementary.videos C) set (DATADIR ${CMAKE_INSTALL_PREFIX}/share) set (PKGDATADIR ${DATADIR}/${CMAKE_PROJECT_NAME}) set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME}) set (RELEASE_NAME "A modern media player.") -set (VERSION "0.2.4") +set (VERSION "0.2.5") set (VERSION_INFO "The Red Comet") add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") @@ -18,14 +18,6 @@ # Comment this out to enable C compiler warnings add_definitions (-w) -set (CPACK_PACKAGE_VERSION ${VERSION}) -set (CPACK_SOURCE_GENERATOR "TGZ") -set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") -set (CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;/.bzrignore;~$;${CPACK_SOURCE_IGNORE_FILES}") - -include (CPack) -add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) - option (BUILD_FOR_ELEMENTARY "Audience name will be replaced by Videos" ON) set (APP_NAME "Audience") if (BUILD_FOR_ELEMENTARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/README.md new/videos-0.2.5/README.md --- old/videos-0.2.4/README.md 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/README.md 2018-01-08 20:53:24.000000000 +0100 @@ -23,7 +23,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr .. make -To install, use `make install`, then execute with `audience` +To install, use `make install`, then execute with `io.elementary.videos` sudo make install - audience + io.elementary.videos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/data/CMakeLists.txt new/videos-0.2.5/data/CMakeLists.txt --- old/videos-0.2.4/data/CMakeLists.txt 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/data/CMakeLists.txt 2018-01-08 20:53:24.000000000 +0100 @@ -14,10 +14,10 @@ configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/audience-original.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop ${CMAKE_SOURCE_DIR}/po/) endif () -configure_file_translation (org.pantheon.audience.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml ${CMAKE_SOURCE_DIR}/po/) +configure_file_translation (io.elementary.videos.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.videos.appdata.xml ${CMAKE_SOURCE_DIR}/po/) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.desktop DESTINATION ${DATADIR}/applications/) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.audience.appdata.xml DESTINATION ${DATADIR}/appdata/) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.videos.appdata.xml DESTINATION ${DATADIR}/appdata/) include (GSettings) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/data/io.elementary.videos.appdata.xml.in new/videos-0.2.5/data/io.elementary.videos.appdata.xml.in --- old/videos-0.2.4/data/io.elementary.videos.appdata.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ new/videos-0.2.5/data/io.elementary.videos.appdata.xml.in 2018-01-08 20:53:24.000000000 +0100 @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright 2015-2016 elementary, LLC <[email protected]> --> +<component type="desktop"> + <id>org.pantheon.audience.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_group>elementary</project_group> + <project_license>GPL-3.0+</project_license> + <_name>Videos</_name> + <_summary>Watch videos and movies</_summary> + <description> + <_p> + A modern video player that focuses on displaying video content instead of + player controls. It remembers your last played video and playback position + so you can pick up from where you left off. + </_p> + <_p> + Additional features include: + </_p> + <ul> + <_li>Subtitle support</_li> + <_li>Play queue</_li> + <_li>Thumbnail previews on the seek bar</_li> + </ul> + </description> + <provides> + <binary>io.elementary.videos</binary> + </provides> + <releases> + <release version="0.2.5" date="2018-01-08" urgency="medium"> + <description> + <ul> + <_li>Disallow setting playback before start</_li> + </ul> + </description> + </release> + <release version="0.2.4" date="2017-08-11" urgency="medium"> + <description> + <ul> + <_li>Limit consecutive spacebar pauses</_li> + </ul> + </description> + </release> + <release version="0.2.3" date="2017-08-02" urgency="medium"> + <description> + <ul> + <_li>Crash fixes</_li> + <_li>Remove About dialog</_li> + <_li>Minor bug fixes</_li> + <_li>Translation updates</_li> + </ul> + </description> + </release> + <release version="0.2.2" date="2017-04-13" urgency="medium"> + <description> + <ul> + <_li>Preview popover now closely follows cursor position</_li> + <_li>Translation updates</_li> + </ul> + </description> + </release> + <release version="0.2.1.2" date="2017-01-19" urgency="medium"> + <description> + <ul> + <_li>Translation updates</_li> + </ul> + </description> + </release> + <release version="0.2.1.1" date="2016-10-31" urgency="medium"> + <description> + <ul> + <_li>Fix appstream date format</_li> + </ul> + </description> + </release> + <release version="0.2.1" date="2016-10-31" urgency="medium"> + <description> + <ul> + <_li>Added a library view with search</_li> + <_li>Fixed a bug that prevents keyboard navigation</_li> + <_li>Translation updates</_li> + </ul> + </description> + </release> + <release version="0.2.0.2" date="2016-05-05" urgency="medium"> + <description> + <ul> + <_li>Minor bug fixes</_li> + </ul> + </description> + </release> + </releases> + <developer_name>elementary LLC.</developer_name> + <url type="homepage">https://elementary.io/</url> + <url type="bugtracker">https://github.com/elementary/videos/issues</url> + <url type="donation">https://elementary.io/get-involved#funding</url> + <url type="help">https://elementaryos.stackexchange.com/questions/tagged/videos</url> + <url type="translate">https://l10n.elementary.io/projects/videos</url> + <update_contact>contact_AT_elementary.io</update_contact> + <x-appcenter-color-primary>#2b63a0</x-appcenter-color-primary> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/data/org.pantheon.audience.appdata.xml.in new/videos-0.2.5/data/org.pantheon.audience.appdata.xml.in --- old/videos-0.2.4/data/org.pantheon.audience.appdata.xml.in 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/data/org.pantheon.audience.appdata.xml.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2015-2016 elementary, LLC <[email protected]> --> -<component type="desktop"> - <id>org.pantheon.audience.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_group>elementary</project_group> - <project_license>GPL-3.0+</project_license> - <_name>Videos</_name> - <_summary>Watch videos and movies</_summary> - <description> - <_p> - A modern video player that focuses on displaying video content instead of - player controls. It remembers your last played video and playback position - so you can pick up from where you left off. - </_p> - <_p> - Additional features include: - </_p> - <ul> - <_li>Subtitle support</_li> - <_li>Play queue</_li> - <_li>Thumbnail previews on the seek bar</_li> - </ul> - </description> - <provides> - <binary>audience</binary> - </provides> - <releases> - <release version="0.2.4" date="2017-08-11" urgency="medium"> - <description> - <ul> - <_li>Limit consecutive spacebar pauses</_li> - </ul> - </description> - </release> - <release version="0.2.3" date="2017-08-02" urgency="medium"> - <description> - <ul> - <_li>Crash fixes</_li> - <_li>Remove About dialog</_li> - <_li>Minor bug fixes</_li> - <_li>Translation updates</_li> - </ul> - </description> - </release> - <release version="0.2.2" date="2017-04-13" urgency="medium"> - <description> - <ul> - <_li>Preview popover now closely follows cursor position</_li> - <_li>Translation updates</_li> - </ul> - </description> - </release> - <release version="0.2.1.2" date="2017-01-19" urgency="medium"> - <description> - <ul> - <_li>Translation updates</_li> - </ul> - </description> - </release> - <release version="0.2.1.1" date="2016-10-31" urgency="medium"> - <description> - <ul> - <_li>Fix appstream date format</_li> - </ul> - </description> - </release> - <release version="0.2.1" date="2016-10-31" urgency="medium"> - <description> - <ul> - <_li>Added a library view with search</_li> - <_li>Fixed a bug that prevents keyboard navigation</_li> - <_li>Translation updates</_li> - </ul> - </description> - </release> - <release version="0.2.0.2" date="2016-05-05" urgency="medium"> - <description> - <ul> - <_li>Minor bug fixes</_li> - </ul> - </description> - </release> - </releases> - <developer_name>elementary LLC.</developer_name> - <url type="homepage">https://elementary.io/</url> - <url type="bugtracker">https://github.com/elementary/videos/issues</url> - <url type="donation">https://elementary.io/get-involved#funding</url> - <url type="help">https://elementaryos.stackexchange.com/questions/tagged/videos</url> - <url type="translate">https://l10n.elementary.io/projects/videos</url> - <update_contact>contact_AT_elementary.io</update_contact> - <x-appcenter-color-primary>#2b63a0</x-appcenter-color-primary> -</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/data/org.pantheon.audience.desktop.in.in new/videos-0.2.5/data/org.pantheon.audience.desktop.in.in --- old/videos-0.2.4/data/org.pantheon.audience.desktop.in.in 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/data/org.pantheon.audience.desktop.in.in 2018-01-08 20:53:24.000000000 +0100 @@ -3,12 +3,12 @@ _Name=@APP_NAME@ _GenericName=Video Player _Comment=Watch videos and movies -Exec=audience %U +Exec=io.elementary.videos %U Icon=multimedia-video-player StartupNotify=true Terminal=false Type=Application Categories=AudioVideo;Video;Player;TV; MimeType=application/x-musepack;application/musepack;application/x-ape;application/x-id3;application/ogg;application/x-ogg;application/x-vorbis+ogg;application/x-flac;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;application/vnd.rn-realmedia;video/vnd.rn-realvideo;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;application/x-drm-v2;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/3gpp;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;video/x-matroska;video/matroska;video/x-mng;video/webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg; -X-GNOME-Gettext-Domain=audience +X-GNOME-Gettext-Domain=io.elementary.videos X-PulseAudio-Properties=media.role=video diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/po/CMakeLists.txt new/videos-0.2.5/po/CMakeLists.txt --- old/videos-0.2.4/po/CMakeLists.txt 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/po/CMakeLists.txt 2018-01-08 20:53:24.000000000 +0100 @@ -7,5 +7,5 @@ ${CMAKE_BINARY_DIR}/data/org.pantheon.audience.desktop.in ${CMAKE_BINARY_DIR}/data/audience-original.desktop.in APPDATA_FILES - ../data/org.pantheon.audience.appdata.xml.in + ../data/io.elementary.videos.appdata.xml.in ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/src/Audience.vala new/videos-0.2.5/src/Audience.vala --- old/videos-0.2.4/src/Audience.vala 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/src/Audience.vala 2018-01-08 20:53:24.000000000 +0100 @@ -40,7 +40,7 @@ construct { program_name = _(Constants.APP_NAME); - exec_name = "audience"; + exec_name = "io.elementary.videos"; build_data_dir = Constants.DATADIR; build_pkg_data_dir = Constants.PKGDATADIR; @@ -50,16 +50,14 @@ Intl.setlocale (LocaleCategory.ALL, ""); - app_icon = "multimedia-video-player"; app_launcher = "org.pantheon.audience.desktop"; - application_id = "org.pantheon.audience"; + application_id = "io.elementary.videos"; } public App () { Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true; this.flags |= GLib.ApplicationFlags.HANDLES_OPEN; settings = new Settings (); - set_default (); } private static App app; // global App instance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/src/Widgets/Player/BottomBar.vala new/videos-0.2.5/src/Widgets/Player/BottomBar.vala --- old/videos-0.2.4/src/Widgets/Player/BottomBar.vala 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/src/Widgets/Player/BottomBar.vala 2018-01-08 20:53:24.000000000 +0100 @@ -27,9 +27,6 @@ public signal void unfullscreen (); public signal void seeked (double val); - public bool playing { get; set; default=false; } - public bool hovered { get; set; default=false; } - public bool fullscreen { get; set; default=false; } public SettingsPopover preferences_popover; public PlaylistPopover playlist_popover; public TimeWidget time_widget; @@ -41,6 +38,58 @@ private uint hiding_timer = 0; private bool playlist_glowing = false; + private bool _fullscreen = false; + public bool fullscreen { + get { + return _fullscreen; + } + set { + _fullscreen = value; + if (value && child_revealed) { + unfullscreen_revealer.reveal_child = true; + } else if (!value && child_revealed) { + unfullscreen_revealer.reveal_child = false; + } + } + } + + private bool _hovered = false; + private bool hovered { + get { + return _hovered; + } + set { + _hovered = value; + if (value) { + if (hiding_timer != 0) { + Source.remove (hiding_timer); + hiding_timer = 0; + } + } else { + reveal_control (); + } + } + } + + private bool _playing = false; + public bool playing { + get { + return _playing; + } + set { + _playing = value; + if (value) { + ((Gtk.Image) play_button.image).icon_name = "media-playback-pause-symbolic"; + play_button.tooltip_text = _("Pause"); + reveal_control (); + } else { + ((Gtk.Image) play_button.image).icon_name = "media-playback-start-symbolic"; + play_button.tooltip_text = _("Play"); + set_reveal_child (true); + } + } + } + public bool repeat { get { return playlist_popover.rep.active; @@ -55,8 +104,15 @@ this.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK; this.events |= Gdk.EventMask.ENTER_NOTIFY_MASK; - this.enter_notify_event.connect ((event) => { this.hovered = true; return false; }); - this.leave_notify_event.connect ((event) => { this.hovered = false; return false; }); + this.enter_notify_event.connect ((event) => { + this.hovered = true; + return false; + }); + + this.leave_notify_event.connect ((event) => { + this.hovered = false; + return false; + }); this.transition_type = Gtk.RevealerTransitionType.SLIDE_UP; @@ -64,17 +120,23 @@ play_button = new Gtk.Button.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON); play_button.tooltip_text = _("Play"); - play_button.clicked.connect (() => {play_toggled ();}); + play_button.clicked.connect (() => { + playing = !playing; + play_toggled (); + }); playlist_button = new Gtk.Button.from_icon_name ("view-list-symbolic", Gtk.IconSize.BUTTON); playlist_button.tooltip_text = _("Playlist"); - playlist_button.clicked.connect (() => {playlist_popover.show_all (); playlist_popover.queue_resize ();}); + playlist_button.clicked.connect (() => { + playlist_popover.show_all (); + playlist_popover.queue_resize (); + }); preferences_button = new Gtk.Button.from_icon_name ("open-menu-symbolic", Gtk.IconSize.BUTTON); preferences_button.tooltip_text = _("Settings"); preferences_button.clicked.connect (() => { preferences_popover.setup (); - preferences_popover.show_all (); + preferences_popover.show_all (); preferences_popover.queue_resize (); }); @@ -95,40 +157,16 @@ playlist_item_added (); }); - notify["hovered"].connect (() => { - if (hovered == false) { - reveal_control (); - } else { - if (hiding_timer != 0) { - Source.remove (hiding_timer); - hiding_timer = 0; - } - } - }); - - notify["fullscreen"].connect (() => { - if (fullscreen == true && child_revealed == true) { - unfullscreen_revealer.set_reveal_child (true); - } else if (fullscreen == false && child_revealed == true) { - unfullscreen_revealer.set_reveal_child (false); - } - }); - - play_button.clicked.connect (() => { - playing = !playing; + var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON); + unfullscreen_button.tooltip_text = _("Unfullscreen"); + unfullscreen_button.clicked.connect (() => { + unfullscreen (); }); - notify["playing"].connect (() => { - if (playing == true) { - ((Gtk.Image) play_button.image).icon_name = "media-playback-pause-symbolic"; - play_button.tooltip_text = _("Pause"); - reveal_control (); - } else { - ((Gtk.Image) play_button.image).icon_name = "media-playback-start-symbolic"; - play_button.tooltip_text = _("Play"); - set_reveal_child (true); - } - }); + unfullscreen_revealer = new Gtk.Revealer (); + unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN; + unfullscreen_revealer.add (unfullscreen_button); + unfullscreen_revealer.show_all (); show_all (); } @@ -138,7 +176,7 @@ playlist_glowing = true; playlist_button.get_child ().get_style_context ().add_class (PULSE_CLASS); playlist_button.get_child ().get_style_context ().add_class (PULSE_TYPE); - + Timeout.add (6000, () => { playlist_button.get_child ().get_style_context ().remove_class (PULSE_CLASS); playlist_button.get_child ().get_style_context ().remove_class (PULSE_TYPE); @@ -149,30 +187,23 @@ } public Gtk.Revealer get_unfullscreen_button () { - unfullscreen_revealer = new Gtk.Revealer (); - unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN; - - var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON); - unfullscreen_button.tooltip_text = _("Unfullscreen"); - unfullscreen_button.clicked.connect (() => {unfullscreen ();}); - unfullscreen_revealer.add (unfullscreen_button); - unfullscreen_revealer.show_all (); return unfullscreen_revealer; } private new void set_reveal_child (bool reveal) { base.set_reveal_child (reveal); if (reveal == true && fullscreen == true) { - unfullscreen_revealer.set_reveal_child (reveal); + unfullscreen_revealer.reveal_child = reveal; } else if (reveal == false) { - unfullscreen_revealer.set_reveal_child (reveal); + unfullscreen_revealer.reveal_child = reveal; } } public override void get_preferred_width (out int minimum_width, out int natural_width) { base.get_preferred_width (out minimum_width, out natural_width); - if (parent.get_window () == null) + if (parent.get_window () == null) { return; + } var width = parent.get_window ().get_width (); if (width > 0 && width >= minimum_width) { @@ -181,19 +212,21 @@ } public void reveal_control () { - if (child_revealed == false) + if (child_revealed == false) { set_reveal_child (true); + } - if (hiding_timer != 0) + if (hiding_timer != 0) { Source.remove (hiding_timer); + } hiding_timer = GLib.Timeout.add (2000, () => { - if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || playing == false) { + if (hovered || preferences_popover.visible || playlist_popover.visible || !playing) { hiding_timer = 0; return false; } set_reveal_child (false); - unfullscreen_revealer.set_reveal_child (false); + unfullscreen_revealer.reveal_child = false; hiding_timer = 0; return false; }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/videos-0.2.4/src/Widgets/Player/PlayerPage.vala new/videos-0.2.5/src/Widgets/Player/PlayerPage.vala --- old/videos-0.2.4/src/Widgets/Player/PlayerPage.vala 2017-08-12 04:05:24.000000000 +0200 +++ new/videos-0.2.5/src/Widgets/Player/PlayerPage.vala 2018-01-08 20:53:24.000000000 +0100 @@ -329,7 +329,7 @@ var duration = playback.duration; var progress = playback.progress; var new_progress = ((duration * progress) + (double)seconds)/duration; - playback.progress = double.min (new_progress, 1.0); + playback.progress = new_progress.clamp (0.0, 1.0); } public Widgets.Playlist get_playlist_widget () {
