diff --git a/Makefile b/Makefile index d39f6f2..7ab60e0 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,6 @@ package = $(shell \ ANACONDA_VERSION := $(call spec_version,anaconda/anaconda.spec) FIRSTBOOT_VERSION := $(call spec_version,firstboot/firstboot.spec) -QBSLOGOS_VERSION := $(call spec_version,qubes-logos/qubes-logos.spec) QBSRELEASE_VERSION := $(call spec_version,qubes-release/qubes-release.spec) LORAXQBS_VERSION := $(call spec_version,lorax-templates-qubes/lorax-templates-qubes.spec) PUNGI_VERSION := $(call spec_version,pungi/pungi.spec) @@ -52,7 +51,6 @@ help: @echo "make rpms <--- make all rpms and sign them";\ echo "make rpms_anaconda <--- create binary rpms for Anaconda"; \ echo "make rpms_firstboot <--- create binary rpms for Firstboot"; \ - echo "make rpms_logos <--- create binary rpms for Qubes Logos package"; \ echo "make rpms_release <--- create binary rpms for Qubes Release package"; \ echo; \ echo "make update-repo <-- copy newly generated rpms to installer yum repo";\ @@ -62,11 +60,11 @@ help: echo; \ exit 0; -.PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_lorax \ +.PHONY: rpms rpms_anaconda rpms_firstboot rpms_release rpms_lorax \ rpms_pungi rpms_pykickstart \ update-repo update-repo-testing clean iso -rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_lorax rpms_pungi rpms_pykickstart +rpms: rpms_anaconda rpms_firstboot rpms_release rpms_lorax rpms_pungi rpms_pykickstart rpm --addsign `ls -d rpm/x86_64/*.rpm rpm/i686/*.rpm rpm/noarch/*.rpm 2>/dev/null` rpms-dom0: rpms @@ -82,9 +80,6 @@ rpm/SOURCES/lorax-templates-qubes-$(LORAXQBS_VERSION).tar.bz2: lorax-templates-q rpm/SOURCES/firstboot-$(FIRSTBOOT_VERSION).tar.bz2: firstboot firstboot/firstboot.spec $(call package,firstboot,$(FIRSTBOOT_VERSION)) -rpm/SOURCES/qubes-logos-$(QBSLOGOS_VERSION).tar.bz2: qubes-logos qubes-logos/qubes-logos.spec - $(call package,qubes-logos,$(QBSLOGOS_VERSION)) - rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2: qubes-release qubes-release/qubes-release.spec conf/comps-qubes.xml $(call package,qubes-release,$(QBSRELEASE_VERSION)) cp conf/comps-qubes.xml rpm/SOURCES/Qubes-comps.xml @@ -104,13 +99,10 @@ rpms_pykickstart: pykickstart/pykickstart-$(PYKICKSTART_VERSION).tar.gz pykickst rpms_firstboot: rpm/SOURCES/firstboot-$(FIRSTBOOT_VERSION).tar.bz2 rpmbuild $(RPMBUILD_DEFINES) -bb firstboot/firstboot.spec -rpms_logos: rpm/SOURCES/qubes-logos-$(QBSLOGOS_VERSION).tar.bz2 - rpmbuild $(RPMBUILD_DEFINES) -bb qubes-logos/qubes-logos.spec - rpms_release: rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2 rpmbuild $(RPMBUILD_DEFINES) -bb qubes-release/qubes-release.spec -RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \ +RPMS = \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/qubes-release-notes-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/lorax-templates-qubes-$(LORAXQBS_VERSION)-*.rpm \ diff --git a/Makefile.builder b/Makefile.builder index 94e8c73..3fb5df0 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -1,10 +1,10 @@ ifeq ($(PACKAGE_SET),dom0) -RPM_SPEC_FILES := anaconda/anaconda.spec \ - firstboot/firstboot.spec \ - qubes-logos/qubes-logos.spec \ - qubes-release/qubes-release.spec \ - lorax-templates-qubes/lorax-templates-qubes.spec \ - pungi/pungi.spec \ - pykickstart/pykickstart.spec \ - qubes-release/qubes-dom0-dist-upgrade.spec +RPM_SPEC_FILES := \ + anaconda/anaconda.spec \ + firstboot/firstboot.spec \ + qubes-release/qubes-release.spec \ + lorax-templates-qubes/lorax-templates-qubes.spec \ + pungi/pungi.spec \ + pykickstart/pykickstart.spec \ + qubes-release/qubes-dom0-dist-upgrade.spec endif diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec index f45c55c..d1057f2 100644 --- a/anaconda/anaconda.spec +++ b/anaconda/anaconda.spec @@ -98,7 +98,7 @@ Requires: parted >= %{partedver} Requires: pyparted >= %{pypartedver} Requires: yum >= %{yumver} Requires: python-urlgrabber >= %{pythonurlgrabberver} -Requires: system-logos +Requires: qubes-artwork Requires: pykickstart >= %{pykickstartver} Requires: langtable-data >= %{langtablever} Requires: langtable-python >= %{langtablever} diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index c26a439..55fb810 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -1135,7 +1135,7 @@ kernel qubes-core-dom0 qubes-gui-dom0 - qubes-logos + qubes-artwork qubes-manager qubes-template-fedora-20-x64 qubes-gpg-split-dom0 diff --git a/firstboot/firstboot.spec b/firstboot/firstboot.spec index 4b5d865..5ec2092 100644 --- a/firstboot/firstboot.spec +++ b/firstboot/firstboot.spec @@ -34,6 +34,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires: firstboot(windowmanager) Requires: libreport-python +Requires: qubes-artwork %define debug_package %{nil} diff --git a/qubes-logos/COPYING b/qubes-logos/COPYING deleted file mode 100644 index f72a905..0000000 --- a/qubes-logos/COPYING +++ /dev/null @@ -1,347 +0,0 @@ - -Some of the images in generic-logos are built from GNOME icons licensed -under the GNU GPL, version 2. Hence, qubes-logos is also licensed on -the GNU GPL, version 2. - ------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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. - - - Copyright (C) - - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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) year 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. - - , 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. diff --git a/qubes-logos/COPYING-kde-logo b/qubes-logos/COPYING-kde-logo deleted file mode 100644 index 7199d10..0000000 --- a/qubes-logos/COPYING-kde-logo +++ /dev/null @@ -1,10 +0,0 @@ -From http://wiki.kde.org/tiki-index.php?page=KDE+Logo: -Trademark License -Copying of the KDE Logo is subject to the LGPL copyright license. -Trading and branding with the KDE Logo is subject to our trademark licence: -1. The KDE logo can be used freely as long as it is not used to refer to - products other than KDE itself. -2. There is no formal procedure for using the KDE logo as long as you stay - within the above guideline for usage. -3. Whilst not required you should acknowledge the KDE e.V.s rights by mentioning - "KDE, K Desktop Environment and the KDE Logo are trademarks of KDE e.V." diff --git a/qubes-logos/Makefile b/qubes-logos/Makefile deleted file mode 100644 index b9b4cba..0000000 --- a/qubes-logos/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -NAME = generic-logos -XML = backgrounds/desktop-backgrounds-fedora.xml - -all: update-po archive -VERSION := $(shell awk '/Version:/ { print $$2 }' $(NAME).spec) -RELEASE := $(shell awk '/Release:/ { print $$2 }' $(NAME).spec | sed 's|%{?dist}||g') -TAG=$(NAME)-$(VERSION)-$(RELEASE) - -tag: - @git tag -a -f -m "Tag as $(TAG)" -f $(TAG) - @echo "Tagged as $(TAG)" - -archive: tag - @git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION).tar - @bzip2 -f $(NAME)-$(VERSION).tar - @echo "The archive is at $(NAME)-$(VERSION).tar.bz2" - -clean: - rm -f *~ *bz2 diff --git a/qubes-logos/anaconda/Makefile b/qubes-logos/anaconda/Makefile deleted file mode 100644 index ddda9df..0000000 --- a/qubes-logos/anaconda/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -ANACONDADATADIR = /usr/share/anaconda -ANACONDARUNTIMEDIR = /usr/lib/anaconda-runtime - -all: - @echo "Nothing to do." - -splash.lss: syslinux-splash.png - ./splashtolss.sh syslinux-splash.png splash.lss - -install: - @if [ "$(DESTDIR)" = "" ]; then \ - echo " "; \ - echo "ERROR: A destdir is required"; \ - exit 1; \ - fi - - mkdir -p $(DESTDIR)/$(ANACONDADATADIR) - mkdir -p $(DESTDIR)/$(ANACONDADATADIR)/pixmaps - mkdir -p $(DESTDIR)/$(ANACONDADATADIR)/boot - install -m 644 *.png $(DESTDIR)/$(ANACONDADATADIR)/pixmaps - install -m 644 splash.png $(DESTDIR)/$(ANACONDADATADIR)/pixmaps/progress_first.png - install -m 644 splash.png $(DESTDIR)/$(ANACONDADATADIR)/pixmaps/progress_first-lowres.png - install -m 644 syslinux-splash.png $(DESTDIR)/$(ANACONDADATADIR)/boot/syslinux-splash.png - - mkdir -p $(DESTDIR)/$(ANACONDARUNTIMEDIR) - install -m 644 syslinux-vesa-splash.jpg $(DESTDIR)/$(ANACONDARUNTIMEDIR) - -clean: - rm -f splash.lss diff --git a/qubes-logos/anaconda/README b/qubes-logos/anaconda/README deleted file mode 100644 index 7d06024..0000000 --- a/qubes-logos/anaconda/README +++ /dev/null @@ -1,19 +0,0 @@ -These files are used by anaconda during the installation process. A -basic description/specification for them is as follows: - -* anaconda_header.png: This is strip header at the top of - the screen during the install. 800x58. -* progress_first.png: First graphic displayed during package - installation. If there are no rnotes, this is displayed the entire - time. 500x325 -* progress_first-lowres.png: Lowres version of progress_first.png. 350x225 -* splash.png: Splash screen shown on the "Welcome to ..." screen. - 400x420 -* syslinux-splash.png: Splash screen used at the boot prompt with - syslinux/isolinux. This gets transformed into the syslinux specific - format. 640x300. This uses a 16 color palette (should be an indexed png). - You should ensure that 0 = #000000, 1 = #ffffff, 7 = #cdcfd5, 15 = #c90000. - Alternately, you can use 12 colors and have them be any that you want. -* syslinux-vesa-splash.jpg: Splash screen used at the boot prompt when - using the menu. It should be 640x480 RGB. Can just be a conversion - of the grub splash and work well. diff --git a/qubes-logos/anaconda/anaconda_header.png b/qubes-logos/anaconda/anaconda_header.png deleted file mode 100644 index 59b296b..0000000 Binary files a/qubes-logos/anaconda/anaconda_header.png and /dev/null differ diff --git a/qubes-logos/anaconda/splash.png b/qubes-logos/anaconda/splash.png deleted file mode 100644 index 996640c..0000000 Binary files a/qubes-logos/anaconda/splash.png and /dev/null differ diff --git a/qubes-logos/anaconda/syslinux-splash.png b/qubes-logos/anaconda/syslinux-splash.png deleted file mode 100644 index 0b001d2..0000000 Binary files a/qubes-logos/anaconda/syslinux-splash.png and /dev/null differ diff --git a/qubes-logos/anaconda/syslinux-vesa-splash.jpg b/qubes-logos/anaconda/syslinux-vesa-splash.jpg deleted file mode 100644 index d7d3c2a..0000000 Binary files a/qubes-logos/anaconda/syslinux-vesa-splash.jpg and /dev/null differ diff --git a/qubes-logos/bootloader/README b/qubes-logos/bootloader/README deleted file mode 100644 index 22e85f5..0000000 --- a/qubes-logos/bootloader/README +++ /dev/null @@ -1,8 +0,0 @@ -splash.xpm.gz: the splashscreen used by grub. - -Format requirements: - -640x480, 15 colors, XPM format. Note that the grub text is defined to be -white, highlighted in black, so keep contrast in mind. - -grub does not use descriptive color names; if using ppmtoxpm, pass -hexonly. diff --git a/qubes-logos/bootloader/fireworks.png b/qubes-logos/bootloader/fireworks.png deleted file mode 100644 index 47b4025..0000000 Binary files a/qubes-logos/bootloader/fireworks.png and /dev/null differ diff --git a/qubes-logos/bootloader/splash.xpm.gz b/qubes-logos/bootloader/splash.xpm.gz deleted file mode 100644 index 3a3686a..0000000 Binary files a/qubes-logos/bootloader/splash.xpm.gz and /dev/null differ diff --git a/qubes-logos/firstboot/firstboot-left.png b/qubes-logos/firstboot/firstboot-left.png deleted file mode 100644 index 9b73072..0000000 Binary files a/qubes-logos/firstboot/firstboot-left.png and /dev/null differ diff --git a/qubes-logos/firstboot/splash-small.png b/qubes-logos/firstboot/splash-small.png deleted file mode 100644 index 996640c..0000000 Binary files a/qubes-logos/firstboot/splash-small.png and /dev/null differ diff --git a/qubes-logos/firstboot/workstation.png b/qubes-logos/firstboot/workstation.png deleted file mode 100644 index abd6f03..0000000 Binary files a/qubes-logos/firstboot/workstation.png and /dev/null differ diff --git a/qubes-logos/gen_throbber.sh b/qubes-logos/gen_throbber.sh deleted file mode 100755 index 518a79f..0000000 --- a/qubes-logos/gen_throbber.sh +++ /dev/null @@ -1,14 +0,0 @@ -#/bin/bash -FIRST=00 -LAST=15 -IMAGE=plymouth/charge/throbber- -FORMAT=png - -cd `dirname $0` - -convert $IMAGE$FIRST.$FORMAT $IMAGE$LAST.$FORMAT -morph $(( 10#$LAST - 1 )) __throbber.png - -COUNT=0 -for i in `seq -w $FIRST $LAST`; do - mv __throbber-$((COUNT++)).$FORMAT $IMAGE$i.$FORMAT -done diff --git a/qubes-logos/gnome-splash/gnome-splash.png b/qubes-logos/gnome-splash/gnome-splash.png deleted file mode 100644 index df87b33..0000000 Binary files a/qubes-logos/gnome-splash/gnome-splash.png and /dev/null differ diff --git a/qubes-logos/icons/96-logo.png b/qubes-logos/icons/96-logo.png deleted file mode 100644 index 55cfd05..0000000 Binary files a/qubes-logos/icons/96-logo.png and /dev/null differ diff --git a/qubes-logos/ksplash/SolarComet-kde.png b/qubes-logos/ksplash/SolarComet-kde.png deleted file mode 100644 index 257ae3d..0000000 Binary files a/qubes-logos/ksplash/SolarComet-kde.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-00.png b/qubes-logos/plymouth/charge/progress-00.png deleted file mode 100644 index 03ca8cf..0000000 Binary files a/qubes-logos/plymouth/charge/progress-00.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-01.png b/qubes-logos/plymouth/charge/progress-01.png deleted file mode 100644 index 0b229e7..0000000 Binary files a/qubes-logos/plymouth/charge/progress-01.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-02.png b/qubes-logos/plymouth/charge/progress-02.png deleted file mode 100644 index 24f6e56..0000000 Binary files a/qubes-logos/plymouth/charge/progress-02.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-03.png b/qubes-logos/plymouth/charge/progress-03.png deleted file mode 100644 index bede18b..0000000 Binary files a/qubes-logos/plymouth/charge/progress-03.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-04.png b/qubes-logos/plymouth/charge/progress-04.png deleted file mode 100644 index f634792..0000000 Binary files a/qubes-logos/plymouth/charge/progress-04.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-05.png b/qubes-logos/plymouth/charge/progress-05.png deleted file mode 100644 index d647cbc..0000000 Binary files a/qubes-logos/plymouth/charge/progress-05.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-06.png b/qubes-logos/plymouth/charge/progress-06.png deleted file mode 100644 index 750c00a..0000000 Binary files a/qubes-logos/plymouth/charge/progress-06.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-07.png b/qubes-logos/plymouth/charge/progress-07.png deleted file mode 100644 index df3d615..0000000 Binary files a/qubes-logos/plymouth/charge/progress-07.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-08.png b/qubes-logos/plymouth/charge/progress-08.png deleted file mode 100644 index da8c9a3..0000000 Binary files a/qubes-logos/plymouth/charge/progress-08.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-09.png b/qubes-logos/plymouth/charge/progress-09.png deleted file mode 100644 index db62ac3..0000000 Binary files a/qubes-logos/plymouth/charge/progress-09.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-10.png b/qubes-logos/plymouth/charge/progress-10.png deleted file mode 100644 index 437d8c7..0000000 Binary files a/qubes-logos/plymouth/charge/progress-10.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-11.png b/qubes-logos/plymouth/charge/progress-11.png deleted file mode 100644 index 7254689..0000000 Binary files a/qubes-logos/plymouth/charge/progress-11.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-12.png b/qubes-logos/plymouth/charge/progress-12.png deleted file mode 100644 index c0e4332..0000000 Binary files a/qubes-logos/plymouth/charge/progress-12.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-13.png b/qubes-logos/plymouth/charge/progress-13.png deleted file mode 100644 index 5135c40..0000000 Binary files a/qubes-logos/plymouth/charge/progress-13.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-14.png b/qubes-logos/plymouth/charge/progress-14.png deleted file mode 100644 index 2b9cefc..0000000 Binary files a/qubes-logos/plymouth/charge/progress-14.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-15.png b/qubes-logos/plymouth/charge/progress-15.png deleted file mode 100644 index 25f44e4..0000000 Binary files a/qubes-logos/plymouth/charge/progress-15.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-16.png b/qubes-logos/plymouth/charge/progress-16.png deleted file mode 100644 index 2185bb4..0000000 Binary files a/qubes-logos/plymouth/charge/progress-16.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-17.png b/qubes-logos/plymouth/charge/progress-17.png deleted file mode 100644 index 136ab1c..0000000 Binary files a/qubes-logos/plymouth/charge/progress-17.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-18.png b/qubes-logos/plymouth/charge/progress-18.png deleted file mode 100644 index c279bb4..0000000 Binary files a/qubes-logos/plymouth/charge/progress-18.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-19.png b/qubes-logos/plymouth/charge/progress-19.png deleted file mode 100644 index aba2853..0000000 Binary files a/qubes-logos/plymouth/charge/progress-19.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-20.png b/qubes-logos/plymouth/charge/progress-20.png deleted file mode 100644 index 791d1a1..0000000 Binary files a/qubes-logos/plymouth/charge/progress-20.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-21.png b/qubes-logos/plymouth/charge/progress-21.png deleted file mode 100644 index fb221b7..0000000 Binary files a/qubes-logos/plymouth/charge/progress-21.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-22.png b/qubes-logos/plymouth/charge/progress-22.png deleted file mode 100644 index ea32050..0000000 Binary files a/qubes-logos/plymouth/charge/progress-22.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-23.png b/qubes-logos/plymouth/charge/progress-23.png deleted file mode 100644 index edde6c5..0000000 Binary files a/qubes-logos/plymouth/charge/progress-23.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-24.png b/qubes-logos/plymouth/charge/progress-24.png deleted file mode 100644 index 95113dd..0000000 Binary files a/qubes-logos/plymouth/charge/progress-24.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-25.png b/qubes-logos/plymouth/charge/progress-25.png deleted file mode 100644 index 22f4210..0000000 Binary files a/qubes-logos/plymouth/charge/progress-25.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-26.png b/qubes-logos/plymouth/charge/progress-26.png deleted file mode 100644 index 06d6cf3..0000000 Binary files a/qubes-logos/plymouth/charge/progress-26.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-27.png b/qubes-logos/plymouth/charge/progress-27.png deleted file mode 100644 index b043e24..0000000 Binary files a/qubes-logos/plymouth/charge/progress-27.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-28.png b/qubes-logos/plymouth/charge/progress-28.png deleted file mode 100644 index fda13ac..0000000 Binary files a/qubes-logos/plymouth/charge/progress-28.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-29.png b/qubes-logos/plymouth/charge/progress-29.png deleted file mode 100644 index 82e2231..0000000 Binary files a/qubes-logos/plymouth/charge/progress-29.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-30.png b/qubes-logos/plymouth/charge/progress-30.png deleted file mode 100644 index f01692b..0000000 Binary files a/qubes-logos/plymouth/charge/progress-30.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-31.png b/qubes-logos/plymouth/charge/progress-31.png deleted file mode 100644 index 16d0580..0000000 Binary files a/qubes-logos/plymouth/charge/progress-31.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/progress-32.png b/qubes-logos/plymouth/charge/progress-32.png deleted file mode 100644 index 9b75bd9..0000000 Binary files a/qubes-logos/plymouth/charge/progress-32.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-00.png b/qubes-logos/plymouth/charge/throbber-00.png deleted file mode 100644 index 6dd8adc..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-00.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-01.png b/qubes-logos/plymouth/charge/throbber-01.png deleted file mode 100644 index 238f4ae..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-01.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-02.png b/qubes-logos/plymouth/charge/throbber-02.png deleted file mode 100644 index 894881a..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-02.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-03.png b/qubes-logos/plymouth/charge/throbber-03.png deleted file mode 100644 index 9f95be8..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-03.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-04.png b/qubes-logos/plymouth/charge/throbber-04.png deleted file mode 100644 index ebb27fc..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-04.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-05.png b/qubes-logos/plymouth/charge/throbber-05.png deleted file mode 100644 index a303f2e..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-05.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-06.png b/qubes-logos/plymouth/charge/throbber-06.png deleted file mode 100644 index 0da1abc..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-06.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-07.png b/qubes-logos/plymouth/charge/throbber-07.png deleted file mode 100644 index 676e8bf..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-07.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-08.png b/qubes-logos/plymouth/charge/throbber-08.png deleted file mode 100644 index d4c9ca9..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-08.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-09.png b/qubes-logos/plymouth/charge/throbber-09.png deleted file mode 100644 index 569949a..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-09.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-10.png b/qubes-logos/plymouth/charge/throbber-10.png deleted file mode 100644 index 42911ff..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-10.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-11.png b/qubes-logos/plymouth/charge/throbber-11.png deleted file mode 100644 index 254d93c..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-11.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-12.png b/qubes-logos/plymouth/charge/throbber-12.png deleted file mode 100644 index 5fe6aa9..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-12.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-13.png b/qubes-logos/plymouth/charge/throbber-13.png deleted file mode 100644 index 58e3384..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-13.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-14.png b/qubes-logos/plymouth/charge/throbber-14.png deleted file mode 100644 index dd9eb8b..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-14.png and /dev/null differ diff --git a/qubes-logos/plymouth/charge/throbber-15.png b/qubes-logos/plymouth/charge/throbber-15.png deleted file mode 100644 index ed7da75..0000000 Binary files a/qubes-logos/plymouth/charge/throbber-15.png and /dev/null differ diff --git a/qubes-logos/plymouth/plymouth-missing-fonts.conf b/qubes-logos/plymouth/plymouth-missing-fonts.conf deleted file mode 100644 index 46c49b7..0000000 --- a/qubes-logos/plymouth/plymouth-missing-fonts.conf +++ /dev/null @@ -1,7 +0,0 @@ -install_items+=" /usr/share/fonts/dejavu/DejaVuSans.ttf " -install_items+=" /usr/share/fontconfig/conf.avail/57-dejavu-sans.conf " -install_items+=" /etc/fonts/conf.d/57-dejavu-sans.conf " -install_items+=" /etc/fonts/fonts.conf " -# This unfortunately pulls about 10MB of libraries into initrd, but what can we -# do... without this, the 'script' plugin cannot output any text message -install_items+=" $(plymouth --get-splash-plugin-path)/label.so " diff --git a/qubes-logos/plymouth/plymouthd.defaults.qubes b/qubes-logos/plymouth/plymouthd.defaults.qubes deleted file mode 100644 index 854607c..0000000 --- a/qubes-logos/plymouth/plymouthd.defaults.qubes +++ /dev/null @@ -1,4 +0,0 @@ -# Distribution defaults. Changes to this file will get overwritten during -# upgrades. -[Daemon] -Theme=qubes diff --git a/qubes-logos/plymouth/qubes/CREDITS b/qubes-logos/plymouth/qubes/CREDITS deleted file mode 100644 index 7beed55..0000000 --- a/qubes-logos/plymouth/qubes/CREDITS +++ /dev/null @@ -1 +0,0 @@ -Most of the files here have been taken from plymouth-theme-script. diff --git a/qubes-logos/plymouth/qubes/box.png b/qubes-logos/plymouth/qubes/box.png deleted file mode 100644 index 54876e6..0000000 Binary files a/qubes-logos/plymouth/qubes/box.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/bullet.png b/qubes-logos/plymouth/qubes/bullet.png deleted file mode 100644 index dd52736..0000000 Binary files a/qubes-logos/plymouth/qubes/bullet.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/entry.png b/qubes-logos/plymouth/qubes/entry.png deleted file mode 100644 index a9f4157..0000000 Binary files a/qubes-logos/plymouth/qubes/entry.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/lock.png b/qubes-logos/plymouth/qubes/lock.png deleted file mode 100644 index a0f8c12..0000000 Binary files a/qubes-logos/plymouth/qubes/lock.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/logo.png b/qubes-logos/plymouth/qubes/logo.png deleted file mode 100644 index 996640c..0000000 Binary files a/qubes-logos/plymouth/qubes/logo.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/progress_bar.png b/qubes-logos/plymouth/qubes/progress_bar.png deleted file mode 100644 index d36a84c..0000000 Binary files a/qubes-logos/plymouth/qubes/progress_bar.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/progress_box.png b/qubes-logos/plymouth/qubes/progress_box.png deleted file mode 100644 index f293fd3..0000000 Binary files a/qubes-logos/plymouth/qubes/progress_box.png and /dev/null differ diff --git a/qubes-logos/plymouth/qubes/qubes.plymouth b/qubes-logos/plymouth/qubes/qubes.plymouth deleted file mode 100644 index 169c809..0000000 --- a/qubes-logos/plymouth/qubes/qubes.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=Qubes -Description=Qubes plymouth theme -ModuleName=script - -[script] -ImageDir=/usr/share/plymouth/themes/qubes -ScriptFile=/usr/share/plymouth/themes/qubes/qubes.script diff --git a/qubes-logos/plymouth/qubes/qubes.script b/qubes-logos/plymouth/qubes/qubes.script deleted file mode 100644 index b4e9dbd..0000000 --- a/qubes-logos/plymouth/qubes/qubes.script +++ /dev/null @@ -1,200 +0,0 @@ -# This is an example plymouth plugin script - -Window.SetBackgroundTopColor(0.234, 0.43, 0.705); -Window.SetBackgroundBottomColor(0.16, 0.25, 0.44); - -logo.image = Image("logo.png"); -logo.sprite = Sprite(logo.image); -logo.opacity_angle = 0; - -fun refresh_callback () - { - if (status == "normal") - { - logo.opacity_angle += ((2 * 3.14) / 50) * 0.5; # 0.5 HZ - min_opacity = 0.3; - opacity = (Math.Cos(logo.opacity_angle) + 1) / 2; - opacity *= 1 - min_opacity; - opacity += min_opacity; - logo.sprite.SetX (Window.GetX() + Window.GetWidth() / 2 - logo.image.GetWidth() / 2); - logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2); - logo.sprite.SetOpacity (opacity); - } - else - { - logo.sprite.SetX (0); - logo.sprite.SetY (0); - logo.sprite.SetOpacity (1); - } - } - -Plymouth.SetRefreshFunction (refresh_callback); - -#----------------------------------------- Dialogue -------------------------------- - -status = "normal"; - -fun dialog_setup(text) - { - local.box; - local.prompt; - local.lock; - local.entry; - - box.image = Image("box.png"); - prompt.text = text; - prompt.image = Image.Text(text, 1, 1, 1); - lock.image = Image("lock.png"); - entry.image = Image("entry.png"); - - box.sprite = Sprite(box.image); - box.x = Window.GetX() + Window.GetWidth() / 2 - box.image.GetWidth ()/2; - box.y = Window.GetY() + Window.GetHeight() / 2 - box.image.GetHeight()/2; - box.z = 10000; - box.sprite.SetPosition(box.x, box.y, box.z); - - prompt.sprite = Sprite(prompt.image); - prompt.x = box.x + box.image.GetWidth()/2 - prompt.image.GetWidth() / 2; - prompt.y = box.y + box.image.GetHeight()/2 - (prompt.image.GetHeight() + entry.image.GetHeight())/2; - prompt.z = box.z + 1; - prompt.sprite.SetPosition(prompt.x, prompt.y, prompt.z); - prompt.sprite.text = text; - - lock.sprite = Sprite(lock.image); - lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2; - lock.y = prompt.y + prompt.image.GetHeight() + (entry.image.GetHeight() - lock.image.GetHeight())/2; - lock.z = box.z + 1; - lock.sprite.SetPosition(lock.x, lock.y, lock.z); - - entry.sprite = Sprite(entry.image); - entry.x = lock.x + lock.image.GetWidth(); - entry.y = prompt.y + prompt.image.GetHeight(); - entry.z = box.z + 1; - entry.sprite.SetPosition(entry.x, entry.y, entry.z); - - global.dialog.box = box; - global.dialog.prompt = prompt; - global.dialog.lock = lock; - global.dialog.entry = entry; - global.dialog.bullet_image = Image("bullet.png"); - dialog_opacity (1); - } - -fun dialog_opacity(opacity) - { - dialog.box.sprite.SetOpacity (opacity); - dialog.prompt.sprite.SetOpacity (opacity); - dialog.lock.sprite.SetOpacity (opacity); - dialog.entry.sprite.SetOpacity (opacity); - for (index = 0; dialog.bullet[index]; index++) - { - dialog.bullet[index].sprite.SetOpacity(opacity); - } - } - -fun display_normal_callback () - { - global.status = "normal"; - if (global.dialog) - dialog_opacity (0); - } - -fun display_password_callback (prompt, bullets) - { - if (prompt.SubString(0,32) == "Please enter passphrase for disk") { - prompt = "Disk password"; - } - global.status = "password"; - if (!global.dialog) - dialog_setup(prompt); - else { - if (global.dialog.prompt.text != prompt) { - dialog_opacity(0); - global.dialog = NULL; - dialog_setup(prompt); - } else - dialog_opacity(1); - } - for (index = 0; dialog.bullet[index] || index < bullets; index++) - { - if (!dialog.bullet[index]) - { - dialog.bullet[index].sprite = Sprite(dialog.bullet_image); - dialog.bullet[index].x = dialog.entry.x + 5 + (index % 21) * (dialog.bullet_image.GetWidth() + 2); - dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2; - dialog.bullet[index].z = dialog.entry.z + 1; - dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z); - } - if (index < bullets) - dialog.bullet[index].sprite.SetOpacity(1); - else - dialog.bullet[index].sprite.SetOpacity(0); - } - } - -Plymouth.SetDisplayNormalFunction(display_normal_callback); -Plymouth.SetDisplayPasswordFunction(display_password_callback); - -#----------------------------------------- Progress Bar -------------------------------- - -progress_box.image = Image("progress_box.png"); -progress_box.sprite = Sprite(progress_box.image); - -progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2; -progress_box.y = Window.GetY() + Window.GetHeight() * 0.75 - progress_box.image.GetHeight() / 2; -progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0); - -progress_bar.original_image = Image("progress_bar.png"); -progress_bar.sprite = Sprite(); - -progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2; -progress_bar.y = Window.GetY() + Window.GetHeight() / 2 * 1.5 - progress_box.image.GetHeight() / 2 + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2; -progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1); - -fun progress_callback (duration, progress) - { - if (progress_bar.image.GetWidth () != Math.Int (progress_bar.original_image.GetWidth () * progress)) - { - progress_bar.image = progress_bar.original_image.Scale(progress_bar.original_image.GetWidth(progress_bar.original_image) * progress, progress_bar.original_image.GetHeight()); - progress_bar.sprite.SetImage (progress_bar.image); - } - } - -Plymouth.SetBootProgressFunction(progress_callback); - -#----------------------------------------- Quit -------------------------------- - -fun quit_callback () -{ - logo.sprite.SetOpacity (1); -} - -Plymouth.SetQuitFunction(quit_callback); - -#----------------------------------------- Message -------------------------------- - -message_sprites = []; -message_sprite_count = 0; -message_sprite_y = 10; - -fun display_message_callback (text) -{ - my_image = Image.Text(text, 1, 1, 1); - message_sprites[message_sprite_count] = Sprite(my_image); - message_sprites[message_sprite_count].SetPosition(10, message_sprite_y, 10000); - message_sprites[message_sprite_count].text = text; - message_sprite_count++; - message_sprite_y += my_image.GetHeight(); -} - -fun hide_message_callback (text) -{ - for (i = 0; i < message_sprite_count; i++) - { - if (message_sprites[i].text == text) - message_sprites[i] = NULL; - } -} - -Plymouth.SetDisplayMessageFunction (display_message_callback); -Plymouth.SetHideMessageFunction (hide_message_callback); diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec deleted file mode 100644 index 440c661..0000000 --- a/qubes-logos/qubes-logos.spec +++ /dev/null @@ -1,112 +0,0 @@ -%if 0%{?qubes_builder} -%define _builddir %(pwd)/qubes-logos -%endif - -Name: qubes-logos -Summary: Icons and pictures -Version: 1.2 -Release: 1 -Group: System Environment/Base -Source0: qubes-logos-%{version}.tar.bz2 -License: GPLv2 and LGPL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -Obsoletes: fedora-logos -Obsoletes: redhat-logos -Provides: fedora-logos = 13-%{release} -Provides: redhat-logos = 13-%{release} -Provides: system-logos = %{version}-%{release} -# Suppress real Fedora desktop-backgrounds-gnome -Provides: system-backgrounds-gnome -Conflicts: kdebase <= 3.1.5 -Conflicts: anaconda-images <= 10 -Conflicts: redhat-artwork <= 5.0.5 -# For _kde4_appsdir macro: -BuildRequires: kde-filesystem -Requires: plymouth-plugin-script -Requires: plymouth-plugin-label -# For plymouth-set-default-theme -Requires(post): plymouth-scripts - - - -%description -The qubes-logos package contains various image files which can be -used by the bootloader, anaconda, and other related tools. - -%prep -%if ! 0%{?qubes_builder} -%setup -q -%endif - -%build - -%install -rm -rf $RPM_BUILD_ROOT - -# should be ifarch i386 -mkdir -p $RPM_BUILD_ROOT/boot/grub -mkdir -p $RPM_BUILD_ROOT/boot/grub2/themes/system -install -p -m 644 bootloader/splash.xpm.gz $RPM_BUILD_ROOT/boot/grub/splash.xpm.gz -install -p -m 644 bootloader/fireworks.png $RPM_BUILD_ROOT/boot/grub2/themes/system/fireworks.png -# end i386 bits - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/qubes -for i in firstboot/* ; do - install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/firstboot/themes/qubes -done - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash -for i in gnome-splash/* ; do - install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash -done - -mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536 -install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png - -for k in charge qubes; do - mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/ - for i in plymouth/$k/* ; do - install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/ - done -done -install -p -m 644 plymouth/plymouthd.defaults.qubes $RPM_BUILD_ROOT%{_datadir}/plymouth -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d -install -p -m 644 plymouth/plymouth-missing-fonts.conf $RPM_BUILD_ROOT%{_sysconfdir}/dracut.conf.d - -install -D icons/96-logo.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps/qubes-logo-icon.png - -(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install) - -%clean -rm -rf $RPM_BUILD_ROOT - -%triggerin -- plymouth -cp -f %{_datadir}/plymouth/plymouthd.defaults.qubes %{_datadir}/plymouth/plymouthd.defaults -/usr/sbin/plymouth-set-default-theme qubes || : - -%post -/usr/sbin/plymouth-set-default-theme qubes || : - -%files -%defattr(-, root, root) -%doc COPYING COPYING-kde-logo -%{_datadir}/firstboot/themes/* -%{_datadir}/anaconda/boot/* -%{_datadir}/anaconda/pixmaps/* -%{_datadir}/plymouth/plymouthd.defaults.qubes -%{_datadir}/plymouth/themes/charge/* -%{_datadir}/plymouth/themes/qubes/* -%{_datadir}/pixmaps/splash/* -%{_datadir}/icons/hicolor/96x96/apps/qubes-logo-icon.png -/usr/lib/anaconda-runtime/*.jpg -%{_sysconfdir}/dracut.conf.d/plymouth-missing-fonts.conf -%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png -# should be ifarch i386 -/boot/grub/splash.xpm.gz -/boot/grub2/themes/system/fireworks.png -# end i386 bits - -%changelog -* Wed Jan 13 2010 Tomasz Sterna - 1 -- Initial Qubes 1 Release package