Spritz becomes Sulfur

2009-05-17 10:24:37 +02:00
parent 1c41cc77a5
commit 5fc6816c61
92 changed files with 6779 additions and 7131 deletions
@@ -1,6 +1,6 @@
 PKGNAME = entropy
 PYTHON = python2
-SUBDIRS = client conf docs entropy-notification-applet handlers libraries misc/po misc server spritz
+SUBDIRS = client conf docs entropy-notification-applet handlers libraries misc/po misc server sulfur
 SERVER_INSPKGS = reagent.py activator.py server_reagent.py server_activator.py repository-admin-daemon repository-services-daemon.example server_query.py

 all:
@@ -96,9 +96,9 @@ notification-applet-install:

 	make DESTDIR="$(DESTDIR)" -C entropy-notification-applet install

-spritz-install:
+sulfur-install:

-	make DESTDIR="$(DESTDIR)" -C spritz install
+	make DESTDIR="$(DESTDIR)" -C sulfur install

 pylzma-install:

@@ -109,4 +109,4 @@ pycompile-all:

 	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(LIBDIR)/entropy', force = True, quiet = True)"

-install: entropy-install entropy-server-install equo-install notification-applet-install spritz-install pycompile-all updates-daemon-install
+install: entropy-install entropy-server-install equo-install notification-applet-install sulfur-install pycompile-all updates-daemon-install
@@ -12,8 +12,8 @@ NLSPACKAGE = entropy
 CATALOGS = $(shell ls *.po)
 FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))

