Skip to content

Commit

Permalink
update callbacks
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Nov 11, 2021
1 parent 2653fae commit 479df3c
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions src/modules/SlideShowCallbacks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ def StartPackage(name, location, summary, install_size, is_delete)
def ProgressPackage(pkg_percent)
HandleInput()

PackageSlideShow.UpdateCurrentPackageProgress(pkg_percent) if !SlideShow.GetUserAbort

Builtins.y2milestone("Aborted at %1%%", pkg_percent) if SlideShow.GetUserAbort

!SlideShow.GetUserAbort
Expand All @@ -411,8 +409,6 @@ def ProgressPackage(pkg_percent)
def DonePackage(error, reason)
return "I" if SlideShow.GetUserAbort

PackageSlideShow.UpdateCurrentPackageProgress(100)

ret = ""
if error.nonzero?
ret = PackageCallbacks.DonePackage(error, reason)
Expand Down Expand Up @@ -454,8 +450,6 @@ def StartDeltaApply(name)

# during file providal
def ProgressDeltaApply(percent)
PackageSlideShow.UpdateCurrentPackageProgress(percent)

nil
end

Expand Down Expand Up @@ -488,9 +482,6 @@ def ProblemDeltaApply(descr)
#
def CallbackSourceChange(source, media)
PackageCallbacks.SourceChange(source, media) # inform PackageCallbacks about the change
PackageSlideShow.SetCurrentCdNo(source, media)
PackageSlideShow.UpdateCurrentPackageProgress(0)
PackageSlideShow.UpdateAllCdProgress(false)

# display remaining packages
PackageSlideShow.DisplayGlobalProgress
Expand All @@ -501,7 +492,6 @@ def CallbackSourceChange(source, media)
def MediaChange(error_code, error, url, product, current, current_label,
wanted, wanted_label, double_sided, devices, current_device)
devices = deep_copy(devices)
SlideShow.StopTimer if !Mode.normal

ret = PackageCallbacks.MediaChange(
error_code,
Expand All @@ -517,19 +507,6 @@ def MediaChange(error_code, error, url, product, current, current_label,
current_device
)

if !Mode.normal
SlideShow.StartTimer

# moved from PackageCallbacks
# skip it when there is a popup at the top (see bnc#622286)
if (ret == "" || URL.Check(ret)) && UI.WidgetExists(:contents)
PackageSlideShow.SetCurrentCdNo(
PackageCallbacks._current_source,
wanted
)
end
end

ret
end

Expand Down

0 comments on commit 479df3c

Please sign in to comment.