UI::ServiceStatus: rename reload and enabled to xxx_flag

library/general/src/lib/ui/service_status.rb

@@ -34,19 +34,19 @@ class ServiceStatus
     #   #name, #start, #stop, #enabled?, #running?
     #   For systemd compliant services, just do
     #   Yast::SystemdService.find("name_of_the_service")
-    # @param reload [Boolean] Initial value for the "reload" checkbox.
+    # @param reload_flag [Boolean] Initial value for the "reload" checkbox.
     #   Keep in mind it will always be displayed as unchecked if the service
     #   is not running, despite the real value.
-    # @param reload_label [Symbol] Type of label for the "reload" checkbox.
+    # @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
     #   :restart means that the service will be restarted, not just reloaded.
-    def initialize(service, reload: true, reload_label: :reload)
+    def initialize(service, reload_flag: true, reload_flag_label: :reload)
       @service = service
-      @reload = reload
+      @reload_flag = reload_flag
 
-      @enabled = @service.enabled?
+      @enabled_flag = @service.enabled?
       @id_prefix = "_srv_status_#{@service.name}"
       textdomain "base"
-      if reload_label == :restart
+      if reload_flag_label == :restart
         @reload_label = _("Restart After Saving Settings")
       else
         @reload_label = _("Reload After Saving Settings")
@@ -75,17 +75,17 @@ def handle_input(input)
       when "#{id_prefix}_stop"
         @service.stop
         refresh
-        :stopped
+        :stop
       when "#{id_prefix}_start"
         @service.start
         refresh
-        :started
+        :start
       when "#{id_prefix}_reload"
-        @reload = Yast::UI.QueryWidget(Id(input), :Value)
-        :reload_changed
+        @reload_flag = Yast::UI.QueryWidget(Id(input), :Value)
+        :reload_flag
       when "#{id_prefix}_enabled"
-        @enabled = Yast::UI.QueryWidget(Id(input), :Value)
-        :enabled_changed
+        @enabled_flag = Yast::UI.QueryWidget(Id(input), :Value)
+        :enabled_flag
       else
         log.info "Input not handled by ServiceStatus: #{input}"
         :ignored
@@ -96,8 +96,8 @@ def handle_input(input)
     # settings
     def refresh
       Yast::UI.ChangeWidget(Id("#{id_prefix}_reload"), :Enabled, @service.running?)
-      Yast::UI.ChangeWidget(Id("#{id_prefix}_reload"), :Value, @service.running? && @reload)
-      Yast::UI.ChangeWidget(Id("#{id_prefix}_enabled"), :Value, @enabled)
+      Yast::UI.ChangeWidget(Id("#{id_prefix}_reload"), :Value, @service.running? && @reload_flag)
+      Yast::UI.ChangeWidget(Id("#{id_prefix}_enabled"), :Value, @enabled_flag)
       Yast::UI.ReplaceWidget(Id("#{id_prefix}_status"), status_widget)
     end
 
@@ -106,15 +106,15 @@ def refresh
     # Checks if the user requested the service to be enabled on boot
     #
     # @return [Boolean]
-    def enabled?
-      @enabled
+    def enabled_flag?
+      @enabled_flag
     end
 
     # Checks if the user requested the service to be reloaded when saving
     #
     # @return [Boolean]
-    def reload?
-      @reload
+    def reload_flag?
+      @reload_flag
     end
 
     # rubocop:enable Style/TrivialAccessors
@@ -161,7 +161,7 @@ def on_boot_widget
           Id("#{id_prefix}_enabled"),
           Opt(:notify),
           _("Start During System Boot"),
-          @enabled
+          @enabled_flag
         )
       )
     end
@@ -175,7 +175,7 @@ def reload_widget
           Id("#{id_prefix}_reload"),
           Opt(*opts),
           @reload_label,
-          @service.running? && @reload
+          @service.running? && @reload_flag
         )
       )
     end

library/general/test/service_status_test.rb

@@ -63,13 +63,13 @@ class DummyDialog
   def initialize(service1, service2)
     @srv1_component = ::UI::ServiceStatus.new(service1)
     @srv2_component = ::UI::ServiceStatus.new(service2)
-    @enabled1 = @srv1_component.enabled?
-    @enabled2 = @srv2_component.enabled?
+    @enabled1 = @srv1_component.enabled_flag?
+    @enabled2 = @srv2_component.enabled_flag?
   end
 
   def handle_input(input)
-    if @srv1_component.handle_input(input) == :enabled_changed
-      @enabled1 = @srv1_component.enabled?
+    if @srv1_component.handle_input(input) == :enabled_flag
+      @enabled1 = @srv1_component.enabled_flag?
     end
     @srv2_component.handle_input(input)
   end
@@ -148,13 +148,13 @@ module Yast
         expect(dialog.enabled1).to eq "new_value"
       end
 
-      it "changes the result of #enabled? on user request" do
-        expect(dialog.srv1_component.enabled?).to eq true
+      it "changes the result of #enabled_flag? on user request" do
+        expect(dialog.srv1_component.enabled_flag?).to eq true
 
         allow(Yast::UI).to receive(:QueryWidget).and_return false
         dialog.handle_input(id_for(enabled_active))
 
-        expect(dialog.srv1_component.enabled?).to eq false
+        expect(dialog.srv1_component.enabled_flag?).to eq false
       end
     end
   end