[PATCH 1/2] Make progress hub spokes possible and move the root password there

Vratislav Podzimek vpodzime at redhat.com
Thu Sep 13 12:32:24 UTC 2012


On Thu, 2012-09-13 at 13:57 +0200, Martin Sivak wrote:
>      @property
>      def continueButton(self):
>          return self.builder.get_object("rebootButton")
> -
> +      
   ^^^ there is some trailing whitespace
>   
>      def _init_progress_bar(self, steps):
>          self._totalSteps = steps
>          self._currentStep = 0
> @@ -177,6 +227,9 @@ class ProgressHub(Hub):
>          with gdk_threaded():
>              self._progressBar.set_fraction(0.0)
>  
> +            spinner = self.builder.get_object("progressSpinner")
> +            spinner.start()
> +            
>      def _step_progress_bar(self):
>          if not self._totalSteps:
>              return
> diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
> index ac6e353..b3d33de 100644
> --- a/pyanaconda/ui/gui/spokes/password.py
> +++ b/pyanaconda/ui/gui/spokes/password.py
> @@ -30,8 +30,7 @@ import pwquality
>  import string
>  
>  from pyanaconda.ui.gui.spokes import NormalSpoke
> -# Need a new category I guess
> -from pyanaconda.ui.gui.categories.localization import LocalizationCategory
> +from pyanaconda.ui.gui.categories.user_settings import UserSettingsCategory
>  #from _isys import isCapsLockEnabled
>  
>  __all__ = ["PasswordSpoke"]
> @@ -43,8 +42,7 @@ class PasswordSpoke(NormalSpoke):
>      mainWidgetName = "passwordWindow"
>      uiFile = "spokes/password.glade"
>  
> -    # update this category to something... new?
> -    category = LocalizationCategory
> +    category = UserSettingsCategory
>  
>      icon = "dialog-password-symbolic"
>      title = N_("ROOT PASSWORD")
> @@ -102,7 +100,7 @@ class PasswordSpoke(NormalSpoke):
>          # We are by default complete, but locked.  If a user attempts to set
>          # a password but fails, then we are no longer complete.
>          return not self._error
> -
> +        
  ^^^ another trailing whitespace

>      def _validatePassword(self):
>          # Do various steps to validate the password
>          # sets self._error to an error string
> @@ -164,4 +162,4 @@ class PasswordSpoke(NormalSpoke):
>              self.window.clear_info()
>              self.window.set_info(Gtk.MessageType.WARNING, self._error)
>              self.pw.grab_focus()
> -            self.window.show_all()
> \ No newline at end of file
> +            self.window.show_all()
Something weird here?

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list