diff --git a/Project.toml b/Project.toml index 4c4fe57..9de4986 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "GtkObservables" uuid = "8710efd8-4ad6-11eb-33ea-2d5ceb25a41c" -version = "2.1.1" +version = "2.1.2" [deps] Cairo = "159f3aea-2a34-519c-b102-8c37f9878175" @@ -22,7 +22,7 @@ Colors = "0.12" Dates = "1.6" FixedPointNumbers = "0.8" Graphics = "1" -Gtk4 = "0.6" +Gtk4 = "0.6, 0.7" IntervalSets = "0.5, 0.6, 0.7" LinearAlgebra = "1.6" Observables = "0.4, 0.5" diff --git a/src/graphics_interaction.jl b/src/graphics_interaction.jl index 4b2e6b8..aa483a7 100644 --- a/src/graphics_interaction.jl +++ b/src/graphics_interaction.jl @@ -301,7 +301,7 @@ function save_cb(::Ptr,par,c) end catch e if !isa(e, Gtk4.GLib.GErrorException) - error_dialog("Failed to save: $e", toplevel(c)) do + info_dialog("Failed to save: $e", toplevel(c)) do end end end diff --git a/src/widgets.jl b/src/widgets.jl index a272a5b..2a58291 100644 --- a/src/widgets.jl +++ b/src/widgets.jl @@ -141,7 +141,7 @@ function slider(range::AbstractRange; Gtk4.draw_value(widget,true) Gtk4.size_request(widget, 200, -1) else - adj = Gtk4.GtkAdjustment(widget) + adj = Gtk4.adjustment(widget) Gtk4.configure!(adj; lower = first(range), upper = last(range), step_increment = step(range)) end Gtk4.value(widget, value) @@ -171,7 +171,7 @@ end # Is calling this `setindex!` too much of a pun? function Base.setindex!(s::Slider, (range,value)::Tuple{AbstractRange, Any}) first(range) <= value <= last(range) || error("$value is not within the span of $range") - adj = Gtk4.GtkAdjustment(widget(s)) + adj = Gtk4.adjustment(widget(s)) @idle_add Gtk4.configure!(adj; value = value, lower = first(range), upper = last(range), step_increment = step(range)) end Base.setindex!(s::Slider, range::AbstractRange) = setindex!(s, (range, s[])) @@ -952,7 +952,7 @@ function spinbutton(range::AbstractRange{T}; first(range), last(range), step(range)) Gtk4.size_request(widget, 200, -1) else - adj = Gtk4.GtkAdjustment(widget) + adj = Gtk4.adjustment(widget) Gtk4.configure!(adj; lower=first(range), upper=last(range), step_increment=step(range)) end if lowercase(first(orientation)) == 'v' @@ -982,7 +982,7 @@ end # Is calling this `setindex!` too much of a pun? function Base.setindex!(s::SpinButton, (range,value)::Tuple{AbstractRange,Any}) first(range) <= value <= last(range) || error("$value is not within the span of $range") - adj = Gtk4.GtkAdjustment(widget(s)) + adj = Gtk4.adjustment(widget(s)) Gtk4.configure!(adj; value = value, lower = first(range), upper = last(range), step_increment = step(range)) end Base.setindex!(s::SpinButton, range::AbstractRange) = setindex!(s, (range, s[])) @@ -1036,7 +1036,7 @@ function cyclicspinbutton(range::AbstractRange{T}, carry_up::Observable{Bool}; widget = GtkSpinButton(first(range) - step(range), last(range) + step(range), step(range)) Gtk4.size_request(widget, 200, -1) else - adj = Gtk4.GtkAdjustment(widget) + adj = Gtk4.adjustment(widget) Gtk4.configure!(adj; lower = first(range) - step(range), upper = last(range) + step(range), step_increment = step(range)) end if lowercase(first(orientation)) == 'v'