diff -Nru plank-0.9.1+bzr1327/ChangeLog plank-0.9.1+bzr1330/ChangeLog --- plank-0.9.1+bzr1327/ChangeLog 2015-06-17 06:26:06.000000000 +0000 +++ plank-0.9.1+bzr1330/ChangeLog 2015-07-04 05:37:24.000000000 +0000 @@ -1,3 +1,15 @@ +2015-07-03 Rico Tzschichholz + + dockrenderer: Guard duration-calculations which are used for animations + +2015-06-27 Rico Tzschichholz + + po: Update translations + +2015-06-27 Rico Tzschichholz + + animatedrenderer: Always initialize frame if a redraw is scheduled + 2015-06-17 Rico Tzschichholz po: Update translations diff -Nru plank-0.9.1+bzr1327/configure plank-0.9.1+bzr1330/configure --- plank-0.9.1+bzr1327/configure 2015-06-17 06:25:35.000000000 +0000 +++ plank-0.9.1+bzr1330/configure 2015-07-04 05:36:52.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for plank 0.9.1.1327. +# Generated by GNU Autoconf 2.69 for plank 0.9.1.1330. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='plank' PACKAGE_TARNAME='plank' -PACKAGE_VERSION='0.9.1.1327' -PACKAGE_STRING='plank 0.9.1.1327' +PACKAGE_VERSION='0.9.1.1330' +PACKAGE_STRING='plank 0.9.1.1330' PACKAGE_BUGREPORT='https://bugs.launchpad.net/plank' PACKAGE_URL='https://launchpad.net/plank' @@ -1517,7 +1517,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures plank 0.9.1.1327 to adapt to many kinds of systems. +\`configure' configures plank 0.9.1.1330 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1587,7 +1587,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of plank 0.9.1.1327:";; + short | recursive ) echo "Configuration of plank 0.9.1.1330:";; esac cat <<\_ACEOF @@ -1742,7 +1742,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -plank configure 0.9.1.1327 +plank configure 0.9.1.1330 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2111,7 +2111,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by plank $as_me 0.9.1.1327, which was +It was created by plank $as_me 0.9.1.1330, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3001,7 +3001,7 @@ # Define the identity of the package. PACKAGE='plank' - VERSION='0.9.1.1327' + VERSION='0.9.1.1330' cat >>confdefs.h <<_ACEOF @@ -14956,7 +14956,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by plank $as_me 0.9.1.1327, which was +This file was extended by plank $as_me 0.9.1.1330, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15023,7 +15023,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -plank config.status 0.9.1.1327 +plank config.status 0.9.1.1330 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru plank-0.9.1+bzr1327/debian/changelog plank-0.9.1+bzr1330/debian/changelog --- plank-0.9.1+bzr1327/debian/changelog 2015-06-17 06:26:52.000000000 +0000 +++ plank-0.9.1+bzr1330/debian/changelog 2015-07-04 05:38:14.000000000 +0000 @@ -1,8 +1,8 @@ -plank (0.9.1+bzr1327-0ubuntu1~14.10~ricotz1) utopic; urgency=high +plank (0.9.1+bzr1330-0ubuntu1~14.10~ricotz1) utopic; urgency=high - * New development release of lp:plank bzr1327 + * New development release of lp:plank bzr1330 - -- Rico Tzschichholz Wed, 17 Jun 2015 08:26:52 +0200 + -- Rico Tzschichholz Sat, 04 Jul 2015 07:38:14 +0200 plank (0.9.1-1) unstable; urgency=medium diff -Nru plank-0.9.1+bzr1327/debian/control plank-0.9.1+bzr1330/debian/control --- plank-0.9.1+bzr1327/debian/control 2015-06-17 06:26:52.000000000 +0000 +++ plank-0.9.1+bzr1330/debian/control 2015-07-04 05:38:14.000000000 +0000 @@ -7,7 +7,7 @@ Mike Gabriel , Build-Depends: debhelper (>= 9), gnome-common, - valac-0.30 (>= 0.29.1), + valac-0.30 (>= 0.29.2), libbamf3-dev (>= 0.2.92), libcairo2-dev, libdbusmenu-gtk3-dev (>= 0.6.2), @@ -79,7 +79,7 @@ Priority: extra Depends: libplank0 (= ${binary:Version}), ${misc:Depends} -Suggests: bamf-dbg, libcairo2-dbg, libgee2-dbg, libglib2.0-0-dbg, libgtk-3-0-dbg +Suggests: bamf-dbg, libcairo2-dbg, libgee-0.8-2-dbg, libglib2.0-0-dbg, libgtk-3-0-dbg Multi-Arch: same Description: Library to build an elegant, simple, clean dock (debug symbols) Plank is a dock enabling you to start applications and manage your windows. diff -Nru plank-0.9.1+bzr1327/debian/libplank0.shlibs plank-0.9.1+bzr1330/debian/libplank0.shlibs --- plank-0.9.1+bzr1327/debian/libplank0.shlibs 2015-06-17 06:26:52.000000000 +0000 +++ plank-0.9.1+bzr1330/debian/libplank0.shlibs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libplank 0 libplank0 (>= 0.9.1) diff -Nru plank-0.9.1+bzr1327/lib/DockRenderer.vala plank-0.9.1+bzr1330/lib/DockRenderer.vala --- plank-0.9.1+bzr1327/lib/DockRenderer.vala 2015-06-17 06:25:07.000000000 +0000 +++ plank-0.9.1+bzr1330/lib/DockRenderer.vala 2015-07-04 05:36:23.000000000 +0000 @@ -228,7 +228,7 @@ if (screen_is_composited) { var hide_duration = (fade_opacity == 1.0 ? theme.HideTime : theme.FadeTime) * 1000; - var hide_time = frame_time - last_hide; + var hide_time = int64.max (0LL, frame_time - last_hide); if (hide_time < hide_duration) { if (controller.hide_manager.Hidden) hide_progress = Drawing.easing_for_mode (AnimationMode.EASE_IN_CUBIC, hide_time, hide_duration); @@ -335,7 +335,7 @@ remove_time = item.RemoveTime; if (add_time > remove_time) { - move_time = frame_time - add_time; + move_time = int64.max (0LL, frame_time - add_time); if (move_time < move_duration) { var move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_QUINT, move_time, move_duration); dynamic_animation_offset -= move_animation_progress * (position_manager.IconSize + position_manager.ItemPadding); @@ -343,7 +343,7 @@ transient_items_it.remove (); } } else if (remove_time > 0) { - move_time = frame_time - remove_time; + move_time = int64.max (0LL, frame_time - remove_time); if (move_time < move_duration) { var move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_IN_QUINT, move_time, move_duration); dynamic_animation_offset += move_animation_progress * (position_manager.IconSize + position_manager.ItemPadding); @@ -553,7 +553,7 @@ // check for and calculate click-animation var max_click_time = item.ClickedAnimation == Animation.BOUNCE ? theme.LaunchBounceTime : theme.ClickTime; max_click_time *= 1000; - var click_time = frame_time - item.LastClicked; + var click_time = int64.max (0LL, frame_time - item.LastClicked); if (click_time < max_click_time) { var click_animation_progress = click_time / (double) max_click_time; @@ -578,7 +578,7 @@ // check for and calculate scroll-animation var max_scroll_time = 300 * 1000; - var scroll_time = frame_time - item.LastScrolled; + var scroll_time = int64.max (0LL, frame_time - item.LastScrolled); if (scroll_time < max_scroll_time) { var scroll_animation_progress = scroll_time / (double) max_scroll_time; @@ -597,7 +597,7 @@ // check for and calculate hover-animation var max_hover_time = 150 * 1000; - var hover_time = frame_time - item.LastHovered; + var hover_time = int64.max (0LL, frame_time - item.LastHovered); if (hover_time < max_hover_time) { var hover_animation_progress = 0.0; if (hovered_item == item) { @@ -627,7 +627,7 @@ // bounce icon on urgent state if (screen_is_composited && (item.State & ItemState.URGENT) != 0) { - var urgent_time = frame_time - item.LastUrgent; + var urgent_time = int64.max (0LL, frame_time - item.LastUrgent); var bounce_animation_progress = urgent_time / (double) (theme.UrgentBounceTime * 1000); if (bounce_animation_progress < 1.0) { var change = Math.fabs (Math.sin (Math.PI * bounce_animation_progress) * position_manager.UrgentBounceHeight * double.min (1.0, 2.0 * (1.0 - bounce_animation_progress))); @@ -638,7 +638,7 @@ // animate icon movement on move state if ((item.State & ItemState.MOVE) != 0) { var move_duration = theme.ItemMoveTime * 1000; - var move_time = frame_time - item.LastMove; + var move_time = int64.max (0LL, frame_time - item.LastMove); if (move_time < move_duration) { var move_animation_progress = 0.0; if (transient_items.size > 0) { @@ -661,7 +661,7 @@ var allow_animation = (screen_is_composited && (container == null || container.AddTime < item.AddTime)); if (allow_animation && item.AddTime > item.RemoveTime) { var move_duration = theme.ItemMoveTime * 1000; - var move_time = frame_time - item.AddTime; + var move_time = int64.max (0LL, frame_time - item.AddTime); if (move_time < move_duration) { var move_animation_progress = 1.0 - Drawing.easing_for_mode (AnimationMode.LINEAR, move_time, move_duration); draw_value.opacity = Drawing.easing_for_mode (AnimationMode.EASE_IN_EXPO, move_time, move_duration); @@ -671,7 +671,7 @@ } } else if (allow_animation && item.RemoveTime > 0) { var move_duration = theme.ItemMoveTime * 1000; - var move_time = frame_time - item.RemoveTime; + var move_time = int64.max (0LL, frame_time - item.RemoveTime); if (move_time < move_duration) { var move_animation_progress = Drawing.easing_for_mode (AnimationMode.LINEAR, move_time, move_duration); draw_value.opacity = 1.0 - Drawing.easing_for_mode (AnimationMode.EASE_OUT_EXPO, move_time, move_duration); @@ -684,7 +684,7 @@ // animate icon on invalid state if ((item.State & ItemState.INVALID) != 0) { var invalid_duration = 3000 * 1000; - var invalid_time = frame_time - item.LastValid; + var invalid_time = int64.max (0LL, frame_time - item.LastValid); if (invalid_time < invalid_duration) { draw_value.opacity = 0.10 + (0.90 * (Math.cos (invalid_time / (double) invalid_duration * 4.5 * Math.PI) + 1) / 2); } else { @@ -739,7 +739,7 @@ } // draw active glow - var active_time = frame_time - item.LastActive; + var active_time = int64.max (0LL, frame_time - item.LastActive); var opacity = double.min (1, active_time / (double) (theme.ActiveTime * 1000)); if ((item.State & ItemState.ACTIVE) == 0) opacity = 1 - opacity; @@ -924,7 +924,7 @@ if ((item.State & ItemState.URGENT) == 0) return; - var diff = frame_time - item.LastUrgent; + var diff = int64.max (0LL, frame_time - item.LastUrgent); if (diff >= theme.GlowTime * 1000) return; diff -Nru plank-0.9.1+bzr1327/lib/Drawing/AnimatedRenderer.vala plank-0.9.1+bzr1330/lib/Drawing/AnimatedRenderer.vala --- plank-0.9.1+bzr1327/lib/Drawing/AnimatedRenderer.vala 2015-06-17 06:25:07.000000000 +0000 +++ plank-0.9.1+bzr1330/lib/Drawing/AnimatedRenderer.vala 2015-07-04 05:36:23.000000000 +0000 @@ -105,11 +105,15 @@ { #if HAVE_GTK_3_8 unowned Gdk.FrameClock? frame_clock = widget.get_frame_clock (); - if (frame_clock != null) + if (frame_clock != null) { frame_time = frame_clock.get_frame_time (); - else + } else { #endif frame_time = GLib.get_monotonic_time (); +#if HAVE_GTK_3_8 + critical ("FrameClock not availble"); + } +#endif } /** @@ -124,9 +128,11 @@ #endif return; + force_frame_time_update (); + initialize_frame (frame_time); + widget.queue_draw (); - force_frame_time_update (); if (animation_needed (frame_time)) { #if HAVE_GTK_3_8 unowned Gdk.FrameClock? frame_clock = widget.get_frame_clock (); @@ -145,15 +151,13 @@ { frame_time = frame_clock.get_frame_time (); initialize_frame (frame_time); - - widget.queue_draw (); #else bool draw_timeout () { - widget.queue_draw (); - force_frame_time_update (); #endif + widget.queue_draw (); + if (animation_needed (frame_time)) return true; diff -Nru plank-0.9.1+bzr1327/po/gd.po plank-0.9.1+bzr1330/po/gd.po --- plank-0.9.1+bzr1327/po/gd.po 1970-01-01 00:00:00.000000000 +0000 +++ plank-0.9.1+bzr1330/po/gd.po 2015-07-04 05:36:23.000000000 +0000 @@ -0,0 +1,221 @@ +# Gaelic; Scottish translation for plank +# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015 +# This file is distributed under the same license as the plank package. +# FIRST AUTHOR , 2015. +# GunChleoc , 2015. +msgid "" +msgstr "" +"Project-Id-Version: plank\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2015-06-17 06:23+0000\n" +"PO-Revision-Date: 2015-06-22 11:57+0000\n" +"Last-Translator: GunChleoc \n" +"Language-Team: Fòram na Gàidhlig\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2015-06-23 05:21+0000\n" +"X-Generator: Launchpad (build 17572)\n" +"Language: gd\n" + +#: ../data/plank.appdata.xml.in.h:1 +msgid "" +"Plank is meant to be the simplest dock on the planet. The goal is to provide " +"just what a dock needs and absolutely nothing more." +msgstr "" +"Is fainear Plank gur e an doca as simplidhe air an t-saoghail a bhios ann. " +"Tha sinn ag amas toirt dhut na dh'fheumas tu airson doca gun càil sam bith " +"eile." + +#: ../data/plank.appdata.xml.in.h:2 +msgid "" +"It is, however, a library which can be extended to create other dock " +"programs with more advanced features. Thus, Plank is the underlying " +"technology for Docky (starting in version 3.0.0) and aims to provide all the " +"core features while Docky extends it to add fancier things like Docklets, " +"painters, settings dialogs, etc." +msgstr "" +"'S e leabharlann a th' ann co-dhiù a ghabhas leudachadh gus prògraman doca " +"eile a chruthachadh air a bheil barrachd roghainnean adhartach. Mar sin, 's " +"e an teicneolas air air a tha Docky stèidhichte (on tionndadh 3.0.0. a-mach) " +"a th' ann am Plank agus tha sinn ag amas na feartan bunasach uile a thoirt " +"dhuibh fhad 's a chuireas Docky ris le rudan spaideil leithid Docklets, " +"peantairean, còmhraidhean airson roghainnean is msaa." + +#: ../data/plank.desktop.in.h:1 +msgid "Plank. Stupidly simple." +msgstr "Plank. Cho furasta 's a ghabhas." + +#: ../data/ui/preferences.ui.h:1 +msgid "Theme:" +msgstr "Ùrlar:" + +#: ../data/ui/preferences.ui.h:2 +msgid "Position:" +msgstr "Ionad:" + +#: ../data/ui/preferences.ui.h:3 +msgid "Left" +msgstr "Clì" + +#: ../data/ui/preferences.ui.h:4 +msgid "Right" +msgstr "Deas" + +#: ../data/ui/preferences.ui.h:5 +msgid "Top" +msgstr "Barr" + +#: ../data/ui/preferences.ui.h:6 +msgid "Bottom" +msgstr "Bonn" + +#: ../data/ui/preferences.ui.h:7 +msgid "Alignment:" +msgstr "Co-thaobhadh:" + +#: ../data/ui/preferences.ui.h:8 +msgid "Fill" +msgstr "Lìon" + +#: ../data/ui/preferences.ui.h:9 +msgid "Start" +msgstr "Toiseach" + +#: ../data/ui/preferences.ui.h:10 +msgid "End" +msgstr "Deireadh" + +#: ../data/ui/preferences.ui.h:11 +msgid "Center" +msgstr "Meadhan" + +#: ../data/ui/preferences.ui.h:12 +msgid "On Primary Display:" +msgstr "Air a' phrìomh uidheam-taisbeanaidh:" + +#: ../data/ui/preferences.ui.h:13 +msgid "Offset in percent from the center of the screen-edge" +msgstr "An frìth-àireamh na cheudad o mheadhan oir na sgrìn" + +#: ../data/ui/preferences.ui.h:14 +msgid "Icon Alignment:" +msgstr "Co-thaobhadh nan ìomhaigheagan:" + +#: ../data/ui/preferences.ui.h:15 +msgid "Icon Size:" +msgstr "Meud nan ìomhaigheagan:" + +#: ../data/ui/preferences.ui.h:16 +msgid "Appearance" +msgstr "Coltas" + +#: ../data/ui/preferences.ui.h:17 +msgid "Intellihide" +msgstr "Falach tapaidh" + +#: ../data/ui/preferences.ui.h:18 +msgid "Autohide" +msgstr "Fèin-fhalaich" + +#: ../data/ui/preferences.ui.h:19 +msgid "Dodge maximized window" +msgstr "Sioft fo uinneagan làn-mheudaichte" + +#: ../data/ui/preferences.ui.h:20 +msgid "Window Dodge" +msgstr "Sioft uinneagan" + +#: ../data/ui/preferences.ui.h:21 +msgid "Hide Dock" +msgstr "Falaich an doca" + +#: ../data/ui/preferences.ui.h:22 +msgid "Hide Delay:" +msgstr "Dàil an fhalaich:" + +#: ../data/ui/preferences.ui.h:23 +msgid "Delay in ms before hiding the dock" +msgstr "Dàil ann am ms mus dèid an doca fhalach" + +#: ../data/ui/preferences.ui.h:24 +msgid "Unhide Delay:" +msgstr "Dàil an neo-fhalaich:" + +#: ../data/ui/preferences.ui.h:25 +msgid "Delay in ms before showing the dock" +msgstr "Dàil ann am ms mus dèid an doca a shealltainn" + +#: ../data/ui/preferences.ui.h:26 +msgid "Pressure Reveal:" +msgstr "Foillseachadh brùthaidh:" + +#: ../data/ui/preferences.ui.h:27 +msgid "Item Management" +msgstr "Stiùireadh nan ìomhaigheagan" + +#: ../data/ui/preferences.ui.h:28 +msgid "Show Unpinned:" +msgstr "Seall neo-phrìnichte:" + +#: ../data/ui/preferences.ui.h:29 +msgid "Restrict to Workspace:" +msgstr "Cuingich air an rum-obrach:" + +#: ../data/ui/preferences.ui.h:30 +msgid "Lock Icons:" +msgstr "Glais na h-ìomhaigheagan:" + +#: ../data/ui/preferences.ui.h:31 +msgid "Automatic Pinning:" +msgstr "Prìneachadh fèin-obrachail:" + +#: ../data/ui/preferences.ui.h:32 +msgid "Show Item for Dock:" +msgstr "Seall nì airson an doca:" + +#: ../data/ui/preferences.ui.h:33 +msgid "Behaviour" +msgstr "Giùlan" + +#: ../lib/Items/ApplicationDockItem.vala:442 +#: ../lib/Items/FileDockItem.vala:326 ../lib/Items/FileDockItem.vala:344 +msgid "_Keep in Dock" +msgstr "_Cum san doca" + +#: ../lib/Items/ApplicationDockItem.vala:450 +msgid "_Close All" +msgstr "_Dùin na h-uile" + +#: ../lib/Items/ApplicationDockItem.vala:450 +msgid "_Close" +msgstr "_Dùin" + +#: ../lib/Items/FileDockItem.vala:331 +msgid "_Open in File Browser" +msgstr "F_osgail an am brabhsair nam faidhlichean" + +#: ../lib/Items/FileDockItem.vala:349 +msgid "_Open" +msgstr "F_osgail" + +#: ../lib/Items/FileDockItem.vala:353 +msgid "Open Containing _Folder" +msgstr "_Fosgail am pasgan far a bheil e" + +#: ../lib/Items/PlaceholderDockItem.vala:37 +msgid "Drop applications or files here" +msgstr "Leig às aplacaidean no faidhlichean an-seo" + +#: ../lib/Items/PlankDockItem.vala:77 +msgid "Get _Help Online..." +msgstr "Faigh cob_hair air loidhne..." + +#: ../lib/Items/PlankDockItem.vala:81 +msgid "_Translate This Application..." +msgstr "Eadar-_theangaich an aplacaid seo..." + +#: ../lib/Widgets/PreferencesWindow.vala:67 +#: ../lib/Widgets/PreferencesWindow.vala:77 +msgid "Preferences" +msgstr "Roghainnean" diff -Nru plank-0.9.1+bzr1327/po/LINGUAS plank-0.9.1+bzr1330/po/LINGUAS --- plank-0.9.1+bzr1327/po/LINGUAS 2015-06-17 06:25:07.000000000 +0000 +++ plank-0.9.1+bzr1330/po/LINGUAS 2015-07-04 05:36:23.000000000 +0000 @@ -17,6 +17,7 @@ eu fi fr +gd gl he hr diff -Nru plank-0.9.1+bzr1327/.tarball-version plank-0.9.1+bzr1330/.tarball-version --- plank-0.9.1+bzr1327/.tarball-version 2015-06-17 06:26:07.000000000 +0000 +++ plank-0.9.1+bzr1330/.tarball-version 2015-07-04 05:37:25.000000000 +0000 @@ -1 +1 @@ -0.9.1.1327 +0.9.1.1330 diff -Nru plank-0.9.1+bzr1327/.version plank-0.9.1+bzr1330/.version --- plank-0.9.1+bzr1327/.version 2015-06-17 06:25:44.000000000 +0000 +++ plank-0.9.1+bzr1330/.version 2015-07-04 05:37:01.000000000 +0000 @@ -1 +1 @@ -0.9.1.1327 +0.9.1.1330