-GLADEFILES = $(wildcard ../../spritz/src/*.glade) $(wildcard ../../spritz/src/applet/*.glade)
-PYFILES  = $(wildcard ../../libraries/entropy/services/system/*.py) $(wildcard ../../libraries/entropy/services/ugc/*.py) $(wildcard ../../libraries/entropy/services/repository/*.py) $(wildcard ../../libraries/entropy/services/*.py) $(wildcard ../../libraries/entropy/server/*.py) $(wildcard ../../libraries/entropy/server/interfaces/*.py) $(wildcard ../../libraries/entropy/client/services/ugc/*.py) $(wildcard ../../libraries/entropy/client/services/system/*.py) $(wildcard ../../libraries/entropy/client/services/*.py) $(wildcard ../../libraries/entropy/client/*.py) $(wildcard ../../libraries/entropy/client/interfaces/*.py) $(wildcard ../../libraries/entropy/*.py) $(wildcard ../../libraries/*.py) $(wildcard ../../client/*.py) $(wildcard ../../server/*.py) $(wildcard ../../spritz/src/*.py) $(wildcard ../../spritz/src/spritz/*.py) $(wildcard ../../spritz/src/etpgui/*.py) $(wildcard ../../spritz/src/applet/*.py) $(wildcard ../../entropy-notification-applet/src/*.py)
+GLADEFILES = $(wildcard ../../sulfur/src/*.glade) $(wildcard ../../sulfur/src/applet/*.glade)
+PYFILES  = $(wildcard ../../libraries/entropy/services/system/*.py) $(wildcard ../../libraries/entropy/services/ugc/*.py) $(wildcard ../../libraries/entropy/services/repository/*.py) $(wildcard ../../libraries/entropy/services/*.py) $(wildcard ../../libraries/entropy/server/*.py) $(wildcard ../../libraries/entropy/server/interfaces/*.py) $(wildcard ../../libraries/entropy/client/services/ugc/*.py) $(wildcard ../../libraries/entropy/client/services/system/*.py) $(wildcard ../../libraries/entropy/client/services/*.py) $(wildcard ../../libraries/entropy/client/*.py) $(wildcard ../../libraries/entropy/client/interfaces/*.py) $(wildcard ../../libraries/entropy/*.py) $(wildcard ../../libraries/*.py) $(wildcard ../../client/*.py) $(wildcard ../../server/*.py) $(wildcard ../../sulfur/src/*.py) $(wildcard ../../sulfur/src/sulfur/*.py) $(wildcard ../../sulfur/src/etpgui/*.py) $(wildcard ../../sulfur/src/applet/*.py) $(wildcard ../../entropy-notification-applet/src/*.py)
 POTFILES  = $(PYFILES) $(GLADEFILES)

 all: $(NLSPACKAGE).pot $(FMTCATALOGS)
@@ -71,20 +71,20 @@
 ../server/server_activator.py
 ../server/server_query.py
 ../server/server_reagent.py
-../spritz/src/dialogs.py
-../spritz/src/entropyapi.py
-../spritz/src/filters.py
-../spritz/src/misc.py
-../spritz/src/packages.py
-../spritz/src/repo-manager-client.py
-../spritz/src/spritz.py
-../spritz/src/spritz_setup.py
-../spritz/src/views.py
-../spritz/src/etpgui/__init__.py
-../spritz/src/etpgui/packages.py
-../spritz/src/etpgui/widgets.py
+../sulfur/src/dialogs.py
+../sulfur/src/entropyapi.py
+../sulfur/src/filters.py
+../sulfur/src/misc.py
+../sulfur/src/packages.py
+../sulfur/src/repo-manager-client.py
+../sulfur/src/sulfur.py
+../sulfur/src/sulfur_setup.py
+../sulfur/src/views.py
+../sulfur/src/etpgui/__init__.py
+../sulfur/src/etpgui/packages.py
+../sulfur/src/etpgui/widgets.py
 ../entropy-notification-applet/src/applet.py
 ../entropy-notification-applet/src/etp_applet_components.py
 ../entropy-notification-applet/src/etp_applet_config.py
 ../entropy-notification-applet/src/etp_applet.py
-../spritz/src/spritz.glade
+../sulfur/src/sulfur.glade
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth		include		config-util
-account		include		config-util
-session		include		config-util
-
@@ -1,6 +1,6 @@
 SUBDIRS = src src/etpgui 
 PYFILES = $(wildcard *.py)
-PKGNAME = spritz
+PKGNAME = sulfur
 PYTHON = python2
 SRCDIR = src
 MISCDIR = misc
@@ -17,8 +17,8 @@ clean:
 	for d in $(SUBDIRS); do make -C $$d clean ; done

 install:
-	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/spritz/misc
-	mkdir -p $(DESTDIR)/usr/share/pixmaps/spritz/packages
+	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/sulfur/misc
+	mkdir -p $(DESTDIR)/usr/share/pixmaps/sulfur/packages
 	mkdir -p $(DESTDIR)/usr/share/applications
 	mkdir -p $(DESTDIR)/usr/share/mimelnk/application
 	mkdir -p $(DESTDIR)/usr/share/mime/packages
@@ -29,15 +29,14 @@ install:
 	mkdir -p $(DESTDIR)/etc
 	mkdir -p $(DESTDIR)/etc/pam.d

-	install -m644 COPYING $(DESTDIR)/$(LIBDIR)/entropy/spritz/.
+	install -m644 COPYING $(DESTDIR)/$(LIBDIR)/entropy/sulfur/.
 	install -m755 $(MISCDIR)/entropy-repo-manager $(DESTDIR)/usr/bin/.
-	install -m755 $(MISCDIR)/spritz $(DESTDIR)/usr/bin/.
-	install -m755 $(MISCDIR)/spritz-uri-handler $(DESTDIR)/usr/bin/.
+	install -m755 $(MISCDIR)/sulfur $(DESTDIR)/usr/bin/.
+	install -m755 $(MISCDIR)/sulfur-uri-handler $(DESTDIR)/usr/bin/.
 	install -m644 $(MISCDIR)/entropy-handler.schemas $(DESTDIR)/etc/gconf/schemas/.
-	install -m644 $(PIXDIR)/*.png $(DESTDIR)/usr/share/pixmaps/spritz/.
-	install -m644 $(PIXDIR)/packages/*.png $(DESTDIR)/usr/share/pixmaps/spritz/packages/.
-	install -m644 $(MISCDIR)/spritz.pam $(DESTDIR)/etc/pam.d/spritz
-	install -m644 $(MISCDIR)/kde_x-spritz.desktop $(DESTDIR)/usr/share/mimelnk/application/.
+	install -m644 $(PIXDIR)/*.png $(DESTDIR)/usr/share/pixmaps/sulfur/.
+	install -m644 $(PIXDIR)/packages/*.png $(DESTDIR)/usr/share/pixmaps/sulfur/packages/.
+	install -m644 $(MISCDIR)/kde_x-sulfur.desktop $(DESTDIR)/usr/share/mimelnk/application/.
 	install -m644 $(MISCDIR)/entropy-mimetypes.xml $(DESTDIR)/usr/share/mime/packages/.
 	install -m644 $(MISCDIR)/*.desktop $(DESTDIR)/usr/share/applications/.
 	for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` LIBDIR=$(LIBDIR) -C $$d install; [ $$? = 0 ] || exit 1; done
@@ -5,7 +5,7 @@
 			<applyto>/desktop/gnome/url-handlers/entropy/command</applyto>
 			<owner>entropy-handler</owner>
 			<type>string</type>
-			<default>spritz-uri-handler %s</default>
+			<default>sulfur-uri-handler %s</default>
 			<locale name="C">
 				<short>Entropy packages install URI handler</short>
 				<long>The handler of entropy://package-1.2.3 to make packages installation utterly easy</long>
@@ -1,4 +1,4 @@
 #!/usr/bin/python
 import subprocess
-rc = subprocess.call(["python2","/usr/lib/entropy/spritz/repo-manager-client.py"])
+rc = subprocess.call(["python2","/usr/lib/entropy/sulfur/repo-manager-client.py"])
 raise SystemExit(rc)
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Entropy Repository Manager
 Comment=Entropy Graphical Repository Manager
 Categories=Application;System
-Icon=/usr/share/pixmaps/spritz/spritz-icon.png
+Icon=/usr/share/pixmaps/sulfur/sulfur-icon.png
 Exec=entropy-repo-manager %U
 Type=Application
 Terminal=false
@@ -1,5 +1,5 @@
 [Protocol]
-exec=spritz-uri-handler "%u"
+exec=sulfur-uri-handler "%u"
 protocol=entropy
 input=none
 output=none
@@ -10,4 +10,4 @@ writing=false
 makedir=false
 deleting=false
 URIMode=rawuri
-Icon=spritz
+Icon=sulfur
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 MimeType=application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-tarz
 Comment=Entropy Graphical Package Manager
-Icon=/usr/share/pixmaps/spritz/spritz-icon.png
+Icon=/usr/share/pixmaps/sulfur/sulfur-icon.png
 Type=MimeType
 Patterns=*.tbz2
 Hidden=false
@@ -1,14 +1,14 @@
 #!/usr/bin/python2 -O
 import sys, os
 if "--debug" in sys.argv:
-    os.environ['SPRITZ_DEBUG'] = "1"
+    os.environ['SULFUR_DEBUG'] = "1"
    sys.argv.remove("--debug")

-spritz_path = " /usr/lib/entropy/spritz/spritz.py " + ' '.join(sys.argv[1:])
-su_cmd = "xterm -e \"su -c '"+spritz_path+"'\""
+sulfur_path = " /usr/lib/entropy/sulfur/sulfur.py " + ' '.join(sys.argv[1:])
+su_cmd = "xterm -e \"su -c '"+sulfur_path+"'\""

 def setup_env():
-    global spritz_path, su_cmd
+    global sulfur_path, su_cmd
    pathenv = os.getenv("PATH")
    if os.path.isfile("/etc/profile.env"):
        f = open("/etc/profile.env")
@@ -30,20 +30,20 @@ def setup_env():
        for item in path:
            itempath = os.path.join(item,'kdesu')
            if os.access(itempath,os.X_OK):
-                su_cmd = itempath+' "'+spritz_path+'"'
+                su_cmd = itempath+' "'+sulfur_path+'"'
                break
    else:
        if os.access('/usr/bin/gksu',os.X_OK):
-            su_cmd = '/usr/bin/gksu "'+spritz_path+'"'
+            su_cmd = '/usr/bin/gksu "'+sulfur_path+'"'



 setup_env()
 tbz2s = [x for x in sys.argv[1:] if x.endswith(".tbz2")]
 if tbz2s:
-    os.environ['SPRITZ_PACKAGES'] = ';'.join(tbz2s)
+    os.environ['SULFUR_PACKAGES'] = ';'.join(tbz2s)
 if os.getuid() == 0:
-    rc = os.system(spritz_path)
+    rc = os.system(sulfur_path)
 else:
    rc = os.system(su_cmd)
 raise SystemExit(rc)
@@ -1,5 +1,5 @@
 #!/usr/bin/python2
-#    Spritz (Entropy Interface)
+#    Sulfur (Entropy Interface)
 #    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,8 @@ import sys, os

 # working string: entropy://media-foo/abc;media-foo/abc2

-spritz_path = "/usr/bin/spritz"
-spritz_install_arg = "--install"
+sulfur_path = "/usr/bin/sulfur"
+sulfur_install_arg = "--install"
 entropy_uri_pfx = "entropy://"
 atoms = []
 for arg in sys.argv[1:]:
@@ -34,7 +34,7 @@ for arg in sys.argv[1:]:
        atoms.append(arg)

 if atoms:
-    args = [spritz_path, spritz_install_arg] + atoms
+    args = [sulfur_path, sulfur_install_arg] + atoms
    print ' '.join(args)
    rc = os.system(' '.join(args))
    raise SystemExit(rc)
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Spritz Package Manager
+Name=Sulfur
 Comment=Entropy Graphical Package Manager
 Categories=Application;System;Settings
-Icon=/usr/share/pixmaps/spritz/spritz-icon.png
-Exec=spritz %U
+Icon=/usr/share/pixmaps/sulfur/sulfur-icon.png
+Exec=sulfur %U
 Type=Application
 Terminal=false
 MimeType=application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-tarz
@@ -9,4 +9,4 @@ clean:
 install:
 	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/spritz
 	install -m755 *.py $(DESTDIR)/$(PKGDIR)/.
-	install -m644 spritz.glade $(DESTDIR)/$(PKGDIR)/.
+	install -m644 sulfur.glade $(DESTDIR)/$(PKGDIR)/.
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ from __future__ import with_statement
 import time, gtk, gobject, pango, thread, pty, sys
 from etpgui.widgets import UI
 from etpgui import CURRENT_CURSOR, busyCursor, normalCursor
-from spritz_setup import const, cleanMarkupString, SpritzConf, unicode2htmlentities, fakeoutfile, fakeinfile
+from sulfur_setup import const, cleanMarkupString, SulfurConf, unicode2htmlentities, fakeoutfile, fakeinfile
 from entropy.i18n import _,_LOCALE
 import packages
 from entropy.exceptions import *
@@ -454,9 +454,8 @@ class RepositoryManagerMenu(MenuSkel):
        self.console_menu = self.console_menu_xml.get_widget( "terminalMenu" )
        self.console_menu_xml.signal_autoconnect(self)

-        from etpgui.widgets import SpritzConsole
-        self.SpritzConsole = SpritzConsole
-        self.console = self.SpritzConsole()
+        from etpgui.widgets import SulfurConsole
+        self.console = SulfurConsole()
        self.console.set_scrollback_lines(1024)
        self.console.set_scroll_on_output(True)
        self.console.set_pty(self.pty[0])
@@ -3568,12 +3567,12 @@ class RmNoticeBoardMenu(MenuSkel):
        ]
        for item in bold_items:
            t = item.get_text()
-            item.set_markup("<span foreground='%s'><small><b>%s</b></small></span>" % (SpritzConf.color_title,t,))
+            item.set_markup("<span foreground='%s'><small><b>%s</b></small></span>" % (SulfurConf.color_title,t,))
        for item in small_items:
            t = item.get_text()
-            item.set_markup("<span foreground='%s'><small>%s</small></span>" % (SpritzConf.color_pkgsubtitle,t,))
+            item.set_markup("<span foreground='%s'><small>%s</small></span>" % (SulfurConf.color_pkgsubtitle,t,))
        t = self.rm_ui.rmNoticeBoardTextLabel.get_text()
-        self.rm_ui.rmNoticeBoardTextLabel.set_markup("<span foreground='%s'><small>%s</small></span>" % (SpritzConf.color_subdesc,t,))
+        self.rm_ui.rmNoticeBoardTextLabel.set_markup("<span foreground='%s'><small>%s</small></span>" % (SulfurConf.color_subdesc,t,))
        self.rm_ui.rmNoticeBoardInfo.show_all()

 class SmQueueMenu(MenuSkel):
@@ -4051,9 +4050,9 @@ class PkgInfoMenu(MenuSkel):
        status, err_msg = self.Entropy.UGC.add_vote(self.repository, self.pkgkey, vote)
        if status:
            self.set_stars_from_repository()
-            msg = "<small><span foreground='%s'>%s</span>: %s</small>" % (SpritzConf.color_good,_("Vote registered successfully"),vote,)
+            msg = "<small><span foreground='%s'>%s</span>: %s</small>" % (SulfurConf.color_good,_("Vote registered successfully"),vote,)
        else:
-            msg = "<small><span foreground='%s'>%s</span>: %s</small>" % (SpritzConf.color_error,_("Error registering vote"),err_msg,)
+            msg = "<small><span foreground='%s'>%s</span>: %s</small>" % (SulfurConf.color_error,_("Error registering vote"),err_msg,)

        self.pkginfo_ui.ugcMessageBox.set_markup(msg)

@@ -4471,7 +4470,7 @@ class SecurityAdvisoryMenu(MenuSkel):
        adv_pixmap = const.PIXMAPS_PATH+'/button-glsa.png'
        self.advinfo_ui.advImage.set_from_file(adv_pixmap)

-        glsa_idtext = "<b>GLSA</b>#<span foreground='%s' weight='bold'>%s</span>" % (SpritzConf.color_title,key,)
+        glsa_idtext = "<b>GLSA</b>#<span foreground='%s' weight='bold'>%s</span>" % (SulfurConf.color_title,key,)
        self.advinfo_ui.labelIdentifier.set_markup(glsa_idtext)

        bold_items = [
@@ -4504,14 +4503,14 @@ class SecurityAdvisoryMenu(MenuSkel):
        myurl = ''
        if data.has_key('url'):
            myurl = data['url']
-        self.advinfo_ui.labelTitle.set_markup( "<small>%s\n<span foreground='%s'>%s</span></small>" % (data['title'],SpritzConf.color_title2,myurl,)) 
+        self.advinfo_ui.labelTitle.set_markup( "<small>%s\n<span foreground='%s'>%s</span></small>" % (data['title'],SulfurConf.color_title2,myurl,)) 

        # description
        desc_text = ' '.join([x.strip() for x in data['description'].split("\n")]).strip()
        if data.has_key('description_items'):
            if data['description_items']:
                for item in data['description_items']:
-                    desc_text += '\n\t%s %s' % ("<span foreground='%s'>(*)</span>" % (SpritzConf.color_title,),item,)
+                    desc_text += '\n\t%s %s' % ("<span foreground='%s'>(*)</span>" % (SulfurConf.color_title,),item,)
        desc_text = desc_text.replace('!;\\n','')
        b = gtk.TextBuffer()
        b.set_text(desc_text)
@@ -4535,11 +4534,11 @@ class SecurityAdvisoryMenu(MenuSkel):
        t = "<b>%s</b>" % (t,)
        t += " [<span foreground='darkgreen'>%s</span>:<span foreground='%s'>%s</span>|<span foreground='%s'>%s</span>:<span foreground='%s'>%s</span>]" % (
                    _("impact"),
-                    SpritzConf.color_title2,
+                    SulfurConf.color_title2,
                    data['impacttype'],
-                    SpritzConf.color_subdesc,
+                    SulfurConf.color_subdesc,
                    _("access"),
-                    SpritzConf.color_pkgsubtitle,
+                    SulfurConf.color_pkgsubtitle,
                    data['access'],
        )
        self.advinfo_ui.impactLabel.set_markup(t)
@@ -4785,7 +4784,7 @@ class UGCAddMenu(MenuSkel):

        self.hide_loading()
        if not rslt:
-            txt = "<small><span foreground='%s'><b>%s</b></span>: %s | %s</small>" % (SpritzConf.color_error,_("UGC Error"),rslt,data,)
+            txt = "<small><span foreground='%s'><b>%s</b></span>: %s | %s</small>" % (SulfurConf.color_error,_("UGC Error"),rslt,data,)
            self.ugcadd_ui.ugcAddStatusLabel.set_markup(txt)
            return False
        else:
@@ -4933,7 +4932,7 @@ class MaskedPackagesDialog(MenuSkel):
        if top_text == None:
            top_text = _("These are the packages that must be enabled to satisfy your request")

-        tit = "<b><span foreground='%s' size='large'>%s</span></b>\n" % (SpritzConf.color_title,_("Some packages are masked"),)
+        tit = "<b><span foreground='%s' size='large'>%s</span></b>\n" % (SulfurConf.color_title,_("Some packages are masked"),)
        tit += top_text
        self.action.set_markup( tit )
        if sub_text != None: self.subaction.set_markup( sub_text )
@@ -5109,10 +5108,10 @@ class MaskedPackagesDialog(MenuSkel):
            cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category,cleanMarkupString(cat_desc),)
            mydummy = packages.DummyEntropyPackage(
                    namedesc = cat_text,
-                    dummy_type = SpritzConf.dummy_category,
+                    dummy_type = SulfurConf.dummy_category,
                    onlyname = category
            )
-            mydummy.color = SpritzConf.color_package_category
+            mydummy.color = SulfurConf.color_package_category
            parent = model.append( None, (mydummy,) )
            for po in categories[category]:
                model.append( parent, (po,) )
@@ -5333,8 +5332,8 @@ class ConfirmationDialog:
                desc = cleanMarkupString(desc)
                if not desc.strip():
                    desc = _("No description")
-                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SpritzConf.color_pkgdesc,desc,)
-                mypkg = "<span foreground='%s'>%s</span>" % (SpritzConf.color_remove,str(pkg),)
+                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SulfurConf.color_pkgdesc,desc,)
+                mypkg = "<span foreground='%s'>%s</span>" % (SulfurConf.color_remove,str(pkg),)
                model.append( level1, [mypkg+mydesc] )
        if reinstall:
            label = "<b>%s</b>" % _("To be reinstalled")
@@ -5344,8 +5343,8 @@ class ConfirmationDialog:
                desc = cleanMarkupString(desc)
                if not desc.strip():
                    desc = _("No description")
-                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SpritzConf.color_pkgdesc,desc,)
-                mypkg = "<span foreground='%s'>%s</span>" % (SpritzConf.color_reinstall,str(pkg),)
+                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SulfurConf.color_pkgdesc,desc,)
+                mypkg = "<span foreground='%s'>%s</span>" % (SulfurConf.color_reinstall,str(pkg),)
                model.append( level1, [mypkg+mydesc] )
        if install:
            label = "<b>%s</b>" % _("To be installed")
@@ -5355,8 +5354,8 @@ class ConfirmationDialog:
                desc = cleanMarkupString(desc)
                if not desc.strip():
                    desc = _("No description")
-                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SpritzConf.color_pkgdesc,desc,)
-                mypkg = "<span foreground='%s'>%s</span>" % (SpritzConf.color_install,str(pkg),)
+                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SulfurConf.color_pkgdesc,desc,)
+                mypkg = "<span foreground='%s'>%s</span>" % (SulfurConf.color_install,str(pkg),)
                model.append( level1, [mypkg+mydesc] )
        if update:
            label = "<b>%s</b>" % _("To be updated")
@@ -5366,8 +5365,8 @@ class ConfirmationDialog:
                desc = cleanMarkupString(desc)
                if not desc.strip():
                    desc = _("No description")
-                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SpritzConf.color_pkgdesc,desc,)
-                mypkg = "<span foreground='%s'>%s</span>" % (SpritzConf.color_update,str(pkg),)
+                mydesc = "\n<small><span foreground='%s'>%s</span></small>" % (SulfurConf.color_pkgdesc,desc,)
+                mypkg = "<span foreground='%s'>%s</span>" % (SulfurConf.color_update,str(pkg),)
                model.append( level1, [mypkg+mydesc] )

    def destroy( self ):
@@ -5486,7 +5485,7 @@ class AboutDialog(gtk.Window):
        Mostly ripped from the one in gDesklets
    """

-    def __init__(self, gfx, creditText, title = "Spritz Package Manager"):
+    def __init__(self, gfx, creditText, title = "Sulfur Project"):

        self.__is_stopped = True
        self.__scroller_values = ()
@@ -5616,7 +5615,7 @@ def infoMessage( parent, title, text ):
    dlg.destroy()
    return not rc == gtk.RESPONSE_OK

-def questionDialog(parent, msg, title = _("Spritz Question"), get_response = False):
+def questionDialog(parent, msg, title = _("Sulfur Question"), get_response = False):
    dlg = gtk.MessageDialog(
        parent=parent,
        type = gtk.MESSAGE_QUESTION,
@@ -5956,10 +5955,10 @@ class MessageDialog:
        dialog.destroy()

 class LicenseDialog:
-    def __init__( self, spritz_app, entropy, licenses ):
+    def __init__( self, application, entropy, licenses ):

-        self.parent = spritz_app.ui.main
-        self.Spritz = spritz_app
+        self.parent = application.ui.main
+        self.Sulfur = application
        self.Entropy = entropy
        self.xml = gtk.glade.XML( const.GLADE_FILE, 'licenseWindow',domain="entropy" )
        self.xml_licread = gtk.glade.XML( const.GLADE_FILE, 'textReadWindow',domain="entropy" )
@@ -6100,7 +6099,7 @@ class ExceptionDialog:
        rc, (name,mail,description) = errorMessage(
            None,
            _( "Exception caught" ),
-            _( "Spritz crashed! An unexpected error occured." ),
+            _( "Sulfur crashed! An unexpected error occured." ),
            errmsg,
            showreport = conntest
        )
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 import gtk
 import sys
 import time
-from spritz_setup import const
+from sulfur_setup import const
 from dialogs import questionDialog, LicenseDialog, okDialog, choiceDialog, inputDialog
 import gobject

@@ -31,17 +31,11 @@ from entropy.transceivers import UrlFetcher
 from entropy.i18n import _
 from entropy.misc import ParallelTask

-'''
-
-   Classes reimplementation for use with a GUI
-
-'''
-
 class QueueExecutor:

-    def __init__(self, SpritzApplication):
-        self.Spritz = SpritzApplication
-        self.Entropy = SpritzApplication.Equo
+    def __init__(self, SulfurApplication):
+        self.Sulfur = SulfurApplication
+        self.Entropy = SulfurApplication.Equo
        self.__on_lic_request = False
        self.__on_lic_rc = None

@@ -53,7 +47,7 @@ class QueueExecutor:

            self.__on_lic_request = True
            def do_handle():
-                dialog = LicenseDialog(self.Spritz, self.Entropy, licenses)
+                dialog = LicenseDialog(self.Sulfur, self.Entropy, licenses)
                accept = dialog.run()
                dialog.destroy()
                self.__on_lic_rc = accept,licenses
@@ -73,12 +67,12 @@ class QueueExecutor:
            selected_by_user = set()

        # unmask packages
-        for match in self.Spritz.etpbase.unmaskingPackages:
+        for match in self.Sulfur.etpbase.unmaskingPackages:
            result = self.Entropy.unmask_match(match)
            if not result or self.Entropy.is_match_masked(match):
                dbconn = self.Entropy.open_repository(match[1])
                atom = dbconn.retrieveAtom(match[0])
-                okDialog( self.Spritz.ui.main, "%s: %s" % (_("Error enabling masked package"),atom) )
+                okDialog( self.Sulfur.ui.main, "%s: %s" % (_("Error enabling masked package"),atom) )
                return -2,1

        removalQueue = []
@@ -109,9 +103,9 @@ class QueueExecutor:
        myrange.append(step)
        self.Entropy.progress.total.setup( myrange )

-        self.Spritz.skipMirrorNow = False
-        self.Spritz.ui.skipMirror.show()
-        self.Spritz.ui.abortQueue.show()
+        self.Sulfur.skipMirrorNow = False
+        self.Sulfur.ui.skipMirror.show()
+        self.Sulfur.ui.abortQueue.show()
        # first fetch all
        fetchqueue = 0
        mykeys = {}
@@ -124,12 +118,12 @@ class QueueExecutor:

        for packageInfo in runQueue:

-            self.Spritz.queue_bombing()
+            self.Sulfur.queue_bombing()

            fetchqueue += 1
            Package = self.Entropy.Package()
            metaopts = {}
-            metaopts['fetch_abort_function'] = self.Spritz.mirror_bombing
+            metaopts['fetch_abort_function'] = self.Sulfur.mirror_bombing
            Package.prepare(packageInfo,fetch_action,metaopts)

            myrepo = Package.infoDict['repository']
@@ -161,7 +155,7 @@ class QueueExecutor:
            t = ParallelTask(spawn_ugc)
            t.start()

-        self.Spritz.ui.skipMirror.hide()
+        self.Sulfur.ui.skipMirror.hide()

        if fetch_only or download_sources:
            return 0,0
@@ -172,7 +166,7 @@ class QueueExecutor:
        currentremovalqueue = 0
        for rem_data in removalQueue:

-            self.Spritz.queue_bombing()
+            self.Sulfur.queue_bombing()

            idpackage = rem_data[0]
            currentremovalqueue += 1
@@ -201,17 +195,17 @@ class QueueExecutor:
            del metaopts
            del Package

-        self.Spritz.skipMirrorNow = False
-        self.Spritz.ui.skipMirror.show()
+        self.Sulfur.skipMirrorNow = False
+        self.Sulfur.ui.skipMirror.show()
        totalqueue = len(runQueue)
        currentqueue = 0
        for packageInfo in runQueue:
            currentqueue += 1

-            self.Spritz.queue_bombing()
+            self.Sulfur.queue_bombing()

            metaopts = {}
-            metaopts['fetch_abort_function'] = self.Spritz.mirror_bombing
+            metaopts['fetch_abort_function'] = self.Sulfur.mirror_bombing
            metaopts['removeconfig'] = False

            if packageInfo in selected_by_user:
@@ -238,8 +232,8 @@ class QueueExecutor:
            del metaopts
            del Package

-        self.Spritz.ui.skipMirror.hide()
-        self.Spritz.ui.abortQueue.hide()
+        self.Sulfur.ui.skipMirror.hide()
+        self.Sulfur.ui.abortQueue.hide()

        return 0,0

@@ -256,13 +250,13 @@ class Equo(EquoInterface):
        if "--debug" in sys.argv:
            self.UGC.quiet = False

-    def connect_to_gui(self, spritz_app):
-        self.progress = spritz_app.progress
+    def connect_to_gui(self, application):
+        self.progress = application.progress
        self.urlFetcher = GuiUrlFetcher
        self.nocolor()
-        self.progressLog = spritz_app.progressLogWrite
-        self.output = spritz_app.output
-        self.ui = spritz_app.ui
+        self.progressLog = application.progressLogWrite
+        self.output = application.output
+        self.ui = application.ui

    def updateProgress(self, text, header = "", footer = "", back = False, importance = 0, type = "info", count = [], percent = False):

@@ -1,6 +1,6 @@
 #!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Spritz (Entropy Interface)
+#    Sulfur (Entropy Interface)
 #    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@

 from entropy.const import *
 from entropyapi import Equo
-from spritz_setup import cleanMarkupString, SpritzConf
+from sulfur_setup import cleanMarkupString, SulfurConf
 EquoIntf = Equo()

 class DummyEntropyPackage:
@@ -62,7 +62,7 @@ class EntropyPackage:
        self.do_purge = False
        self.masked = None
        self.voted = 0
-        self.color = SpritzConf.color_normal
+        self.color = SulfurConf.color_normal
        self.remote = remote
        self.selected_by_user = False
        self.set_names = set()
@@ -174,7 +174,7 @@ class EntropyPackage:
        if self.pkgset:
            t = self.matched_atom
            desc = _("Recursive Package Set")
-            t += '\n<small><span foreground=\'%s\'>%s</span></small>' % (SpritzConf.color_pkgdesc,cleanMarkupString(desc),)
+            t += '\n<small><span foreground=\'%s\'>%s</span></small>' % (SulfurConf.color_pkgdesc,cleanMarkupString(desc),)
            return t

        ugc_string = ''
@@ -187,12 +187,12 @@ class EntropyPackage:

        t = ugc_string+'/'.join(atom.split("/")[1:])
        if self.masked:
-            t +=  " <small>[<span foreground='%s'>%s</span>]</small>" % (SpritzConf.color_title2,EquoIntf.SystemSettings['pkg_masking_reasons'][self.masked],)
+            t +=  " <small>[<span foreground='%s'>%s</span>]</small>" % (SulfurConf.color_title2,EquoIntf.SystemSettings['pkg_masking_reasons'][self.masked],)

        desc = self.getDescription(markup = False)
        if len(desc) > 56:
            desc = desc[:56].rstrip()+"..."
-        t += '\n<small><span foreground=\'%s\'>%s</span></small>' % (SpritzConf.color_pkgdesc,cleanMarkupString(desc),)
+        t += '\n<small><span foreground=\'%s\'>%s</span></small>' % (SulfurConf.color_pkgdesc,cleanMarkupString(desc),)
        return t

    def getOnlyName(self):
@@ -22,7 +22,7 @@ import gtk.glade,gtk.gdk
 import pango
 import etpgui
 import gobject
-from spritz_setup import const, SpritzConf
+from sulfur_setup import const, SulfurConf
 import vte

 def hex2float(myhex):
@@ -241,7 +241,7 @@ class CellRendererStars(gtk.GenericCellRenderer):
 gobject.type_register(CellRendererStars)


-class SpritzConsole(vte.Terminal):
+class SulfurConsole(vte.Terminal):

    def __init__(self):
        vte.Terminal.__init__(self)
@@ -253,7 +253,7 @@ class SpritzConsole(vte.Terminal):
            self.set_background_image_file(imgpath)
        self.set_background_saturation(0.4)
        self.set_opacity(65535)
-        myfc = gtk.gdk.color_parse(SpritzConf.color_console_font)
+        myfc = gtk.gdk.color_parse(SulfurConf.color_console_font)
        self.set_color_foreground(myfc)

    def reset (self):
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2005 Tim Lauridsen < tla<AT>rasmil<DOT>DK > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@

 # Filtering action class

-class SpritzFiltering:
+class Filtering:
    def __init__(self):
        self.filters = []

@@ -46,15 +46,15 @@ class SpritzFiltering:
        return None


-# Abstact Filter Classes
+# Abstact BaseFilter Classes

-class SpritzFilter:
+class BaseFilter:
    def __init__(self):
        self.name = self.getName()
        self._state = False

    def getName(self):
-        return "SpritzFilter"
+        return "BaseFilter"

    def process(self,po):
        raise NotImplementedError()
@@ -65,9 +65,9 @@ class SpritzFilter:

 # Filters

-class KeywordFilter(SpritzFilter):
+class KeywordFilter(BaseFilter):
    def __init__(self):
-        SpritzFilter.__init__(self)
+        BaseFilter.__init__(self)
        self.keywordList = []
        self.fields = ['name']#, 'description']

@@ -95,5 +95,5 @@ class KeywordFilter(SpritzFilter):
        else:
            return True

-spritzFilter = SpritzFiltering()
-spritzFilter.registerFilter(KeywordFilter())
+Filter = Filtering()
+Filter.registerFilter(KeywordFilter())
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 from entropy.i18n import _
-from spritz_setup import cleanMarkupString, SpritzConf
+from sulfur_setup import cleanMarkupString, SulfurConf

-class SpritzQueue:
+class Queue:

-    def __init__(self, SpritzApplication):
+    def __init__(self, SulfurApplication):
        self.packages = {}
        self.before = []
        self.keyslotFilter = set()
@@ -32,7 +32,7 @@ class SpritzQueue:
        self.etpbase = None
        self.pkgView = None
        self.queueView = None
-        self.Spritz = SpritzApplication
+        self.Sulfur = SulfurApplication
        import dialogs
        self.dialogs = dialogs

@@ -116,9 +116,9 @@ class SpritzQueue:
        for idpackage in to_be_reinserted:
            if idpackage not in newdepends:
                mystring = "<span foreground='%s'>%s</span>\n<small><span foreground='%s'>%s</span></small>" % (
-                    SpritzConf.color_title,
+                    SulfurConf.color_title,
                    self.Entropy.clientDbconn.retrieveAtom(idpackage),
-                    SpritzConf.color_pkgsubtitle,
+                    SulfurConf.color_pkgsubtitle,
                    cleanMarkupString(self.Entropy.clientDbconn.retrieveDescription(idpackage)),
                )
                atoms.append(mystring)
@@ -176,9 +176,9 @@ class SpritzQueue:
        for idpackage, repoid in crying_items:
            dbconn = self.Entropy.open_repository(repoid)
            mystring = "<span foreground='%s'>%s</span>\n<small><span foreground='%s'>%s</span></small>" % (
-                SpritzConf.color_title,
+                SulfurConf.color_title,
                dbconn.retrieveAtom(idpackage),
-                SpritzConf.color_pkgsubtitle,
+                SulfurConf.color_pkgsubtitle,
                cleanMarkupString(dbconn.retrieveDescription(idpackage)),
            )
            atoms.append(mystring)
@@ -204,7 +204,7 @@ class SpritzQueue:

    def remove(self, pkgs, accept = False, accept_reinsert = False, always_ask = False):

-        self.Spritz.show_wait_window()
+        self.Sulfur.show_wait_window()

        try:
            if type(pkgs) is not list:
@@ -274,11 +274,11 @@ class SpritzQueue:
                del self.before[:]
                return 0,1
        finally:
-            self.Spritz.hide_wait_window()
+            self.Sulfur.hide_wait_window()

    def add(self, pkgs, accept = False, always_ask = False):

-        self.Spritz.show_wait_window()
+        self.Sulfur.show_wait_window()

        try:
            if type(pkgs) is not list:
@@ -317,7 +317,7 @@ class SpritzQueue:
                return status,1

        finally:
-            self.Spritz.hide_wait_window()
+            self.Sulfur.hide_wait_window()

    def elaborateMaskedPackages(self, matches):

@@ -344,7 +344,7 @@ class SpritzQueue:
            pkg, new = self.etpbase.getPackageItem(match)
            pkgs.append(pkg)

-        self.Spritz.hide_wait_window()
+        self.Sulfur.hide_wait_window()
        # save old
        oldmask = self.etpbase.unmaskingPackages.copy()
        maskDialog = self.dialogs.MaskedPackagesDialog(self.Entropy, self.etpbase, self.ui.main, pkgs)
@@ -355,7 +355,7 @@ class SpritzQueue:
            # discard changes
            self.etpbase.unmaskingPackages = oldmask.copy()
        maskDialog.destroy()
-        self.Spritz.show_wait_window()
+        self.Sulfur.show_wait_window()

        return result

@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@

 from etpgui.packages import EntropyPackage, DummyEntropyPackage
 import logging
-from spritz_setup import SpritzConf
+from sulfur_setup import SulfurConf
 from entropy.i18n import _
 from entropy.const import *
 from entropy.exceptions import *
@@ -112,7 +112,7 @@ class EntropyPackages:
            except RepositoryError:
                return 0
            yp.action = 'r'
-            yp.color = SpritzConf.color_install
+            yp.color = SulfurConf.color_install
            return yp
        return [x for x in map(fm,self.Entropy.clientDbconn.listAllIdpackages(order_by = 'atom')) if type(x) != int]

@@ -147,7 +147,7 @@ class EntropyPackages:
            installed_match = cdb_atomMatch(key, matchSlot = slot)
            if installed_match[0] != -1: yp.installed_match = installed_match
            yp.action = 'u'
-            yp.color = SpritzConf.color_update
+            yp.color = SulfurConf.color_update
            return yp
        updates, remove, fine, spm_fine = self.Entropy.calculate_world_updates()

@@ -165,7 +165,7 @@ class EntropyPackages:
                return 0
            yp.installed_match = (idpackage,0)
            yp.action = 'rr'
-            yp.color = SpritzConf.color_install
+            yp.color = SulfurConf.color_install
            return yp
        return [x for x in map(fm,self.filterReinstallable(self.Entropy.clientDbconn.listAllPackages(get_scope = True,order_by = 'atom'))) if type(x) != int]

@@ -188,7 +188,7 @@ class EntropyPackages:
                else:
                    yp.installed_match = (idpackage,0)
            yp.masked = idreason
-            yp.color = SpritzConf.color_install
+            yp.color = SulfurConf.color_install
            return yp
        return [x for x in map(fm,self.getMaskedPackages()) if type(x) != 0]

@@ -250,7 +250,7 @@ class EntropyPackages:
            set_objects = []

            def update_yp(yp):
-                yp.color = SpritzConf.color_install
+                yp.color = SulfurConf.color_install
                yp.set_cat_namedesc = cat_namedesc
                yp.set_names.add(set_name)
                yp.set_from = set_from
@@ -284,12 +284,12 @@ class EntropyPackages:
        msg2 = _("Try clicking the %s button in the %s page") % ( _("Update Repositories"),_("Repository Selection"),)

        msg = "<big><b><span foreground='%s'>%s</span></b></big>\n%s.\n%s" % (
-            SpritzConf.color_title,
+            SulfurConf.color_title,
            _('No updates available'),
            _("It seems that your system is already up-to-date. Good!"),
            msg2,
        )
-        myobj = DummyEntropyPackage(namedesc = msg, dummy_type = SpritzConf.dummy_empty)
+        myobj = DummyEntropyPackage(namedesc = msg, dummy_type = SulfurConf.dummy_empty)
        return [myobj]

    def _getPackages(self,mask):
@@ -1,7 +1,6 @@
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    It was: Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
-#    Now is: Spritz (Entropy Interface)
+#    Sulfur (Entropy Interface)
 #    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -20,9 +19,9 @@

 import gobject
 import gtk
-from spritz_setup import cleanMarkupString
+from sulfur_setup import cleanMarkupString

-class ProgressTotal:
+class _Total:

    def __init__(self, widget):
        self.progress = widget
@@ -93,7 +92,7 @@ class ProgressTotal:
        while gtk.events_pending():
           gtk.main_iteration()

-class SpritzProgress:
+class Base:

    def __init__( self, ui, set_page_func, parent ):
        self.ui = ui
@@ -102,7 +101,7 @@ class SpritzProgress:
        self.ui.progressMainLabel.set_text( "" )
        self.ui.progressSubLabel.set_text( "" )
        self.ui.progressExtraLabel.set_text( "" )
-        self.total = ProgressTotal( self.ui.totalProgressBar )
+        self.total = _Total( self.ui.totalProgressBar )
        self.ui.progressBar.set_fraction( 0 )
        self.ui.progressBar.set_text( " " )
        self.lastFrac = -1
@@ -1,8 +1,6 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    It was: Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
-#    Now is: Spritz (Entropy Interface)
+#    Sulfur (Entropy Interface)
 #    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -37,12 +35,10 @@ from entropyapi import Equo, QueueExecutor
 from entropy.qa import ErrorReportInterface
 from entropy.i18n import _

-# Spritz Imports
+# Sulfur Imports
 import gtk, gobject
-from etpgui.widgets import UI, Controller, SpritzConsole
 from etpgui import *
-from spritz_setup import SpritzConf, const, fakeoutfile, fakeinfile, cleanMarkupString
-from misc import SpritzQueue
+from sulfur_setup import const
 from dialogs import *

 class MyRepositoryManager(RepositoryManagerMenu):
@@ -84,7 +80,7 @@ if __name__ == "__main__":

    try:
        try:
-            gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/spritz-icon.png")
+            gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/sulfur-icon.png")
        except gobject.GError:
            pass
        mainApp = ManagerApplication()
@@ -5,11 +5,11 @@
  <widget class="GtkWindow" id="main">
    <property name="height_request">420</property>
    <property name="visible">True</property>
-    <property name="title" translatable="yes">Spritz Package Manager</property>
+    <property name="title" translatable="yes">Sulfur</property>
    <property name="window_position">GTK_WIN_POS_CENTER</property>
    <property name="default_width">640</property>
    <property name="default_height">450</property>
-    <property name="icon_name">spritz-icon</property>
+    <property name="icon_name">sulfur-icon</property>
    <child>
      <widget class="GtkVBox" id="vbox1">
        <property name="visible">True</property>
@@ -5453,7 +5453,7 @@ Install+Removal</property>
    <property name="resizable">False</property>
    <property name="modal">True</property>
    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="icon_name">spritz-icon</property>
+    <property name="icon_name">sulfur-icon</property>
    <property name="urgency_hint">True</property>
    <property name="gravity">GDK_GRAVITY_CENTER</property>
    <signal name="delete_event" handler="on_addRepoWin_delete_event"/>
@@ -1,6 +1,6 @@
 #!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Spritz (Entropy Interface)
+#    Sulfur (Entropy Interface)
 #    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -36,19 +36,19 @@ from entropy.const import *
 from entropy.i18n import _
 from entropy.misc import TimeScheduled, ParallelTask

-# Spritz Imports
+# Sulfur Imports
 import gtk, gobject
-from etpgui.widgets import UI, Controller, SpritzConsole
+from etpgui.widgets import UI, Controller, SulfurConsole
 from etpgui import *
-from spritz_setup import SpritzConf, const, fakeoutfile, fakeinfile, \
+from sulfur_setup import SulfurConf, const, fakeoutfile, fakeinfile, \
    cleanMarkupString
-from misc import SpritzQueue
+from misc import Queue
 from views import *
-import filters
+from filters import Filter
 from dialogs import *
-from progress import ProgressTotal, SpritzProgress
+from progress import Base as BaseProgress

-class SpritzApplicationEventsMixin:
+class SulfurApplicationEventsMixin:

    def on_console_click(self, widget, event):
        self.console_menu.popup( None, None, None, event.button, event.time )
@@ -77,7 +77,7 @@ class SpritzApplicationEventsMixin:
        status, err_msg = self.Equo.restore_database(dbpath, etpConst['etpdatabaseclientfilepath'])
        self.endWorking()
        self.Equo.reopen_client_repository()
-        self.resetSpritzCacheStatus()
+        self.reset_cache_status()
        self.addPackages()
        if not status:
            self.hide_wait_window()
@@ -308,7 +308,7 @@ class SpritzApplicationEventsMixin:
            self.Equo.remove_repository(repodata['repoid'], disable = disable)
            if not disable:
                self.Equo.add_repository(repodata)
-            self.resetSpritzCacheStatus()
+            self.reset_cache_status()

            self.setupRepoView()
            self.addrepo_ui.addRepoWin.hide()
@@ -321,7 +321,7 @@ class SpritzApplicationEventsMixin:
        errors = self._validate_repo_submit(repodata)
        if not errors:
            self.Equo.add_repository(repodata)
-            self.resetSpritzCacheStatus()
+            self.reset_cache_status()
            self.setupRepoView()
            self.addrepo_ui.addRepoWin.hide()
            msg = "%s '%s' %s" % (_("You should press the button"),_("Update Repositories"),_("now"))
@@ -358,7 +358,7 @@ class SpritzApplicationEventsMixin:
                okDialog( self.ui.main, _("You! Why do you want to remove the main repository ?"))
                return True
            self.Equo.remove_repository(repoid)
-            self.resetSpritzCacheStatus()
+            self.reset_cache_status()
            self.setupRepoView()
            msg = "%s '%s' %s '%s' %s" % (_("You must now either press the"),_("Update Repositories"),_("or the"),_("Regenerate Cache"),_("now"))
            okDialog( self.ui.main, msg )
@@ -409,7 +409,7 @@ class SpritzApplicationEventsMixin:
                        )
        initconfig_entropy_constants(etpConst['systemroot'])
        # re-read configprotect
-        self.resetSpritzCacheStatus()
+        self.reset_cache_status()
        self.addPackages()
        self.Equo.reload_repositories_config()
        self.setupPreferences()
@@ -521,10 +521,10 @@ class SpritzApplicationEventsMixin:

        def clean_n_quit(newrepo):
            self.Equo.remove_repository(newrepo)
-            self.resetSpritzCacheStatus()
+            self.reset_cache_status()
            self.Equo.reopen_client_repository()
            # regenerate packages information
-            self.setupSpritz()
+            self.setup_application()

        if not atomsfound:
            clean_n_quit(newrepo)
@@ -550,7 +550,8 @@ class SpritzApplicationEventsMixin:
        self.setPage('output')

        try:
-            rc = self.processPackageQueue(self.queue.packages, remove_repos = [newrepo])
+            rc = self.process_queue(self.queue.packages,
+                remove_repos = [newrepo])
        except:
            if self.do_debug:
                entropy.tools.print_traceback()
@@ -623,9 +624,9 @@ class SpritzApplicationEventsMixin:
            status = self.updateRepositories(repos)
            self.endWorking()
            self.progress.reset_progress()
-            self.resetSpritzCacheStatus()
+            self.reset_cache_status()
            self.setupRepoView()
-            self.setupSpritz()
+            self.setup_application()
            self.setupAdvisories()
            self.setPage('repos')
            if status:
@@ -653,7 +654,7 @@ class SpritzApplicationEventsMixin:

        rc = True
        try:
-            rc = self.processPackageQueue(self.queue.packages,
+            rc = self.process_queue(self.queue.packages,
                fetch_only = fetch_only, download_sources = download_sources)
        except:
            if self.do_debug:
@@ -705,7 +706,7 @@ class SpritzApplicationEventsMixin:
            self.queueView.refresh()

    def on_queueClean_clicked(self, widget):
-        self.resetSpritzCacheStatus()
+        self.reset_cache_status()
        self.addPackages()

    def on_adv_doubleclick( self, widget, iterator, path ):
@@ -774,10 +775,10 @@ class SpritzApplicationEventsMixin:
        if rc: self.abortQueueNow = True

    def on_search_clicked(self,widget):
-        self.etpbase.setFilter(filters.spritzFilter.processFilters)
+        self.etpbase.setFilter(Filter.processFilters)
        ''' Search entry+button handler'''
        txt = self.ui.pkgFilter.get_text()
-        flt = filters.spritzFilter.get('KeywordFilter')
+        flt = Filter.get('KeywordFilter')
        if txt != '':
            flt.activate()
            lst = txt.split()
@@ -801,7 +802,7 @@ class SpritzApplicationEventsMixin:
        self.quit()

    def on_HelpAbout( self, widget = None ):
-        about = AboutDialog(const.PIXMAPS_PATH+'/spritz-about.png',const.CREDITS,SpritzConf.branding_title)
+        about = AboutDialog(const.PIXMAPS_PATH+'/spritz-about.png',const.CREDITS,SulfurConf.branding_title)
        about.show()

    def on_notebook1_switch_page(self, widget, page, page_num):
@@ -1066,19 +1067,19 @@ class SpritzApplicationEventsMixin:
        col_button = [x for x in parent.get_children() if isinstance(x,gtk.ColorButton)][0]
        setting = self.colorSettingsReverseMap.get(col_button)
        if setting == None: return
-        default_color = SpritzConf.default_colors_config.get(setting)
+        default_color = SulfurConf.default_colors_config.get(setting)
        col_button.set_color(gtk.gdk.color_parse(default_color))
        self.on_Preferences_toggled(None,True)
-        setattr(SpritzConf,setting,default_color)
+        setattr(SulfurConf,setting,default_color)

    def on_ui_color_set(self, widget):
        key = self.colorSettingsReverseMap.get(widget)
-        if not hasattr(SpritzConf,key):
-            print "WARNING: no %s in SpritzConf" % (key,)
+        if not hasattr(SulfurConf,key):
+            print "WARNING: no %s in SulfurConf" % (key,)
            return
        w_col = widget.get_color().to_string()
        self.on_Preferences_toggled(None,True)
-        setattr(SpritzConf,key,w_col)
+        setattr(SulfurConf,key,w_col)

    def on_pkgSorter_changed(self, widget):
        busyCursor(self.ui.main)
@@ -1093,7 +1094,7 @@ class SpritzApplicationEventsMixin:
        normalCursor(self.ui.main)


-class SpritzApplication(Controller, SpritzApplicationEventsMixin):
+class SulfurApplication(Controller, SulfurApplicationEventsMixin):

    def __init__(self):

@@ -1102,7 +1103,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.do_debug = False
        locked = self.Equo._resources_run_check_lock()
        if locked:
-            okDialog( None, _("Entropy resources are locked and not accessible. Another Entropy application is running. Sorry, can't load Spritz.") )
+            okDialog( None, _("Entropy resources are locked and not accessible. Another Entropy application is running. Sorry, can't load Sulfur.") )
            raise SystemExit(1)
        self.safe_mode_txt = ''
        # check if we'are running in safe mode
@@ -1173,14 +1174,14 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.do_debug = False
        if "--debug" in sys.argv:
            self.do_debug = True
-        elif os.getenv('SPRITZ_DEBUG') != None:
+        elif os.getenv('SULFUR_DEBUG') != None:
            self.do_debug = True
        if not self.do_debug:
            sys.stdout = self.output
            sys.stderr = self.output
            sys.stdin = self.input

-        self.queue = SpritzQueue(self)
+        self.queue = Queue(self)
        self.etpbase.connect_queue(self.queue)
        self.queueView = EntropyQueueView(self.ui.queueView, self.queue)
        self.pkgView = EntropyPackageView(self.ui.viewPkg, self.queueView,
@@ -1197,7 +1198,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.activePage = 'repos'
        self.pageBootstrap = True
        # Progress bars
-        self.progress = SpritzProgress(self.ui,self.setPage,self)
+        self.progress = BaseProgress(self.ui,self.setPage,self)
        # Package Radiobuttons
        self.packageRB = {}
        self.lastPkgPB = 'updates'
@@ -1252,7 +1253,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.console_menu = self.console_menu_xml.get_widget( "terminalMenu" )
        self.console_menu_xml.signal_autoconnect(self)

-        self.ui.main.set_title( "%s %s %s" % (SpritzConf.branding_title, const.__spritz_version__, self.safe_mode_txt) )
+        self.ui.main.set_title( "%s %s %s" % (SulfurConf.branding_title, const.__spritz_version__, self.safe_mode_txt) )
        self.ui.main.connect( "delete_event", self.quit )
        self.ui.notebook.set_show_tabs( False )
        self.ui.main.present()
@@ -1260,7 +1261,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.setPage(self.activePage)

        # put self.console in place
-        self.console = SpritzConsole()
+        self.console = SulfurConsole()
        self.console.set_scrollback_lines(1024)
        self.console.set_scroll_on_output(True)
        self.console.connect("button-press-event", self.on_console_click)
@@ -1301,7 +1302,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.setupRepoView()
        self.firstTime = True
        # calculate updates
-        self.setupSpritz()
+        self.setup_application()

        self.console.set_pty(self.pty[0])
        self.resetProgressText()
@@ -1407,7 +1408,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):

    def packages_install(self):

-        packages_install = os.getenv("SPRITZ_PACKAGES")
+        packages_install = os.getenv("SULFUR_PACKAGES")
        atoms_install = []
        do_fetch = False
        if "--fetch" in sys.argv:
@@ -1439,7 +1440,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
            self.setPage('output')

            try:
-                rc = self.processPackageQueue(self.queue.packages,
+                rc = self.process_queue(self.queue.packages,
                    fetch_only = do_fetch)
            except:
                if self.do_debug:
@@ -1899,7 +1900,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
                else:
                    fillfunc(name, mytype, wgwrite, setting)

-        rc, e = SpritzConf.save()
+        rc, e = SulfurConf.save()
        if not rc: okDialog( self.ui.main, "%s: %s" % (_("Error saving preferences"),e) )
        self.on_Preferences_toggled(None,False)

@@ -1964,7 +1965,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.ui.progressVBox.grab_remove()
        normalCursor(self.ui.main)

-    def setupSpritz(self):
+    def setup_application(self):
        msg = _('Generating metadata. Please wait.')
        self.setStatus(msg)
        count = 30
@@ -1990,7 +1991,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        # clear views
        self.etpbase.clearPackages()
        self.etpbase.clearCache()
-        self.setupSpritz()
+        self.setup_application()
        if alone:
            self.progress.total.show()

@@ -2273,7 +2274,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
        self.resetQueueProgressBars()
        self.disable_ugc = False

-    def processPackageQueue(self, pkgs, remove_repos = [], fetch_only = False, download_sources = False):
+    def process_queue(self, pkgs, remove_repos = [], fetch_only = False, download_sources = False):

        # preventive check against other instances
        locked = self.Equo.application_lock_check()
@@ -2328,24 +2329,24 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
                while t.isAlive():
                    time.sleep(0.2)
                    if self.do_debug:
-                        print "processPackageQueue: QueueExecutor thread still alive"
+                        print "process_queue: QueueExecutor thread still alive"
                    self.gtk_loop()

                e,i = self.my_inst_errors
                if self.do_debug:
-                    print "processPackageQueue: left all"
+                    print "process_queue: left all"

                self.ui.skipMirror.hide()
                self.ui.abortQueue.hide()
                if self.do_debug:
-                    print "processPackageQueue: buttons now hidden"
+                    print "process_queue: buttons now hidden"

                # deactivate UI lock
                if self.do_debug:
-                    print "processPackageQueue: unlocking gui?"
+                    print "process_queue: unlocking gui?"
                self.uiLock(False)
                if self.do_debug:
-                    print "processPackageQueue: gui unlocked"
+                    print "process_queue: gui unlocked"

                if self.my_inst_abort:
                    okDialog(self.ui.main, _("Attention. You chose to abort the processing."))
@@ -2356,38 +2357,38 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
                    )

            if self.do_debug:
-                print "processPackageQueue: endWorking?"
+                print "process_queue: endWorking?"
            self.endWorking()
            self.progress.reset_progress()
            if self.do_debug:
-                print "processPackageQueue: endWorking"
+                print "process_queue: endWorking"

            if (not fetch_only) and (not download_sources):

                if self.do_debug:
-                    print "processPackageQueue: cleared caches"
+                    print "process_queue: cleared caches"

                for myrepo in remove_repos:
                    self.Equo.remove_repository(myrepo)

-                self.resetSpritzCacheStatus()
+                self.reset_cache_status()
                if self.do_debug:
-                    print "processPackageQueue: closed repo dbs"
+                    print "process_queue: closed repo dbs"
                self.Equo.reopen_client_repository()
                if self.do_debug:
-                    print "processPackageQueue: cleared caches (again)"
+                    print "process_queue: cleared caches (again)"
                # regenerate packages information
                if self.do_debug:
-                    print "processPackageQueue: setting up Spritz"
-                self.setupSpritz()
+                    print "process_queue: setting up Sulfur"
+                self.setup_application()
                if self.do_debug:
-                    print "processPackageQueue: scanning for new files"
+                    print "process_queue: scanning for new files"
                self.Equo.FileUpdates.scanfs(dcache = False, quiet = True)
                if self.Equo.FileUpdates.scandata:
                    if len(self.Equo.FileUpdates.scandata) > 0:
                        self.setPage('filesconf')
                if self.do_debug:
-                    print "processPackageQueue: all done"
+                    print "process_queue: all done"

        else:
            self.setStatus( _( "No packages selected" ) )
@@ -2516,7 +2517,7 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):
            idx += 1
        self.addrepo_ui.repodbEntry.set_text(repodata['plain_database'])

-    def resetSpritzCacheStatus(self):
+    def reset_cache_status(self):
        self.pkgView.clear()
        self.etpbase.clearPackages()
        self.etpbase.clearCache()
@@ -2616,20 +2617,20 @@ class SpritzApplication(Controller, SpritzApplicationEventsMixin):

    def load_color_settings(self):
        for key,s_widget in self.colorSettingsMap.items():
-            if not hasattr(SpritzConf,key):
-                if self.do_debug: print "WARNING: no %s in SpritzConf" % (key,)
+            if not hasattr(SulfurConf,key):
+                if self.do_debug: print "WARNING: no %s in SulfurConf" % (key,)
                continue
-            color = getattr(SpritzConf,key)
+            color = getattr(SulfurConf,key)
            s_widget.set_color(gtk.gdk.color_parse(color))

 if __name__ == "__main__":

    try:
        try:
-            gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/spritz-icon.png")
+            gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/sulfur-icon.png")
        except gobject.GError:
            pass
-        mainApp = SpritzApplication()
+        mainApp = SulfurApplication()
        mainApp.init()
        gobject.threads_init()
        gtk.gdk.threads_enter()
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -28,10 +28,10 @@ class const:
    __spritz_version__   = etpConst['entropyversion']
    # Paths
    MAIN_PATH = os.path.abspath( os.path.dirname( sys.argv[0] ) )
-    GLADE_FILE = MAIN_PATH+'/spritz.glade'
+    GLADE_FILE = MAIN_PATH+'/sulfur.glade'
    if not os.path.isfile(GLADE_FILE):
        MAIN_PATH = '/usr/lib/entropy/spritz'
-        GLADE_FILE = MAIN_PATH+'/spritz.glade'
+        GLADE_FILE = MAIN_PATH+'/sulfur.glade'
    if MAIN_PATH == '/usr/lib/entropy/spritz':
        PIXMAPS_PATH = '/usr/share/pixmaps/spritz'
    else:
@@ -111,7 +111,7 @@ class const:
                             0.3) # get package Lists

    CREDITS = (
-           (('Spritz Package Manager - %s' % __spritz_version__),
+           (('Sulfur Package Manager - %s' % __spritz_version__),
           ('Copyright 2007-2009','Fabio Erculiani')),

           (_("Programming:"),
@@ -138,7 +138,7 @@ class const:
          )


-class SpritzConf:
+class SulfurConf:
    """ Yum Extender Config Setting"""
    autorefresh = True
    recentdays = 14
@@ -173,7 +173,7 @@ class SpritzConf:
    filelist = True
    changelog = False
    disable_repo_page = False
-    branding_title = 'Spritz Package Manager'
+    branding_title = 'Sulfur'
    dummy_empty = 0
    dummy_category = 1

@@ -214,24 +214,24 @@ class SpritzConf:
    def getconf():

        config_data = {
-            "color_console_font": SpritzConf.color_console_font,
-            "color_normal": SpritzConf.color_normal,
-            "color_install": SpritzConf.color_install,
-            "color_update": SpritzConf.color_update,
-            "color_remove": SpritzConf.color_remove,
-            "color_reinstall": SpritzConf.color_reinstall,
-            "color_title": SpritzConf.color_title,
-            "color_title2": SpritzConf.color_title2,
-            "color_pkgdesc": SpritzConf.color_pkgdesc,
-            "color_pkgsubtitle": SpritzConf.color_pkgsubtitle,
-            "color_subdesc": SpritzConf.color_subdesc,
-            "color_error": SpritzConf.color_error,
-            "color_good": SpritzConf.color_good,
-            "color_background_good": SpritzConf.color_background_good,
-            "color_background_error": SpritzConf.color_background_error,
-            "color_good_on_color_background": SpritzConf.color_good_on_color_background,
-            "color_error_on_color_background": SpritzConf.color_error_on_color_background,
-            "color_package_category": SpritzConf.color_package_category,
+            "color_console_font": SulfurConf.color_console_font,
+            "color_normal": SulfurConf.color_normal,
+            "color_install": SulfurConf.color_install,
+            "color_update": SulfurConf.color_update,
+            "color_remove": SulfurConf.color_remove,
+            "color_reinstall": SulfurConf.color_reinstall,
+            "color_title": SulfurConf.color_title,
+            "color_title2": SulfurConf.color_title2,
+            "color_pkgdesc": SulfurConf.color_pkgdesc,
+            "color_pkgsubtitle": SulfurConf.color_pkgsubtitle,
+            "color_subdesc": SulfurConf.color_subdesc,
+            "color_error": SulfurConf.color_error,
+            "color_good": SulfurConf.color_good,
+            "color_background_good": SulfurConf.color_background_good,
+            "color_background_error": SulfurConf.color_background_error,
+            "color_good_on_color_background": SulfurConf.color_good_on_color_background,
+            "color_error_on_color_background": SulfurConf.color_error_on_color_background,
+            "color_package_category": SulfurConf.color_package_category,
        }
        return config_data

@@ -241,7 +241,7 @@ class SpritzConf:
        def do_save():
            if not os.path.isdir(os.path.dirname(const.SETTINGS_FILE)):
                os.makedirs(os.path.dirname(const.SETTINGS_FILE))
-            myxml = entropyTools.xml_from_dict_extended(SpritzConf.getconf())
+            myxml = entropyTools.xml_from_dict_extended(SulfurConf.getconf())
            try:
                f = open(const.SETTINGS_FILE,"w")
            except (IOError,OSError,), e:
@@ -275,22 +275,22 @@ class SpritzConf:
    @staticmethod
    # update config reading it from user settings
    def update():
-        saved_conf = SpritzConf.read()
-        validators = SpritzConf.getconf_validators()
+        saved_conf = SulfurConf.read()
+        validators = SulfurConf.getconf_validators()
        if not saved_conf: return
        if not isinstance(saved_conf,dict): return
        for key, val in saved_conf.items():
-            if not hasattr(SpritzConf,key): continue
+            if not hasattr(SulfurConf,key): continue
            vf = validators.get(key)
            if not callable(vf):
-                sys.stderr.write("WARNING: SpritzConf, no callable validator for %s" % (key,))
+                sys.stderr.write("WARNING: SulfurConf, no callable validator for %s" % (key,))
                continue
            valid = vf(val)
            if not valid: continue
-            setattr(SpritzConf,key,val)
+            setattr(SulfurConf,key,val)

-SpritzConf.default_colors_config = SpritzConf.getconf()
-SpritzConf.update()
+SulfurConf.default_colors_config = SulfurConf.getconf()
+SulfurConf.update()

 def cleanMarkupString(msg):
    import gobject
@@ -1,7 +1,7 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python2 -O
 # -*- coding: iso-8859-1 -*-
-#    Yum Exteder (yumex) - A GUI for yum
-#    Copyright (C) 2006 Tim Lauridsen < tim<AT>yum-extender<DOT>org > 
+#    Sulfur (Entropy Interface)
+#    Copyright: (C) 2007-2009 Fabio Erculiani < lxnay<AT>sabayonlinux<DOT>org >
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 import time
 import gtk
 import gobject
-from spritz_setup import const, cleanMarkupString, SpritzConf
+from sulfur_setup import const, cleanMarkupString, SulfurConf
 from etpgui.widgets import UI, CellRendererStars
 from packages import DummyEntropyPackage
 from entropyapi import Equo
@@ -86,8 +86,8 @@ class DefaultPackageViewModelInjector(EntropyPackageViewModelInjector):
            cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category, 
                cleanMarkupString(cat_desc),)
            mydummy = DummyEntropyPackage(namedesc = cat_text,
-                dummy_type = SpritzConf.dummy_category, onlyname = category)
-            mydummy.color = SpritzConf.color_package_category
+                dummy_type = SulfurConf.dummy_category, onlyname = category)
+            mydummy.color = SulfurConf.color_package_category
            set_data = self.entropy.package_set_match(category)[0]
            if not set_data:
                continue
@@ -140,8 +140,8 @@ class DefaultPackageViewModelInjector(EntropyPackageViewModelInjector):
            cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category,
                cleanMarkupString(cat_desc),)
            mydummy = DummyEntropyPackage(namedesc = cat_text,
-                dummy_type = SpritzConf.dummy_category, onlyname = category)
-            mydummy.color = SpritzConf.color_package_category
+                dummy_type = SulfurConf.dummy_category, onlyname = category)
+            mydummy.color = SulfurConf.color_package_category
            self.dummy_cats[category] = mydummy
            parent = self.model.append( None, (mydummy,) )
            for po in categories[category]:
@@ -246,10 +246,11 @@ class RepoSortPackageViewModelInjector(EntropyPackageViewModelInjector):

 class EntropyPackageView:

-    def __init__( self, treeview, qview, ui, etpbase, main_window, spritz_app = None ):
+    def __init__( self, treeview, qview, ui, etpbase, main_window,
+        application = None ):

        self.Equo = Equo()
-        self.Spritz = spritz_app
+        self.Sulfur = application
        self.pkgcolumn_text = _("Selection")
        self.pkgcolumn_text_rating = _("Rating")
        self.stars_col_size = 100
@@ -869,10 +870,10 @@ class EntropyPackageView:
                del self.etpbase._packages["queued"]
            # if we remove packages from the queued view
            # we need to completely remove them from the list
-            if self.Spritz != None:
-                if self.Spritz.lastPkgPB == "queued":
+            if self.Sulfur != None:
+                if self.Sulfur.lastPkgPB == "queued":
                    self.etpbase.populateSingle("queued", force = True)
-                    self.Spritz.addPackages()
+                    self.Sulfur.addPackages()
            # disable user selection
            for obj in objs:
                obj.selected_by_user = False
@@ -917,8 +918,8 @@ class EntropyPackageView:
        self.clear()
        self.etpbase.clearPackages()
        self.etpbase.clearCache()
-        if self.Spritz != None:
-            self.Spritz.addPackages()
+        if self.Sulfur != None:
+            self.Sulfur.addPackages()

    def on_pkgsetUndoinstall_activate(self, widget):
        return self.on_pkgset_install_undoinstall_activate(widget, install = False)
@@ -1192,14 +1193,14 @@ class EntropyPackageView:
        if new == self.__current_model_injector_class:
            return
        self.change_model_injector(new)
-        if self.Spritz != None:
-            sorter = self.Spritz.ui.pkgSorter
-            for sort_name, sort_class in self.Spritz.avail_pkg_sorters.items():
+        if self.Sulfur != None:
+            sorter = self.Sulfur.ui.pkgSorter
+            for sort_name, sort_class in self.Sulfur.avail_pkg_sorters.items():
                if sort_class == new:
-                    sort_id = self.Spritz.pkg_sorters_id_inverse.get(sort_name)
+                    sort_id = self.Sulfur.pkg_sorters_id_inverse.get(sort_name)
                    sorter.set_active(sort_id)
                    break
-            self.Spritz.addPackages()
+            self.Sulfur.addPackages()
        normalCursor(self.main_window)

    def on_package_column_clicked(self, widget):
@@ -1300,9 +1301,9 @@ class EntropyPackageView:
    def vote_submit_thread(self, repository, key, obj):
        status, err_msg = self.Equo.UGC.add_vote(repository, key, obj.voted)
        if status:
-            msg = "<small><span foreground='%s'><b>%s</b></span>: %s</small>" % (SpritzConf.color_good,_("Vote registered successfully"),obj.voted,)
+            msg = "<small><span foreground='%s'><b>%s</b></span>: %s</small>" % (SulfurConf.color_good,_("Vote registered successfully"),obj.voted,)
        else:
-            msg = "<small><span foreground='%s'><b>%s</b></span>: %s</small>" % (SpritzConf.color_error,_("Error registering vote"),err_msg,)
+            msg = "<small><span foreground='%s'><b>%s</b></span>: %s</small>" % (SulfurConf.color_error,_("Error registering vote"),err_msg,)
        gtk.gdk.threads_enter()
        self.ui.UGCMessageLabel.set_markup(msg)
        gtk.gdk.threads_leave()
@@ -1416,11 +1417,11 @@ class EntropyPackageView:

            self.set_line_status(pkg, cell)

-            if pkg.dummy_type == SpritzConf.dummy_empty:
+            if pkg.dummy_type == SulfurConf.dummy_empty:
                cell.set_property( 'stock-id', 'gtk-apply' )
                return

-            if pkg.dummy_type == SpritzConf.dummy_category:
+            if pkg.dummy_type == SulfurConf.dummy_category:
                cell.set_property( 'icon-name', 'package-x-generic' )
                return

@@ -1603,10 +1604,10 @@ class EntropyQueueView:
            cat_text = "<b><big>%s</big></b>\n<small>%s</small>" % (category,cleanMarkupString(cat_desc),)
            mydummy = DummyEntropyPackage(
                    namedesc = cat_text,
-                    dummy_type = SpritzConf.dummy_category,
+                    dummy_type = SulfurConf.dummy_category,
                    onlyname = category
            )
-            mydummy.color = SpritzConf.color_package_category
+            mydummy.color = SulfurConf.color_package_category
            parent = self.model.append( grandfather, (mydummy.namedesc,) )
            for po in categories[category]:
                self.model.append( parent, (po.namedesc,) )
@@ -1761,11 +1762,11 @@ class EntropyAdvisoriesView:
        if key == None:
            affected = False
        if affected:
-            cell.set_property('background',SpritzConf.color_background_error)
-            cell.set_property('foreground',SpritzConf.color_error_on_color_background)
+            cell.set_property('background',SulfurConf.color_background_error)
+            cell.set_property('foreground',SulfurConf.color_error_on_color_background)
        else:
-            cell.set_property('background',SpritzConf.color_background_good)
-            cell.set_property('foreground',SpritzConf.color_good_on_color_background)
+            cell.set_property('background',SulfurConf.color_background_good)
+            cell.set_property('foreground',SulfurConf.color_good_on_color_background)

    def atom_search(self, model, column, key, iterator):
        obj = model.get_value( iterator, 2 )
@@ -1835,14 +1836,14 @@ class EntropyAdvisoriesView:

 class EntropyRepoView:

-    def __init__( self, widget, ui, spritz_app):
+    def __init__( self, widget, ui, application):
        self.view = widget
        self.headers = [_('Repository'),_('Filename')]
        self.store = self.setup_view()
        self.Equo = Equo()
        self.ui = ui
        self.okDialog = okDialog
-        self.Spritz = spritz_app
+        self.Sulfur = application

    def on_active_toggled( self, widget, path):
        """ Repo select/unselect handler """
@@ -1857,8 +1858,8 @@ class EntropyRepoView:
            else:
                self.Equo.enable_repository(repoid)
                initconfig_entropy_constants(etpSys['rootdir'])
-            self.Spritz.resetSpritzCacheStatus()
-            self.Spritz.addPackages(back_to_page = "repos")
+            self.Sulfur.reset_cache_status()
+            self.Sulfur.addPackages(back_to_page = "repos")
            self.store.set_value(myiter,0, not state)

    def on_update_toggled( self, widget, path):